diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 3b04713a1bb..e4059896783 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -59,6 +59,7 @@ module named account_voucher.
         'account_menuitem.xml',
         'report/account_invoice_report_view.xml',
         'report/account_entries_report_view.xml',
+        'report/account_treasury_report_view.xml',
         'report/account_report_view.xml',
         'report/account_analytic_entries_report_view.xml',
         'wizard/account_move_bank_reconcile_view.xml',
diff --git a/addons/account/account.py b/addons/account/account.py
index f6dd36c01fc..aced4041f13 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -368,16 +368,16 @@ class account_account(osv.osv):
         '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'),
-        'child_id': fields.function(_get_child_ids, method=True, type='many2many', relation="account.account", string="Child Accounts"),
-        'balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), method=True, string='Balance', multi='balance'),
-        'credit': fields.function(__compute, digits_compute=dp.get_precision('Account'), method=True, string='Credit', multi='balance'),
-        'debit': fields.function(__compute, digits_compute=dp.get_precision('Account'), method=True, string='Debit', multi='balance'),
+        'child_id': fields.function(_get_child_ids, type='many2many', relation="account.account", string="Child Accounts"),
+        'balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Balance', multi='balance'),
+        'credit': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Credit', multi='balance'),
+        'debit': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Debit', multi='balance'),
         'reconcile': fields.boolean('Reconcile', help="Check this if the user is allowed to reconcile entries in this account."),
         'shortcut': fields.char('Shortcut', size=12),
         'tax_ids': fields.many2many('account.tax', 'account_account_tax_default_rel',
             'account_id', 'tax_id', 'Default Taxes'),
         'note': fields.text('Note'),
-        'company_currency_id': fields.function(_get_company_currency, method=True, type='many2one', relation='res.currency', string='Company Currency'),
+        'company_currency_id': fields.function(_get_company_currency, type='many2one', relation='res.currency', string='Company Currency'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'active': fields.boolean('Active', select=2, help="If the active field is set to False, it will allow you to hide the account without removing it."),
 
@@ -390,7 +390,7 @@ class account_account(osv.osv):
             'manage this. So if you import from another software system you may have to use the rate at date. ' \
             'Incoming transactions always use the rate at date.', \
             required=True),
-        'level': fields.function(_get_level, string='Level', method=True, store=True, type='integer'),
+        'level': fields.function(_get_level, string='Level', store=True, type='integer'),
     }
 
     _defaults = {
@@ -587,7 +587,7 @@ class account_journal_column(osv.osv):
     _description = "Journal Column"
     _columns = {
         'name': fields.char('Column Name', size=64, required=True),
-        'field': fields.selection(_col_get, 'Field Name', method=True, required=True, size=32),
+        'field': fields.selection(_col_get, 'Field Name', required=True, size=32),
         'view_id': fields.many2one('account.journal.view', 'Journal View', select=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order to journal column.", readonly=True),
         'required': fields.boolean('Required'),
@@ -985,7 +985,7 @@ class account_journal_period(osv.osv):
         'name': fields.char('Journal-Period Name', size=64, required=True),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, ondelete="cascade"),
         'period_id': fields.many2one('account.period', 'Period', required=True, ondelete="cascade"),
-        'icon': fields.function(_icon_get, method=True, string='Icon', type='char', size=32),
+        'icon': fields.function(_icon_get, string='Icon', type='char', size=32),
         'active': fields.boolean('Active', required=True, help="If the active field is set to False, it will allow you to hide the journal period without removing it."),
         'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True,
                                   help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'),
@@ -1139,7 +1139,7 @@ class account_move(osv.osv):
         'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
         'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'),
         'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True),
-        'amount': fields.function(_amount_compute, method=True, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
+        'amount': fields.function(_amount_compute, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
         'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}, select=True),
         'narration':fields.text('Narration'),
         'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
@@ -1331,6 +1331,7 @@ class account_move(osv.osv):
 
     def _centralise(self, cr, uid, move, mode, context=None):
         assert mode in ('debit', 'credit'), 'Invalid Mode' #to prevent sql injection
+        currency_obj = self.pool.get('res.currency') 
         if context is None:
             context = {}
 
@@ -1381,6 +1382,34 @@ class account_move(osv.osv):
         cr.execute('SELECT SUM(%s) FROM account_move_line WHERE move_id=%%s AND id!=%%s' % (mode,), (move.id, line_id2))
         result = cr.fetchone()[0] or 0.0
         cr.execute('update account_move_line set '+mode2+'=%s where id=%s', (result, line_id))
+
+        #adjust also the amount in currency if needed
+        cr.execute("select currency_id, sum(amount_currency) as amount_currency from account_move_line where move_id = %s and currency_id is not null group by currency_id", (move.id,))
+        for row in cr.dictfetchall():
+            currency_id = currency_obj.browse(cr, uid, row['currency_id'], context=context)
+            if not currency_obj.is_zero(cr, uid, currency_id, row['amount_currency']):
+                amount_currency = row['amount_currency'] * -1
+                account_id = amount_currency > 0 and move.journal_id.default_debit_account_id.id or move.journal_id.default_credit_account_id.id
+                cr.execute('select id from account_move_line where move_id=%s and centralisation=\'currency\' and currency_id = %slimit 1', (move.id, row['currency_id']))
+                res = cr.fetchone()
+                if res:
+                    cr.execute('update account_move_line set amount_currency=%s , account_id=%s where id=%s', (amount_currency, account_id, res[0]))
+                else:
+                    context.update({'journal_id': move.journal_id.id, 'period_id': move.period_id.id})
+                    line_id = self.pool.get('account.move.line').create(cr, uid, {
+                        'name': _('Currency Adjustment'),
+                        'centralisation': 'currency',
+                        'account_id': account_id,
+                        'move_id': move.id,
+                        'journal_id': move.journal_id.id,
+                        'period_id': move.period_id.id,
+                        'date': move.period_id.date_stop,
+                        'debit': 0.0,
+                        'credit': 0.0,
+                        'currency_id': row['currency_id'],
+                        'amount_currency': amount_currency,
+                    }, context)
+
         return True
 
     #
@@ -1617,8 +1646,8 @@ class account_tax_code(osv.osv):
         'name': fields.char('Tax Case Name', size=64, required=True, translate=True),
         'code': fields.char('Case Code', size=64),
         'info': fields.text('Description'),
-        'sum': fields.function(_sum_year, method=True, string="Year Sum"),
-        'sum_period': fields.function(_sum_period, method=True, string="Period Sum"),
+        'sum': fields.function(_sum_year, string="Year Sum"),
+        'sum_period': fields.function(_sum_period, string="Period Sum"),
         'parent_id': fields.many2one('account.tax.code', 'Parent Code', select=True),
         'child_ids': fields.one2many('account.tax.code', 'parent_id', 'Child Codes'),
         'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'),
@@ -2473,7 +2502,7 @@ class account_tax_template(osv.osv):
         'name': fields.char('Tax Name', size=64, required=True),
         'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the taxes lines from lower sequences to higher ones. The order is important if you have a tax that has several tax children. In this case, the evaluation order is important."),
         'amount': fields.float('Amount', required=True, digits=(14,4), help="For Tax Type percent enter % ratio between 0-1."),
-        'type': fields.selection( [('percent','Percent'), ('fixed','Fixed'), ('none','None'), ('code','Python Code')], 'Tax Type', required=True),
+        'type': fields.selection( [('percent','Percent'), ('fixed','Fixed'), ('none','None'), ('code','Python Code'), ('balance','Balance')], 'Tax Type', required=True),
         'applicable_type': fields.selection( [('true','True'), ('code','Python Code')], 'Applicable Type', required=True, help="If not applicable (computed through a Python code), the tax won't appear on the invoice."),
         'domain':fields.char('Domain', size=32, help="This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."),
         'account_collected_id':fields.many2one('account.account.template', 'Invoice Tax Account'),
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 7a885fb2cad..f712cc9ab0c 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -137,7 +137,7 @@ class account_bank_statement(osv.osv):
             states={'confirm':[('readonly',True)]}),
         'balance_end_real': fields.float('Ending Balance', digits_compute=dp.get_precision('Account'),
             states={'confirm':[('readonly', True)]}),
-        'balance_end': fields.function(_end_balance, method=True, string='Balance'),
+        'balance_end': fields.function(_end_balance, string='Balance'),
         'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
         'line_ids': fields.one2many('account.bank.statement.line',
             'statement_id', 'Statement lines',
@@ -149,7 +149,7 @@ class account_bank_statement(osv.osv):
             states={'confirm': [('readonly', True)]}, readonly="1",
             help='When new statement is created the state will be \'Draft\'. \
             \n* And after getting confirmation from the bank it will be in \'Confirmed\' state.'),
-        'currency': fields.function(_currency, method=True, string='Currency',
+        'currency': fields.function(_currency, string='Currency',
             type='many2one', relation='res.currency'),
         'account_id': fields.related('journal_id', 'default_debit_account_id', type='many2one', relation='account.account', string='Account used in this journal', readonly=True, help='used in statement reconciliation domain, but shouldn\'t be used elswhere.'),
     }
@@ -461,7 +461,7 @@ class account_bank_statement_line(osv.osv):
             select=True, required=True, ondelete='cascade'),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
         'move_ids': fields.many2many('account.move',
-            'account_bank_statement_line_move_rel', 'statement_id','move_id',
+            'account_bank_statement_line_move_rel', 'statement_line_id','move_id',
             'Moves'),
         'ref': fields.char('Reference', size=32),
         'note': fields.text('Notes'),
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 04e780ade30..982383ea2a7 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -58,7 +58,7 @@ class account_cashbox_line(osv.osv):
     _columns = {
         'pieces': fields.float('Values', digits_compute=dp.get_precision('Account')),
         'number': fields.integer('Number'),
-        'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float', digits_compute=dp.get_precision('Account')),
+        'subtotal': fields.function(_sub_total, string='Sub Total', type='float', digits_compute=dp.get_precision('Account')),
         'starting_id': fields.many2one('account.bank.statement', ondelete='cascade'),
         'ending_id': fields.many2one('account.bank.statement', ondelete='cascade'),
      }
@@ -223,10 +223,10 @@ class account_cash_statement(osv.osv):
             [('draft', 'Draft'),
             ('confirm', 'Closed'),
             ('open','Open')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
-        'total_entry_encoding': fields.function(_get_sum_entry_encoding, method=True, store=True, string="Cash Transaction", help="Total cash transactions"),
+        'total_entry_encoding': fields.function(_get_sum_entry_encoding, store=True, string="Cash Transaction", help="Total cash transactions"),
         'closing_date': fields.datetime("Closed On"),
-        'balance_end': fields.function(_end_balance, method=True, store=True, string='Balance', help="Closing balance based on Starting Balance and Cash Transactions"),
-        'balance_end_cash': fields.function(_balance_end_cash, method=True, store=True, string='Balance', help="Closing balance based on cashBox"),
+        'balance_end': fields.function(_end_balance, store=True, string='Balance', help="Closing balance based on Starting Balance and Cash Transactions"),
+        'balance_end_cash': fields.function(_balance_end_cash, store=True, string='Balance', help="Closing balance based on cashBox"),
         'starting_details_ids': fields.one2many('account.cashbox.line', 'starting_id', string='Opening Cashbox'),
         'ending_details_ids': fields.one2many('account.cashbox.line', 'ending_id', string='Closing Cashbox'),
         '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'),
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 609dd8a6c5e..dd106e75afb 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -45,35 +45,19 @@
 
         <record id="view_account_modules_installer" model="ir.ui.view">
             <field name="name">account.installer.modules.form</field>
-            <field name="model">account.installer.modules</field>
+            <field name="model">base.setup.installer</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_installer"/>
+            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
             <field name="arch" type="xml">
                 <data>
-                    <form position="attributes">
-                        <attribute name="string">Accounting Application Configuration</attribute>
-                    </form>
-                    <separator string="title" position="attributes">
-                         <attribute name="string">Configure Your Accounting Application</attribute>
-
-                    </separator>
-                    <xpath expr="//label[@string='description']" position="attributes">
-                        <attribute name="string">Add extra Accounting functionalities to the ones already installed.</attribute>
+                    <xpath expr="//group[@name='account_accountant']" position="replace">
+                    <newline/>
+                    <separator  string="Accounting &amp; Finance Features" colspan="4" />
+                    <field name="account_followup"/>
+                    <field name="account_payment"/>
+                    <field name="account_analytic_plans"/>
+                    <field name="account_anglo_saxon"/>
                     </xpath>
-                    <xpath expr="//button[@string='Install Modules']" position="attributes">
-                        <attribute name="string">Configure</attribute>
-                    </xpath>
-                    <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                        <attribute name='string'></attribute>
-                    </xpath>
-                    <group colspan="8">
-                        <field name="account_voucher"/>
-                        <field name="account_followup"/>
-                        <field name="account_payment"/>
-                        <field name="account_analytic_plans"/>
-                        <field name="account_anglo_saxon"/>
-<!--                    <field name="account_voucher_payment"/>-->
-                    </group>
                 </data>
             </field>
         </record>
@@ -88,27 +72,16 @@
             <field name="target">new</field>
         </record>
 
-        <record id="action_account_installer" model="ir.actions.act_window">
-            <field name="name">Accounting Application Configuration</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.installer.modules</field>
-            <field name="view_id" ref="view_account_modules_installer"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
+        <record id="category_accounting_configuration" model="ir.actions.todo.category">
+            <field name="name">Accounting</field>
+            <field name="sequence">5</field>
+        </record>    
 
         <record id="account_configuration_installer_todo" model="ir.actions.todo">
             <field name="action_id" ref="action_account_configuration_installer"/>
+            <field name="category_id" ref="category_accounting_configuration"/>
             <field name="sequence">3</field>
-            <field name="restart">onskip</field>
-        </record>
-
-        <record id="account_installer_todo" model="ir.actions.todo">
-            <field name="action_id" ref="action_account_installer"/>
-            <field name="sequence">5</field>
-            <field name="restart">always</field>
-            <field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
+            <field name="type">special</field>
         </record>
 
     </data>
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 8a487fe696d..2733ecbd189 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -489,8 +489,8 @@ class account_move_line(osv.osv):
         'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2),
         'reconcile_partial_id': fields.many2one('account.move.reconcile', 'Partial Reconcile', readonly=True, ondelete='set null', select=2),
         'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry.", digits_compute=dp.get_precision('Account')),
-        'amount_residual_currency': fields.function(_amount_residual, method=True, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
-        'amount_residual': fields.function(_amount_residual, method=True, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."),
+        'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
+        'amount_residual': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."),
         'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."),
         'period_id': fields.many2one('account.period', 'Period', required=True, select=2),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, select=1),
@@ -503,14 +503,14 @@ class account_move_line(osv.osv):
                                 }),
         'date_created': fields.date('Creation date', select=True),
         'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
-        'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation')], 'Centralisation', size=6),
-        'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'),
+        'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8),
+        'balance': fields.function(_balance, fnct_search=_balance_search, string='Balance'),
         'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State', readonly=True,
                                   help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or a tax code account."),
         'tax_amount': fields.float('Tax/Base Amount', digits_compute=dp.get_precision('Account'), select=True, help="If the Tax account is a tax code account, this field will contain the taxed amount.If the tax account is base tax code, "\
                     "this field will contain the basic amount(without tax)."),
-        'invoice': fields.function(_invoice, method=True, string='Invoice',
+        'invoice': fields.function(_invoice, string='Invoice',
             type='many2one', relation='account.invoice', fnct_search=_invoice_search),
         'account_tax_id':fields.many2one('account.tax', 'Tax'),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
@@ -1200,10 +1200,11 @@ class account_move_line(osv.osv):
     def _update_check(self, cr, uid, ids, context=None):
         done = {}
         for line in self.browse(cr, uid, ids, context=context):
+            err_msg = _('Move name (id): %s (%s)') % (line.move_id.name, str(line.move_id.id))
             if line.move_id.state <> 'draft' and (not line.journal_id.entry_posted):
-                raise osv.except_osv(_('Error !'), _('You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields !'))
+                raise osv.except_osv(_('Error !'), _('You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields ! \n%s') % err_msg)
             if line.reconcile_id:
-                raise osv.except_osv(_('Error !'), _('You can not do this modification on a reconciled entry ! Please note that you can just change some non important fields !'))
+                raise osv.except_osv(_('Error !'), _('You can not do this modification on a reconciled entry ! Please note that you can just change some non important fields ! \n%s') % err_msg)
             t = (line.journal_id.id, line.period_id.id)
             if t not in done:
                 self._update_journal_check(cr, uid, line.journal_id.id, line.period_id.id, context)
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index beb23c9ebc3..2a22324d015 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -19,7 +19,6 @@
             rml="account/report/account_print_invoice.rml"
             string="Invoices"
             attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/',''))"
-            attachment_use="1"
             multi="True"/>
         <report id="account_transfers" model="account.transfer" name="account.transfer" string="Transfers" xml="account/report/transfer.xml" xsl="account/report/transfer.xsl"/>
         <report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e0a355c35bf..d3d54a51918 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -897,6 +897,7 @@
                     <field name="name"/>
                     <field name="price_include" groups="base.group_extended"/>
                     <field name="description"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -909,6 +910,7 @@
                     <group col="10" colspan="4">
                         <field name="name"/>
                         <field name="description"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/account/company.py b/addons/account/company.py
index a3886cdf14e..c7836e0128b 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -30,7 +30,6 @@ class res_company(osv.osv):
             type='many2one',
             relation='account.account',
             string="Reserve and Profit/Loss Account",
-            method=True,
             view_load=True,
             domain="[('type', '=', 'other')]",
             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 Profit & Loss Report"),
diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index a9e6815f975..60a3d0eea84 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -22,12 +22,9 @@
             <field name="model">res.company</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
-                  <group col="2" colspan="2">
-                      <separator string="Reserve And Profit/Loss Account" colspan="2"/>
+                <field name="currency_id" position="after">
                       <field name="property_reserve_and_surplus_account" colspan="2"/>
-                  </group>
-                </page>
+                </field>
             </field>
         </record>
 
diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index 1a0a21d3971..fbae77349af 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -612,12 +612,12 @@
 		<record id="conf_a_expense" model="account.account.template">
 			<field name="tax_ids" eval="[(6,0,[ref('otaxs')])]"/>
 		</record>
-
+		
 		<record id="action_wizard_multi_chart_todo" model="ir.actions.todo">
 			<field name="name">Generate Chart of Accounts from a Chart Template</field>
 			<field name="action_id" ref="account.action_wizard_multi_chart"/>
-			<field name="state">open</field>
-			<field name="restart">onskip</field>
+			<field name="category_id" ref="account.category_accounting_configuration"/>
+			<field name="type">special</field>
 		</record>
 
 
diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index 2f0e6798408..a4c12ebb0bb 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.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: 2011-01-19 11:12+0000\n"
-"Last-Translator: bamuhrez <bamuhrez@gmail.com>\n"
+"PO-Revision-Date: 2011-06-18 11:20+0000\n"
+"Last-Translator: Ahmed Mokhlis <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-04-29 05:04+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-19 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -24,7 +24,7 @@ msgstr "الدفع عن طريق النظام"
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
-msgstr ""
+msgstr "تعديلات أخرى"
 
 #. module: account
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
@@ -33,7 +33,7 @@ msgid "No End of year journal defined for the fiscal year"
 msgstr "لايوجد نهاية لسجل السنة للعام المحاسبي"
 
 #. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
@@ -65,7 +65,7 @@ msgid "Residual"
 msgstr "متبقي"
 
 #. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
 #, python-format
 msgid "Please define sequence on invoice journal"
 msgstr ""
@@ -78,7 +78,7 @@ msgstr "خظأ! إن مدة الفترة أو الفترات غير صالحة "
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account currency"
-msgstr ""
+msgstr "عملة الحساب"
 
 #. module: account
 #: view:account.tax:0
@@ -101,6 +101,7 @@ msgid ""
 "The Profit and Loss report gives you an overview of your company profit and "
 "loss in a single document"
 msgstr ""
+"تقرير المكسب و الخسارة يعطيك فكرة عامة عن مكسب و خسارة شركتك في ملف واحد"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
@@ -130,7 +131,7 @@ msgid "Accounting Entries-"
 msgstr "المدخلات المحاسبية -"
 
 #. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
 msgstr ""
@@ -174,7 +175,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
 #, python-format
 msgid "Warning!"
 msgstr "تحذير!"
@@ -226,7 +227,7 @@ msgid "account.tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -254,7 +255,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -270,7 +271,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -308,7 +309,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -415,7 +416,7 @@ msgstr ""
 #. module: account
 #: field:account.journal,default_debit_account_id:0
 msgid "Default Debit Account"
-msgstr ""
+msgstr "الحساب المدين الافتراضي"
 
 #. module: account
 #: view:account.move:0
@@ -550,7 +551,7 @@ msgid "Not reconciled transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
 msgstr ""
@@ -632,7 +633,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -665,8 +666,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -727,7 +728,7 @@ msgid "Analytic Entries by line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
 msgstr ""
@@ -828,7 +829,7 @@ msgid "Next Partner to reconcile"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry ! Please note that you "
@@ -950,11 +951,11 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
@@ -1033,7 +1034,6 @@ msgstr ""
 
 #. module: account
 #: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "-"
@@ -1119,6 +1119,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -1126,7 +1127,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1264,7 +1265,6 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1294,7 +1294,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
 #, python-format
 msgid "You can not use this general account in this journal !"
 msgstr ""
@@ -1387,7 +1387,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
 #, python-format
 msgid ""
 "Cannot create the invoice !\n"
@@ -1546,7 +1546,6 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1613,7 +1612,7 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
 #, python-format
 msgid "The account is not defined to be reconciled !"
 msgstr ""
@@ -1646,7 +1645,7 @@ msgid "Receivables & Payables"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
 #, python-format
 msgid "You have to provide an account for the write off entry !"
 msgstr ""
@@ -1682,7 +1681,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -1703,7 +1702,7 @@ msgid "Tax Declaration: Credit Notes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr ""
@@ -1719,7 +1718,7 @@ msgid "You can not create move line on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
@@ -1988,7 +1987,7 @@ msgid " Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2040,7 +2039,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
@@ -2060,7 +2059,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2071,6 +2070,7 @@ msgid "Accounting Properties"
 msgstr ""
 
 #. module: account
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted By"
@@ -2099,6 +2099,7 @@ msgstr ""
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2207,7 +2208,7 @@ msgid "Account Tax Code"
 msgstr "كود الحساب الضريبي"
 
 #. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2277,7 +2278,7 @@ msgid "Account Model Entries"
 msgstr "إدخالات نماذج الحسابات"
 
 #. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
@@ -2361,7 +2362,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2373,13 +2374,12 @@ msgid "Average Price"
 msgstr ""
 
 #. module: account
-#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
 #, python-format
 msgid ""
 "You cannot modify company of this journal as its related record exist in "
@@ -2415,6 +2415,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.overdue:0
 #: report:account.third_party_ledger:0
@@ -2523,16 +2524,16 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2692,7 +2693,7 @@ msgid "Analytic Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
@@ -2815,7 +2816,7 @@ msgid "BNK%s"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2906
+#: code:addons/account/account.py:2950
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
@@ -2924,6 +2925,7 @@ msgstr ""
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
 #: view:account.journal.period:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,journal_ids:0
@@ -2984,7 +2986,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3026,7 +3028,6 @@ msgstr ""
 #: view:account.invoice.report:0
 #: selection:account.invoice.report,state:0
 #: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
@@ -3078,7 +3079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr ""
@@ -3139,7 +3140,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3148,6 +3149,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3250,6 +3252,7 @@ msgstr ""
 #: field:account.entries.report,date:0
 #: selection:account.general.journal,filter:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice.report,date:0
 #: report:account.journal.period.print:0
 #: view:account.move:0
@@ -3293,7 +3296,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3302,13 +3305,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
 #, python-format
 msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
@@ -3428,7 +3431,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3439,14 +3442,14 @@ msgid "#Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3740,7 +3743,7 @@ msgid "Acc.Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr ""
@@ -3799,7 +3802,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -3974,7 +3977,7 @@ msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
@@ -4045,11 +4048,11 @@ msgid "Change"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
 #: code:addons/account/wizard/account_fiscalyear_close.py:78
 #: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4153,7 +4156,7 @@ msgid "You must define an analytic journal of type '%s' !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4218,7 +4221,7 @@ msgid "Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4330,25 +4333,24 @@ msgid "Third Party (Country)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_report_common.py:120
 #: code:addons/account/wizard/account_report_common.py:126
 #, python-format
@@ -4370,7 +4372,7 @@ msgid "Bank Details"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
 #, python-format
 msgid "Taxes missing !"
 msgstr ""
@@ -4425,7 +4427,7 @@ msgid "Check Date not in the Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4444,7 +4446,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4474,6 +4476,7 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,target_move:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.journal,target_move:0
 #: report:account.partner.balance:0
@@ -4556,7 +4559,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4591,7 +4594,7 @@ msgstr ""
 #: field:account.invoice.tax,account_id:0
 #: field:account.move.line,tax_code_id:0
 msgid "Tax Account"
-msgstr ""
+msgstr "حساب الضرائب"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -4702,7 +4705,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
@@ -4774,7 +4777,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
@@ -4802,7 +4805,7 @@ msgid "Start of period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
@@ -4858,12 +4861,12 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -4940,7 +4943,7 @@ msgid "Sort By"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -4960,7 +4963,7 @@ msgstr ""
 msgid ""
 "Specified Journal does not have any account move entries in draft state for "
 "this period"
-msgstr ""
+msgstr "اليومية المختارة لا تشمل أي حساب، لذا أضفها بالمسودات لهذه الفترة"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
@@ -5087,7 +5090,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5123,7 +5126,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5260,7 +5263,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr ""
@@ -5285,14 +5288,14 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr ""
@@ -5327,7 +5330,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -5538,7 +5541,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
@@ -5804,9 +5807,9 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
 #, python-format
 msgid "Can not find account chart for this company, Please Create account."
 msgstr ""
@@ -5955,8 +5958,8 @@ msgid "Analytic Entries Statistics"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -5967,7 +5970,7 @@ msgid "Create manual recurring entries in a chosen journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6005,7 +6008,7 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6069,30 +6072,31 @@ msgid "  valuation: percent"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:292
 #: code:addons/account/account_bank_statement.py:305
 #: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
 #: code:addons/account/wizard/account_invoice_refund.py:100
 #: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6202,7 +6206,7 @@ msgid "Journal Select"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr ""
@@ -6219,9 +6223,11 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.report.general.ledger:0
 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
 #: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
 #: model:ir.ui.menu,name:account.menu_general_ledger
 msgid "General Ledger"
 msgstr ""
@@ -6275,7 +6281,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6305,7 +6311,7 @@ msgid "Child Codes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6462,7 +6468,7 @@ msgid "Lines"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
 #, python-format
 msgid ""
 "Can not find account chart for this company in invoice line account, Please "
@@ -6630,7 +6636,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -6734,7 +6740,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
 #, python-format
 msgid "You can not have two open register for the same journal"
 msgstr ""
@@ -6763,7 +6769,6 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
-#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -6793,6 +6798,7 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -6818,13 +6824,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
@@ -6842,7 +6848,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7079,17 +7085,17 @@ msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
 #: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7121,6 +7127,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7151,7 +7158,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7200,7 +7207,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7261,7 +7268,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7326,7 +7333,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
@@ -7361,6 +7368,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,period_id:0
 #: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
 #: field:account.journal.period,period_id:0
@@ -7523,7 +7531,7 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr ""
@@ -7573,6 +7581,7 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
 msgid "Filter By"
 msgstr ""
@@ -7611,7 +7620,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
@@ -7778,8 +7787,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -7790,7 +7799,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -7811,6 +7820,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -7983,14 +7993,14 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
 #, python-format
 msgid ""
 "You cannot modify company of this period as its related record exist in "
@@ -8039,7 +8049,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8055,7 +8065,7 @@ msgid "Configure Your Accounting Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
@@ -8093,6 +8103,7 @@ msgstr ""
 #: report:account.central.journal:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
@@ -8102,7 +8113,7 @@ msgid "Start Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
 #, python-format
 msgid "Cannot locate parent code for template account!"
 msgstr ""
@@ -8139,7 +8150,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. "
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
 #, python-format
 msgid ""
 "You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8167,7 +8178,7 @@ msgid "You can not create move line on view account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr ""
@@ -8216,6 +8227,7 @@ msgstr ""
 #: field:account.entries.report,balance:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8234,6 +8246,7 @@ msgstr ""
 
 #. module: account
 #: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
 msgid "Display Account"
 msgstr ""
 
@@ -8348,6 +8361,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
@@ -8355,7 +8369,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -8449,6 +8463,7 @@ msgstr ""
 #: report:account.central.journal:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
@@ -8492,7 +8507,7 @@ msgid "Account Subscription"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
 #, python-format
 msgid ""
 "Tax base different !\n"
@@ -8519,6 +8534,7 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,date_start:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -8547,7 +8563,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -8605,13 +8621,13 @@ msgid "Active"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
 #, python-format
 msgid "Unknown Error"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry !\n"
@@ -8654,10 +8670,10 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
-#: report:account.move.voucher:0
 #: report:account.partner.balance:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
@@ -8893,7 +8909,6 @@ msgstr ""
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
-#: report:account.move.voucher:0
 msgid "Posted"
 msgstr ""
 
@@ -8912,6 +8927,7 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,date_stop:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -8965,7 +8981,7 @@ msgid "This is a model for recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9115,8 +9131,8 @@ msgid "End period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9182,10 +9198,10 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
-#: report:account.move.voucher:0
 #: report:account.partner.balance:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
@@ -9219,7 +9235,7 @@ msgid "Recurring"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9240,7 +9256,7 @@ msgid "Range"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece !\n"
@@ -9370,7 +9386,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -9395,7 +9411,7 @@ msgid "The income or expense account related to the selected product."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
 msgstr ""
@@ -9600,7 +9616,7 @@ msgid "You must enter a period length that cannot be 0 or below !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
 msgstr ""
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 14a60c5bc7f..3d6a63f1bd9 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.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: 2011-04-21 05:36+0000\n"
+"PO-Revision-Date: 2011-07-02 08:42+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <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-04-29 05:06+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-03 04:46+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -34,7 +34,7 @@ msgstr ""
 "Es ist kein Journal für den Jahresabschluss des Geschäftsjahres definiert"
 
 #. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
@@ -68,7 +68,7 @@ msgid "Residual"
 msgstr "Restwert"
 
 #. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
 #, python-format
 msgid "Please define sequence on invoice journal"
 msgstr "Bitte definieren Sie den Sequenzer für das Rechnungsjournal."
@@ -138,7 +138,7 @@ msgid "Accounting Entries-"
 msgstr "Buchungssätze-"
 
 #. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
 msgstr "Sie können keine gebuchten Vorgänge löschen: \"%s\"!"
@@ -184,7 +184,7 @@ msgstr ""
 "angezeigt."
 
 #. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
 #, python-format
 msgid "Warning!"
 msgstr "Achtung!"
@@ -240,7 +240,7 @@ msgid "account.tax"
 msgstr "account.tax"
 
 #. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -272,7 +272,7 @@ msgstr ""
 "Rechnung erscheinen sollen"
 
 #. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -290,7 +290,7 @@ msgid "Belgian Reports"
 msgstr "Auswertungen für Belgien"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -330,7 +330,7 @@ msgid "St."
 msgstr "Beleg"
 
 #. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -594,7 +594,7 @@ msgid "Not reconciled transactions"
 msgstr "Nicht ausgeglichene Posten"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
 msgstr "Kassenbestand passt nicht zu Kontensaldo"
@@ -679,7 +679,7 @@ msgid "Tax Code Amount"
 msgstr "Steuerbetrag"
 
 #. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -712,8 +712,8 @@ msgid "Journal Period"
 msgstr "Journal Periode"
 
 #. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -776,7 +776,7 @@ msgid "Analytic Entries by line"
 msgstr "Analytische Buchungsbelege"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
 msgstr "Sie können die Währung nur bei Rechnungen"
@@ -880,7 +880,7 @@ msgid "Next Partner to reconcile"
 msgstr "Weiterer Partner für automat. Ausgleich"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry ! Please note that you "
@@ -1009,11 +1009,11 @@ msgid "Code"
 msgstr "Kurzbezeichnung"
 
 #. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
@@ -1095,7 +1095,6 @@ msgstr "GuV (Aufwendungen)"
 
 #. module: account
 #: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "-"
@@ -1186,6 +1185,7 @@ msgstr "# Transaktionen"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -1193,7 +1193,7 @@ msgid "Entry Label"
 msgstr "Buchungstext"
 
 #. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1333,7 +1333,6 @@ msgid "Journal Items Analysis"
 msgstr "Analyse der Journaleinträge"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Partner"
@@ -1363,7 +1362,7 @@ msgid "Central Journal"
 msgstr "Zentrales Journal"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
 #, python-format
 msgid "You can not use this general account in this journal !"
 msgstr "Sie können dieses Sachkonto nicht in diesem Journal einsetzen."
@@ -1460,7 +1459,7 @@ msgid ""
 msgstr "Beispiel: 14 Tage 2% Skonto, 30 Tage Netto"
 
 #. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
 #, python-format
 msgid ""
 "Cannot create the invoice !\n"
@@ -1631,7 +1630,6 @@ msgid "Separated Journal Sequences"
 msgstr "Unterschiedliche Journal Sequenzer"
 
 #. module: account
-#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Mitarbeiter"
@@ -1705,7 +1703,7 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr "Fehler ! Sie können keine Überschneidungen bei Geschäftsjahren haben"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
 #, python-format
 msgid "The account is not defined to be reconciled !"
 msgstr ""
@@ -1742,7 +1740,7 @@ msgid "Receivables & Payables"
 msgstr "Debitoren & Kreditoren"
 
 #. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
 #, python-format
 msgid "You have to provide an account for the write off entry !"
 msgstr "Sie müssen ein Konto für die Forderungsabschreibung hinterlegen!"
@@ -1778,7 +1776,7 @@ msgid "Customer Ref:"
 msgstr "Kundenreferenz:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Benutzer %s hat keinen Zugriff auf das %s Journal!"
@@ -1799,7 +1797,7 @@ msgid "Tax Declaration: Credit Notes"
 msgstr "Steuermeldung: Ausweis von Gutschriften"
 
 #. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr "Sie können kein Konto mit vorhandenen Buchungen deaktivieren."
@@ -1816,7 +1814,7 @@ msgstr ""
 "Sie können keine Buchung auf einem bereits abgeschlossenen Konto vornehmen."
 
 #. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
@@ -2101,7 +2099,7 @@ msgid " Journal"
 msgstr " Journal"
 
 #. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2164,7 +2162,7 @@ msgid "Description"
 msgstr "Buchungstext"
 
 #. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
@@ -2184,7 +2182,7 @@ msgid "Income Account"
 msgstr "Erlöskonto"
 
 #. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2197,6 +2195,7 @@ msgid "Accounting Properties"
 msgstr "Finanzbuchhaltung Eigenschaften"
 
 #. module: account
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted By"
@@ -2225,6 +2224,7 @@ msgstr "Vorlage f. Produkte"
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2333,7 +2333,7 @@ msgid "Account Tax Code"
 msgstr "Umsatzsteuer"
 
 #. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2415,7 +2415,7 @@ msgid "Account Model Entries"
 msgstr "Buchungsvorlage"
 
 #. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
@@ -2507,7 +2507,7 @@ msgid "Accounts"
 msgstr "Finanzkonten"
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
 #, python-format
 msgid "Configuration Error!"
 msgstr "Konfigurationsfehler !"
@@ -2519,13 +2519,12 @@ msgid "Average Price"
 msgstr "Durchschnittspreis"
 
 #. module: account
-#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
 msgstr "Datum:"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
 #, python-format
 msgid ""
 "You cannot modify company of this journal as its related record exist in "
@@ -2563,6 +2562,7 @@ msgstr "Rabatt (%)"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.overdue:0
 #: report:account.third_party_ledger:0
@@ -2679,16 +2679,16 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Diese Assistent erzeugt wiederkehrende Buchungen."
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Kein Sequenzer für dieses Journal definiert !"
 
 #. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2862,7 +2862,7 @@ msgid "Analytic Entries"
 msgstr "Analytische Buchungen"
 
 #. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
@@ -2994,7 +2994,7 @@ msgid "BNK%s"
 msgstr "BNK%s"
 
 #. module: account
-#: code:addons/account/account.py:2906
+#: code:addons/account/account.py:2950
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
@@ -3119,6 +3119,7 @@ msgstr "Leer lassen um Aufwandskonto zu verwenden"
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
 #: view:account.journal.period:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,journal_ids:0
@@ -3179,7 +3180,7 @@ msgid "Starting Balance"
 msgstr "Anfangssaldo"
 
 #. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Kein Partner definiert!"
@@ -3223,7 +3224,6 @@ msgstr "Journal:"
 #: view:account.invoice.report:0
 #: selection:account.invoice.report,state:0
 #: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
@@ -3277,7 +3277,7 @@ msgstr ""
 "bedeutet, dass Sie Ihre einzelnen Buchungen nicht ändern können."
 
 #. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr "Kann offene oder bezahlte Rechnungen nicht löschen"
@@ -3340,7 +3340,7 @@ msgstr ""
 "'Abgebrochen' oder 'Erledigt' Status ist."
 
 #. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3351,6 +3351,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr "Gegenbuchung"
 
@@ -3455,6 +3456,7 @@ msgstr "(Wenn kein Geschäftsjahr ausgewählt wird, werden alle genommen)"
 #: field:account.entries.report,date:0
 #: selection:account.general.journal,filter:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice.report,date:0
 #: report:account.journal.period.print:0
 #: view:account.move:0
@@ -3498,7 +3500,7 @@ msgid "Chart of Accounts Template"
 msgstr "Vorlage Kontenplan"
 
 #. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3510,13 +3512,13 @@ msgstr ""
 "Bitte ordnen Sie dem Partner eine Zahlungsbedingungen zu."
 
 #. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Einige Einträge wurden bereits ausgeglichen!"
 
 #. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
 #, python-format
 msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
@@ -3644,7 +3646,7 @@ msgid "Analytic Items"
 msgstr "Analytische Buchungen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Die Steuer kann nicht geändert werden!"
@@ -3655,7 +3657,7 @@ msgid "#Entries"
 msgstr "# Buchungen"
 
 #. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -3663,7 +3665,7 @@ msgstr ""
 "Sie haben eine Mengeneinheit gewählt, die nicht kompatibel zum Produkt ist."
 
 #. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3977,7 +3979,7 @@ msgid "Acc.Type"
 msgstr "Kontotyp"
 
 #. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr ""
@@ -4042,7 +4044,7 @@ msgstr ""
 "Status unmittelbar 'Gebucht' ist."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4224,7 +4226,7 @@ msgid "Credit Notes"
 msgstr "Gutschrift"
 
 #. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
@@ -4297,11 +4299,11 @@ msgid "Change"
 msgstr "Ändere Währung"
 
 #. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
 #: code:addons/account/wizard/account_fiscalyear_close.py:78
 #: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4408,7 +4410,7 @@ msgid "You must define an analytic journal of type '%s' !"
 msgstr "Ein Analytisches Journal vom Typ '%s' muss definiert werden"
 
 #. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4480,7 +4482,7 @@ msgid "Invoices"
 msgstr "Rechnung"
 
 #. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4594,25 +4596,24 @@ msgid "Third Party (Country)"
 msgstr "Drittwelt (Land)"
 
 #. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_report_common.py:120
 #: code:addons/account/wizard/account_report_common.py:126
 #, python-format
@@ -4634,7 +4635,7 @@ msgid "Bank Details"
 msgstr "Bankkonto Details"
 
 #. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
 #, python-format
 msgid "Taxes missing !"
 msgstr "Steuerkonfiguration fehlt!"
@@ -4694,7 +4695,7 @@ msgid "Check Date not in the Period"
 msgstr "Prüfe auf  ein Datum nicht in Periode"
 
 #. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4716,7 +4717,7 @@ msgid "Child Tax Accounts"
 msgstr "untergeordnete Steuerkonten"
 
 #. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Beginn der Periode sollte kleiner sein als Ende der Periode"
@@ -4746,6 +4747,7 @@ msgstr "Saldo (Anal.)"
 #: report:account.general.journal:0
 #: field:account.general.journal,target_move:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.journal,target_move:0
 #: report:account.partner.balance:0
@@ -4830,7 +4832,7 @@ msgid "Line 1:"
 msgstr "Zeile 1:"
 
 #. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "Integrity Error !"
 msgstr "Integritätsfehler!"
@@ -4980,7 +4982,7 @@ msgstr ""
 "einen vorher vorhandenen Partner erstellen."
 
 #. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
@@ -5057,7 +5059,7 @@ msgstr ""
 "->> Fälligkeitstag = 28.2"
 
 #. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
@@ -5085,7 +5087,7 @@ msgid "Start of period"
 msgstr "Start Periode"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
@@ -5144,12 +5146,12 @@ msgstr "Journal Eröffnungsbuchungen"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5230,7 +5232,7 @@ msgid "Sort By"
 msgstr "Sortiert nach"
 
 #. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -5391,7 +5393,7 @@ msgid "Generate Opening Entries"
 msgstr "Erstelle Vortragsbuchungen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Bereits ausgeglichen"
@@ -5430,7 +5432,7 @@ msgstr "untergeordnete Konten"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
 #, python-format
 msgid "Write-Off"
 msgstr "Abschreibung"
@@ -5585,7 +5587,7 @@ msgid "# of Lines"
 msgstr "# Positionen"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr "Neue Währung wurde nicht vollständig konfiguriert !"
@@ -5610,14 +5612,14 @@ msgid "Filter by"
 msgstr "Filter durch"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Sie können kein inaktives Konto verwenden!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr ""
@@ -5654,7 +5656,7 @@ msgstr "7"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
 #, python-format
 msgid "Invalid action !"
 msgstr "Fehlerhafte Aktion"
@@ -5876,7 +5878,7 @@ msgid "Companies"
 msgstr "Unternehmen"
 
 #. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
@@ -6157,9 +6159,9 @@ msgid "Optional create"
 msgstr "Erzeuge optional"
 
 #. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
 #, python-format
 msgid "Can not find account chart for this company, Please Create account."
 msgstr ""
@@ -6312,8 +6314,8 @@ msgid "Analytic Entries Statistics"
 msgstr "Auswertung analytische Buchungen"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
 #, python-format
 msgid "Entries: "
 msgstr "Buchungen: "
@@ -6324,7 +6326,7 @@ msgid "Create manual recurring entries in a chosen journal."
 msgstr "Händisch wiederkehrende Buchungen in ein bestimmtes Journal buchen."
 
 #. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Konnte keine überbetriebliche Buchung erzeugen"
@@ -6373,7 +6375,7 @@ msgid "Total debit"
 msgstr "Gesamt Soll"
 
 #. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Eintrag \"%s\" ist ungültig !"
@@ -6443,30 +6445,31 @@ msgid "  valuation: percent"
 msgstr "  Wertansatz: Prozent"
 
 #. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:292
 #: code:addons/account/account_bank_statement.py:305
 #: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
 #: code:addons/account/wizard/account_invoice_refund.py:100
 #: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6587,7 +6590,7 @@ msgid "Journal Select"
 msgstr "Wähle Journal"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr "Die aktuelle Währung ist nicht korrekt konfiguriert !"
@@ -6604,9 +6607,11 @@ msgstr "Steuern Zuordnung"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.report.general.ledger:0
 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
 #: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
 #: model:ir.ui.menu,name:account.menu_general_ledger
 msgid "General Ledger"
 msgstr "Umsätze nach Konten und Perioden"
@@ -6667,7 +6672,7 @@ msgid "Total:"
 msgstr "Summe:"
 
 #. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6705,7 +6710,7 @@ msgid "Child Codes"
 msgstr "untergeordnete Codes"
 
 #. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6896,7 +6901,7 @@ msgid "Lines"
 msgstr "Positionen"
 
 #. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
 #, python-format
 msgid ""
 "Can not find account chart for this company in invoice line account, Please "
@@ -7095,7 +7100,7 @@ msgstr ""
 "Steuerberechnung gebraucht wird."
 
 #. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7214,7 +7219,7 @@ msgid "Sign on Reports"
 msgstr "Sign On Reports"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
 #, python-format
 msgid "You can not have two open register for the same journal"
 msgstr ""
@@ -7251,7 +7256,6 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
-#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
@@ -7284,6 +7288,7 @@ msgstr "Informationen (Optional)"
 
 #. module: account
 #: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -7312,13 +7317,13 @@ msgstr ""
 "bezahlt werden soll."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
 #, python-format
 msgid "Bad account !"
 msgstr "Falsches Konto!"
 
 #. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
@@ -7336,7 +7341,7 @@ msgid "Invoice Tax"
 msgstr "Umsatzsteuer"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
 #, python-format
 msgid "No piece number !"
 msgstr "Keine Stückzahl!"
@@ -7582,17 +7587,17 @@ msgid "Fixed"
 msgstr "Fest"
 
 #. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
 #: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
 #, python-format
 msgid "Warning !"
 msgstr "Warnung"
@@ -7624,6 +7629,7 @@ msgstr "Betrag (in Worten)"
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7654,7 +7660,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Kann Entwurf/ProForma/Storno für Rechnung %s nicht durchführen"
 
 #. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Keine Rechnungszeilen !"
@@ -7705,7 +7711,7 @@ msgid "Deferral Method"
 msgstr "Abgrenzung Jahreswechsel"
 
 #. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Rechnung '%s' wurde bezahlt."
@@ -7769,7 +7775,7 @@ msgid "Associated Partner"
 msgstr "Zugehöriger Partner"
 
 #. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Sie müssen zuerst einen Partner wählen!"
@@ -7837,7 +7843,7 @@ msgid "Choose Fiscal Year"
 msgstr "Wähle Geschäftsjahr"
 
 #. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
@@ -7876,6 +7882,7 @@ msgstr "Finanzbuchhaltung"
 #: view:account.entries.report:0
 #: field:account.entries.report,period_id:0
 #: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
 #: field:account.journal.period,period_id:0
@@ -8057,7 +8064,7 @@ msgid "Account Types"
 msgstr "Kontoartkonfiguration"
 
 #. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr "Kann keine Rechnungsbuchungen in zentralisiertem Journal durchführen"
@@ -8107,6 +8114,7 @@ msgstr "Journal Gutschriften"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
 msgid "Filter By"
 msgstr "Filter nach"
@@ -8150,7 +8158,7 @@ msgid "Payment Term Line"
 msgstr "Zahlungsbedingungen"
 
 #. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
@@ -8326,8 +8334,8 @@ msgstr ""
 "Bankauszug übereinstimmen."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
 #, python-format
 msgid "Bad account!"
 msgstr "Falsches Konto!"
@@ -8338,7 +8346,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Frei lassen für alle offenen Geschäftsjahre"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "Die Buchungszeile (%s)"
@@ -8361,6 +8369,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8564,14 +8573,14 @@ msgid "Period from"
 msgstr "Gültig ab"
 
 #. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Gutschriften Ausgangsrechnungen Journal"
 
 #. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
 #, python-format
 msgid ""
 "You cannot modify company of this period as its related record exist in "
@@ -8621,7 +8630,7 @@ msgid "Purchase Tax(%)"
 msgstr "Steuer Einkauf (%)"
 
 #. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Bitte erstellen Sie einige Rechnungspositionen"
@@ -8637,7 +8646,7 @@ msgid "Configure Your Accounting Application"
 msgstr "Konfigurieren Sie die Anwendungen für die Finanzbuchhaltung"
 
 #. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
@@ -8682,6 +8691,7 @@ msgstr "Überwachung von Zahlungseingängen"
 #: report:account.central.journal:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
@@ -8691,7 +8701,7 @@ msgid "Start Period"
 msgstr "Start Periode"
 
 #. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
 #, python-format
 msgid "Cannot locate parent code for template account!"
 msgstr "Kann keine Buchung auf einem Oberkonto vonehmen."
@@ -8729,7 +8739,7 @@ msgstr ""
 "Buchhalter verbucht und validiert die Buchungszeilen einer Rechnung. "
 
 #. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
 #, python-format
 msgid ""
 "You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8759,7 +8769,7 @@ msgid "You can not create move line on view account."
 msgstr "Sie können keine Buchungen auf Konten des Typs Ansicht erstellen."
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr "Aktuelle Währung ist nicht korrekt definiert"
@@ -8814,6 +8824,7 @@ msgstr "Leer lassen um das Erlöskonto zu nutzen"
 #: field:account.entries.report,balance:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8832,6 +8843,7 @@ msgstr "Händisch oder automatisch im System erfasst."
 
 #. module: account
 #: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
 msgid "Display Account"
 msgstr "Anzeige Konten"
 
@@ -8963,6 +8975,7 @@ msgstr "Händische Buchung"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
@@ -8970,7 +8983,7 @@ msgid "Move"
 msgstr "Buchung"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr "Die Steuer kann nicht verändert werden. Löschen und Neuerstellen."
@@ -9070,6 +9083,7 @@ msgstr "Saldo Analytisches Konto"
 #: report:account.central.journal:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
@@ -9113,7 +9127,7 @@ msgid "Account Subscription"
 msgstr "Konto Automatische Buchung"
 
 #. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
 #, python-format
 msgid ""
 "Tax base different !\n"
@@ -9142,6 +9156,7 @@ msgstr "Eingabe automat. Buchung"
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,date_start:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -9170,7 +9185,7 @@ msgid "Unreconciled"
 msgstr "Offene Posten"
 
 #. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
 #, python-format
 msgid "Bad total !"
 msgstr "Falsche Summe!"
@@ -9237,13 +9252,13 @@ msgid "Active"
 msgstr "Aktiv"
 
 #. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
 #, python-format
 msgid "Unknown Error"
 msgstr "Unbekannter Fehler"
 
 #. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry !\n"
@@ -9294,10 +9309,10 @@ msgstr "Buchen"
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
-#: report:account.move.voucher:0
 #: report:account.partner.balance:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
@@ -9546,7 +9561,6 @@ msgstr "Periode auswählen"
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
-#: report:account.move.voucher:0
 msgid "Posted"
 msgstr "Gebucht"
 
@@ -9565,6 +9579,7 @@ msgstr "Gebucht"
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,date_stop:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -9618,7 +9633,7 @@ msgid "This is a model for recurring accounting entries"
 msgstr "Dieses ist ein Modell für wiederkehrende Buchungen."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9781,8 +9796,8 @@ msgid "End period"
 msgstr "Ende Periode"
 
 #. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9850,10 +9865,10 @@ msgstr "Eingangsrechnungen"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
-#: report:account.move.voucher:0
 #: report:account.partner.balance:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
@@ -9890,7 +9905,7 @@ msgid "Recurring"
 msgstr "Wiederkehrend"
 
 #. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Buchung wurde bereits ausgeglichen"
@@ -9911,7 +9926,7 @@ msgid "Range"
 msgstr "Bereich"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece !\n"
@@ -10052,7 +10067,7 @@ msgid "Accounts Mapping"
 msgstr "Zuordnung Finanzkonten"
 
 #. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Rechnung '%s' wartet auf Buchungsfreigabe."
@@ -10077,7 +10092,7 @@ msgid "The income or expense account related to the selected product."
 msgstr "Aufwand- und Erlöskonto des Produktes"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
 msgstr ""
@@ -10241,7 +10256,7 @@ msgstr "Zentrales Journal"
 #. module: account
 #: report:account.overdue:0
 msgid "Maturity"
-msgstr "Fällig am"
+msgstr "überfälllig"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
@@ -10287,7 +10302,7 @@ msgid "You must enter a period length that cannot be 0 or below !"
 msgstr "Die Länge der Periode muss größer als 0 sein"
 
 #. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
 msgstr ""
@@ -10355,9 +10370,6 @@ msgstr ""
 #~ msgid "Unreconciled entries"
 #~ msgstr "Offene Posten"
 
-#~ msgid "Print Taxes Report"
-#~ msgstr "Druck Report Steuer"
-
 #, python-format
 #~ msgid "Account move line \"%s\" is not valid"
 #~ msgstr "Buchungsposition \"%s\" ist ungültig"
@@ -10365,9 +10377,6 @@ msgstr ""
 #~ msgid "Unreconcile entries"
 #~ msgstr "Storno Ausgleich"
 
-#~ msgid "Confirm draft invoices"
-#~ msgstr "Bestätige Entwurf Rechnung"
-
 #~ msgid "Charts of Account"
 #~ msgstr "Kontenplan Finanzkonten"
 
@@ -11825,16 +11834,6 @@ msgstr ""
 #~ msgid "Account Reporting - Reporting"
 #~ msgstr "Finanz Reporting"
 
-#~ msgid ""
-#~ "Gives the view used when writing or browsing entries in this journal. The "
-#~ "view tell Open ERP which fields should be visible, required or readonly and "
-#~ "in which order. You can create your own view for a faster encoding in each "
-#~ "journal."
-#~ msgstr ""
-#~ "Definiert Felder (sichtbar, zwingend, nur lesen) für die Sicht für dieses "
-#~ "Journal. Für jedes Journal können eingene Sichten erzeugt wrden um scheller "
-#~ "erfassen zu können"
-
 #~ msgid "wizard.company.setup"
 #~ msgstr "wizard.company.setup"
 
@@ -12289,3 +12288,26 @@ msgstr ""
 #~ "dem Geschäftsjahr verwendet (Bei vorläufigem Gewinn: Betrag wird "
 #~ "gutgeschrieben, bei vorläufigem Verlust: Betrag wird belastet.) Der Betrag "
 #~ "wird durch die Auswertung Gewinn & Verlust generiert."
+
+#~ msgid ""
+#~ "Gives the view used when writing or browsing entries in this journal. The "
+#~ "view tell Open ERP which fields should be visible, required or readonly and "
+#~ "in which order. You can create your own view for a faster encoding in each "
+#~ "journal."
+#~ msgstr ""
+#~ "Zeigt an, welche Sicht genutzt wird, wenn Sie dieses Journal durchblättern "
+#~ "oder etwas schreiben. Die Sichten geben Open ERP an, welche Felder sichtbar "
+#~ "sein sollen, zwingend benötigt werden, ob nur lesend auf sie zugegriffen "
+#~ "werden darf und in welcher Reihenfolge Sie erscheinen sollen. Sie können "
+#~ "Ihre eigene Sicht erstellen, um jedes Journal schneller erfassen zu können."
+
+#~ msgid "Print Taxes Report"
+#~ msgstr "Steuerbericht drucken"
+
+#, python-format
+#~ msgid ""
+#~ "No period defined for this date !\n"
+#~ "Please create a fiscal year."
+#~ msgstr ""
+#~ "Kein Zeitraum für dieses Datum definiert!\n"
+#~ "Bitte erzeugen Sie ein neues Geschäftsjahr."
diff --git a/addons/account/i18n/es_CL.po b/addons/account/i18n/es_CL.po
index 6ce752d5ce0..5a93cd3609a 100644
--- a/addons/account/i18n/es_CL.po
+++ b/addons/account/i18n/es_CL.po
@@ -8,13 +8,13 @@ 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-11 04:07+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-06-06 18:06+0000\n"
+"Last-Translator: Hector Rojas (doingIT.cl) <Unknown>\n"
 "Language-Team: Spanish (Chile) <es_CL@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-05-12 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-06-07 04:35+0000\n"
 "X-Generator: Launchpad (build 12959)\n"
 
 #. module: account
@@ -44,7 +44,7 @@ msgstr ""
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr ""
+msgstr "Conciliar asiento contable"
 
 #. module: account
 #: field:account.installer.modules,account_voucher:0
@@ -63,7 +63,7 @@ msgstr ""
 #: field:account.invoice,residual:0
 #: field:report.invoice.created,residual:0
 msgid "Residual"
-msgstr ""
+msgstr "Pendiente"
 
 #. module: account
 #: code:addons/account/invoice.py:793
@@ -89,7 +89,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "A cobrar vencidos hasta hoy"
 
 #. module: account
 #: field:account.partner.ledger,reconcil:0
@@ -124,11 +124,14 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disabled"
 msgstr ""
+"Si rompe la conciliación de transacciones, también debe verificar todas la "
+"acciones que están relacionadas con esas transacciones porque no serán "
+"deshabilitadas."
 
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "Accounting Entries-"
-msgstr ""
+msgstr "Asientos contables -"
 
 #. module: account
 #: code:addons/account/account.py:1305
@@ -140,7 +143,7 @@ msgstr ""
 #: report:account.invoice:0
 #: field:account.invoice.line,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Origen"
 
 #. module: account
 #: view:account.account:0
@@ -150,7 +153,7 @@ msgstr ""
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Reconcile"
-msgstr ""
+msgstr "Conciliar"
 
 #. module: account
 #: field:account.bank.statement.line,ref:0
@@ -178,7 +181,7 @@ msgstr ""
 #: code:addons/account/invoice.py:1436
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "¡Advertencia!"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -199,7 +202,7 @@ msgstr ""
 #. module: account
 #: selection:account.account.type,sign:0
 msgid "Negative"
-msgstr ""
+msgstr "Negativo"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:95
@@ -224,7 +227,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_tax
 msgid "account.tax"
-msgstr ""
+msgstr "account.tax"
 
 #. module: account
 #: code:addons/account/account.py:915
@@ -317,7 +320,7 @@ msgstr ""
 #. module: account
 #: field:account.journal.column,field:0
 msgid "Field Name"
-msgstr ""
+msgstr "Nombre del Campo"
 
 #. module: account
 #: help:account.installer,charts:0
@@ -351,7 +354,7 @@ msgstr ""
 #: view:account.installer:0
 #: view:account.installer.modules:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -360,7 +363,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -373,18 +376,18 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "account.tax.template"
-msgstr ""
+msgstr "account.tax.template"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
 msgid "account.bank.accounts.wizard"
-msgstr ""
+msgstr "account.bank.accounts.wizard"
 
 #. module: account
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 msgid "Creation date"
-msgstr ""
+msgstr "Fecha de creación"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -416,17 +419,17 @@ msgstr ""
 #. module: account
 #: field:account.journal,default_debit_account_id:0
 msgid "Default Debit Account"
-msgstr ""
+msgstr "Cuenta debito por defecto"
 
 #. module: account
 #: view:account.move:0
 msgid "Total Credit"
-msgstr ""
+msgstr "Total crédito"
 
 #. module: account
 #: selection:account.account.type,sign:0
 msgid "Positive"
-msgstr ""
+msgstr "Positivo"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
diff --git a/addons/account/i18n/he.po b/addons/account/i18n/he.po
index 67fea52771c..2008cd4d734 100644
--- a/addons/account/i18n/he.po
+++ b/addons/account/i18n/he.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:14+0000\n"
-"PO-Revision-Date: 2010-12-11 16:15+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-06-19 07:00+0000\n"
+"Last-Translator: Natan Alter <Unknown>\n"
 "Language-Team: Hebrew <he@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-04-29 05:07+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-20 04:33+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
-msgstr ""
+msgstr "מערכת תשלומים"
 
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
-msgstr ""
+msgstr "תצורה אחרת"
 
 #. module: account
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
@@ -34,7 +34,7 @@ msgid "No End of year journal defined for the fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
@@ -66,7 +66,7 @@ msgid "Residual"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
 #, python-format
 msgid "Please define sequence on invoice journal"
 msgstr ""
@@ -131,7 +131,7 @@ msgid "Accounting Entries-"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
 msgstr ""
@@ -175,7 +175,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -227,7 +227,7 @@ msgid "account.tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -255,7 +255,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -271,7 +271,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -309,7 +309,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -551,7 +551,7 @@ msgid "Not reconciled transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
 msgstr ""
@@ -633,7 +633,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -666,8 +666,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -728,7 +728,7 @@ msgid "Analytic Entries by line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
 msgstr ""
@@ -829,7 +829,7 @@ msgid "Next Partner to reconcile"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry ! Please note that you "
@@ -951,11 +951,11 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
@@ -1034,7 +1034,6 @@ msgstr ""
 
 #. module: account
 #: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "-"
@@ -1120,6 +1119,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -1127,7 +1127,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1265,7 +1265,6 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1295,7 +1294,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
 #, python-format
 msgid "You can not use this general account in this journal !"
 msgstr ""
@@ -1388,7 +1387,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
 #, python-format
 msgid ""
 "Cannot create the invoice !\n"
@@ -1547,7 +1546,6 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1614,7 +1612,7 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
 #, python-format
 msgid "The account is not defined to be reconciled !"
 msgstr ""
@@ -1647,7 +1645,7 @@ msgid "Receivables & Payables"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
 #, python-format
 msgid "You have to provide an account for the write off entry !"
 msgstr ""
@@ -1683,7 +1681,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -1704,7 +1702,7 @@ msgid "Tax Declaration: Credit Notes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr ""
@@ -1720,7 +1718,7 @@ msgid "You can not create move line on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
@@ -1989,7 +1987,7 @@ msgid " Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2041,7 +2039,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
@@ -2061,7 +2059,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2072,6 +2070,7 @@ msgid "Accounting Properties"
 msgstr ""
 
 #. module: account
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted By"
@@ -2100,6 +2099,7 @@ msgstr ""
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2208,7 +2208,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2278,7 +2278,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
@@ -2362,7 +2362,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2374,13 +2374,12 @@ msgid "Average Price"
 msgstr ""
 
 #. module: account
-#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
 #, python-format
 msgid ""
 "You cannot modify company of this journal as its related record exist in "
@@ -2416,6 +2415,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.overdue:0
 #: report:account.third_party_ledger:0
@@ -2524,16 +2524,16 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2693,7 +2693,7 @@ msgid "Analytic Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
@@ -2816,7 +2816,7 @@ msgid "BNK%s"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2906
+#: code:addons/account/account.py:2950
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
@@ -2925,6 +2925,7 @@ msgstr ""
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
 #: view:account.journal.period:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,journal_ids:0
@@ -2985,7 +2986,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3027,7 +3028,6 @@ msgstr ""
 #: view:account.invoice.report:0
 #: selection:account.invoice.report,state:0
 #: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
@@ -3079,7 +3079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr ""
@@ -3140,7 +3140,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3149,6 +3149,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3251,6 +3252,7 @@ msgstr ""
 #: field:account.entries.report,date:0
 #: selection:account.general.journal,filter:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice.report,date:0
 #: report:account.journal.period.print:0
 #: view:account.move:0
@@ -3294,7 +3296,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3303,13 +3305,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
 #, python-format
 msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
@@ -3429,7 +3431,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3440,14 +3442,14 @@ msgid "#Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3741,7 +3743,7 @@ msgid "Acc.Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr ""
@@ -3800,7 +3802,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -3975,7 +3977,7 @@ msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
@@ -4046,11 +4048,11 @@ msgid "Change"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
 #: code:addons/account/wizard/account_fiscalyear_close.py:78
 #: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4154,7 +4156,7 @@ msgid "You must define an analytic journal of type '%s' !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4219,7 +4221,7 @@ msgid "Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4331,25 +4333,24 @@ msgid "Third Party (Country)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_report_common.py:120
 #: code:addons/account/wizard/account_report_common.py:126
 #, python-format
@@ -4371,7 +4372,7 @@ msgid "Bank Details"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
 #, python-format
 msgid "Taxes missing !"
 msgstr ""
@@ -4426,7 +4427,7 @@ msgid "Check Date not in the Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4445,7 +4446,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4475,6 +4476,7 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,target_move:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.journal,target_move:0
 #: report:account.partner.balance:0
@@ -4557,7 +4559,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4703,7 +4705,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
@@ -4775,7 +4777,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
@@ -4803,7 +4805,7 @@ msgid "Start of period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
@@ -4859,12 +4861,12 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -4941,7 +4943,7 @@ msgid "Sort By"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -5088,7 +5090,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5124,7 +5126,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5261,7 +5263,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr ""
@@ -5286,14 +5288,14 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr ""
@@ -5328,7 +5330,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -5539,7 +5541,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
@@ -5805,9 +5807,9 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
 #, python-format
 msgid "Can not find account chart for this company, Please Create account."
 msgstr ""
@@ -5956,8 +5958,8 @@ msgid "Analytic Entries Statistics"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -5968,7 +5970,7 @@ msgid "Create manual recurring entries in a chosen journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6006,7 +6008,7 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6070,30 +6072,31 @@ msgid "  valuation: percent"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:292
 #: code:addons/account/account_bank_statement.py:305
 #: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
 #: code:addons/account/wizard/account_invoice_refund.py:100
 #: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6203,7 +6206,7 @@ msgid "Journal Select"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr ""
@@ -6220,9 +6223,11 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.report.general.ledger:0
 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
 #: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
 #: model:ir.ui.menu,name:account.menu_general_ledger
 msgid "General Ledger"
 msgstr ""
@@ -6276,7 +6281,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6306,7 +6311,7 @@ msgid "Child Codes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6463,7 +6468,7 @@ msgid "Lines"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
 #, python-format
 msgid ""
 "Can not find account chart for this company in invoice line account, Please "
@@ -6631,7 +6636,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -6735,7 +6740,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
 #, python-format
 msgid "You can not have two open register for the same journal"
 msgstr ""
@@ -6764,7 +6769,6 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
-#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -6794,6 +6798,7 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -6819,13 +6824,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
@@ -6843,7 +6848,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7077,17 +7082,17 @@ msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
 #: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7119,6 +7124,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7149,7 +7155,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7198,7 +7204,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7259,7 +7265,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7324,7 +7330,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
@@ -7359,6 +7365,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,period_id:0
 #: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
 #: field:account.journal.period,period_id:0
@@ -7521,7 +7528,7 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr ""
@@ -7571,6 +7578,7 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
 msgid "Filter By"
 msgstr ""
@@ -7609,7 +7617,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
@@ -7776,8 +7784,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -7788,7 +7796,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -7809,6 +7817,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -7981,14 +7990,14 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
 #, python-format
 msgid ""
 "You cannot modify company of this period as its related record exist in "
@@ -8037,7 +8046,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8053,7 +8062,7 @@ msgid "Configure Your Accounting Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
@@ -8091,6 +8100,7 @@ msgstr ""
 #: report:account.central.journal:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
@@ -8100,7 +8110,7 @@ msgid "Start Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
 #, python-format
 msgid "Cannot locate parent code for template account!"
 msgstr ""
@@ -8137,7 +8147,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. "
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
 #, python-format
 msgid ""
 "You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8165,7 +8175,7 @@ msgid "You can not create move line on view account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr ""
@@ -8214,6 +8224,7 @@ msgstr ""
 #: field:account.entries.report,balance:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8232,6 +8243,7 @@ msgstr ""
 
 #. module: account
 #: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
 msgid "Display Account"
 msgstr ""
 
@@ -8346,6 +8358,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
@@ -8353,7 +8366,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -8447,6 +8460,7 @@ msgstr ""
 #: report:account.central.journal:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
@@ -8490,7 +8504,7 @@ msgid "Account Subscription"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
 #, python-format
 msgid ""
 "Tax base different !\n"
@@ -8517,6 +8531,7 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,date_start:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -8545,7 +8560,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -8603,13 +8618,13 @@ msgid "Active"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
 #, python-format
 msgid "Unknown Error"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry !\n"
@@ -8652,10 +8667,10 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
-#: report:account.move.voucher:0
 #: report:account.partner.balance:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
@@ -8891,7 +8906,6 @@ msgstr ""
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
-#: report:account.move.voucher:0
 msgid "Posted"
 msgstr ""
 
@@ -8910,6 +8924,7 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,date_stop:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -8963,7 +8978,7 @@ msgid "This is a model for recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9113,8 +9128,8 @@ msgid "End period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9180,10 +9195,10 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
-#: report:account.move.voucher:0
 #: report:account.partner.balance:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
@@ -9217,7 +9232,7 @@ msgid "Recurring"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9238,7 +9253,7 @@ msgid "Range"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece !\n"
@@ -9368,7 +9383,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -9393,7 +9408,7 @@ msgid "The income or expense account related to the selected product."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
 msgstr ""
@@ -9598,7 +9613,7 @@ msgid "You must enter a period length that cannot be 0 or below !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
 msgstr ""
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index 920eeb97b90..8a55b558acc 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -7,49 +7,50 @@ 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-12-11 22:27+0000\n"
-"Last-Translator: Giedrius Slavinskas - inovera.lt "
-"<giedrius.slavinskas@gmail.com>\n"
+"PO-Revision-Date: 2011-07-07 11:41+0000\n"
+"Last-Translator: Edvinas Zemaitis <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-04-29 05:08+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-08 04:43+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
-msgstr ""
+msgstr "Sisteminis mokėjimas"
 
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
-msgstr ""
+msgstr "Kita konfigūracija"
 
 #. module: account
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #, python-format
 msgid "No End of year journal defined for the fiscal year"
-msgstr ""
+msgstr "Neužbaigtas metų žurnalas fiskaliniams metams"
 
 #. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
 "Partner."
 msgstr ""
+"Jūs negalite pašalinti ar išjungti sąskaitos kuri yra priskirta bet kuriam "
+"partneriui kaip nuosavybė."
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr ""
+msgstr "Suderinti žurnalo įrašą"
 
 #. module: account
 #: field:account.installer.modules,account_voucher:0
 msgid "Voucher Management"
-msgstr ""
+msgstr "Kvitų valdymas"
 
 #. module: account
 #: view:account.account:0
@@ -66,10 +67,10 @@ msgid "Residual"
 msgstr "Likutis"
 
 #. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
 #, python-format
 msgid "Please define sequence on invoice journal"
-msgstr ""
+msgstr "Prašome nurodyti eiliškumą sąskaitų žurnale"
 
 #. module: account
 #: constraint:account.period:0
@@ -79,17 +80,17 @@ msgstr "Klaida! Neteisinga periodo trukmė. "
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account currency"
-msgstr ""
+msgstr "Sąskaitos valiuta"
 
 #. module: account
 #: view:account.tax:0
 msgid "Children Definition"
-msgstr ""
+msgstr "Žemesnio lygio apibrėžimas"
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Pradelstos pajamos iki šiandienos"
 
 #. module: account
 #: field:account.partner.ledger,reconcil:0
@@ -102,11 +103,13 @@ msgid ""
 "The Profit and Loss report gives you an overview of your company profit and "
 "loss in a single document"
 msgstr ""
+"Pelno - nuostolių ataskaita leidžia peržiūrėti Jūsų įmonės pelną - nuostolį "
+"viename dokumente"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Import from invoice or payment"
-msgstr ""
+msgstr "Importuoti iš sąskaitos ar mokėjimo"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -124,6 +127,8 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disabled"
 msgstr ""
+"Jeigu Jūs nesuderinote transakcijų, Jūs taip pat turėtumėte patikrinti visus "
+"veiksmus kurie yra susiję su šiomis transakcijomis, nes jos nebus išjungtos"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -131,7 +136,7 @@ msgid "Accounting Entries-"
 msgstr "Apskaitos įrašai-"
 
 #. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
 msgstr "Jūs negalite ištrinti patvirtintų įrašų: \"%s\"!"
@@ -165,7 +170,7 @@ msgstr "Nuoroda"
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Choose Fiscal Year "
-msgstr ""
+msgstr "Pasirinkite finansinius metus "
 
 #. module: account
 #: help:account.payment.term,active:0
@@ -173,18 +178,20 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
+"Jeigu aktyvus laukelis nustatytas kaip \"ne\", leidžiame paslėpti apmokėjimo "
+"terminą jo nepašalinus."
 
 #. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Įspėjimas!"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
 msgid "Account Source"
-msgstr ""
+msgstr "Sąskaitos šaltinis"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
@@ -194,7 +201,7 @@ msgstr "Visi analitiniai įrašai"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "Sukurtos sąskaitos per pastarąsias 15 dienų"
 
 #. module: account
 #: selection:account.account.type,sign:0
@@ -205,7 +212,7 @@ msgstr "Neigiamas"
 #: code:addons/account/wizard/account_move_journal.py:95
 #, python-format
 msgid "Journal: %s"
-msgstr ""
+msgstr "Žurnalas: %s"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -227,7 +234,7 @@ msgid "account.tax"
 msgstr "Mokesčių sąskaita"
 
 #. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -259,7 +266,7 @@ msgstr ""
 "mokesčio kodu būtų rodomas sąskaitoje faktūroje."
 
 #. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -275,7 +282,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Jūs negalite pridėti/keisti įrašų uždarytame žurnale."
@@ -313,7 +320,7 @@ msgid "St."
 msgstr "g."
 
 #. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -555,7 +562,7 @@ msgid "Not reconciled transactions"
 msgstr "Nesugretintos transakcijos"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
 msgstr ""
@@ -639,7 +646,7 @@ msgid "Tax Code Amount"
 msgstr "Mokesčio kodo suma"
 
 #. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -672,8 +679,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -734,7 +741,7 @@ msgid "Analytic Entries by line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
 msgstr ""
@@ -835,7 +842,7 @@ msgid "Next Partner to reconcile"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry ! Please note that you "
@@ -959,11 +966,11 @@ msgid "Code"
 msgstr "Kodas"
 
 #. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
@@ -1042,7 +1049,6 @@ msgstr ""
 
 #. module: account
 #: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "-"
@@ -1128,6 +1134,7 @@ msgstr "# Transakcijų"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -1135,7 +1142,7 @@ msgid "Entry Label"
 msgstr "Įrašo žymė"
 
 #. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1273,7 +1280,6 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1303,7 +1309,7 @@ msgid "Central Journal"
 msgstr "Centrinis žurnalas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
 #, python-format
 msgid "You can not use this general account in this journal !"
 msgstr "Jūs negalite naudoti suminės sąskaitos šiame žurnale !"
@@ -1396,7 +1402,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
 #, python-format
 msgid ""
 "Cannot create the invoice !\n"
@@ -1555,7 +1561,6 @@ msgid "Separated Journal Sequences"
 msgstr "Atskiros žurnalo sekos"
 
 #. module: account
-#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1622,7 +1627,7 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
 #, python-format
 msgid "The account is not defined to be reconciled !"
 msgstr ""
@@ -1655,7 +1660,7 @@ msgid "Receivables & Payables"
 msgstr "Gautinos ir mokėtinos sumos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
 #, python-format
 msgid "You have to provide an account for the write off entry !"
 msgstr "Jūs turite nurodyti sąskaitą nurašymo įrašui"
@@ -1691,7 +1696,7 @@ msgid "Customer Ref:"
 msgstr "Kliento nuoroda"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -1712,7 +1717,7 @@ msgid "Tax Declaration: Credit Notes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr ""
@@ -1728,7 +1733,7 @@ msgid "You can not create move line on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
@@ -2001,7 +2006,7 @@ msgid " Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2019,6 +2024,11 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for depreciated "
 "accounts."
 msgstr ""
+"Ši reikšmė naudojama išskirti sąskaitų tipus naudojant kai kurias OpenERP "
+"funkcijas: žiūrėti - negali būti įrašų, Konsolidacija - sąskaitos kurios "
+"gali turėti žemesnės klasės sąskaitas multi-kompanijos konsolidacijai, "
+"pajamos/sąnaudos - partnerių sąskaitoms (kredito debito apskaičiavimui), "
+"uždaryta - nenaudojamoms sąskaitoms"
 
 #. module: account
 #: view:account.chart.template:0
@@ -2053,7 +2063,7 @@ msgid "Description"
 msgstr "Aprašymas"
 
 #. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
@@ -2073,7 +2083,7 @@ msgid "Income Account"
 msgstr "Pajamų sąskaita"
 
 #. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2084,6 +2094,7 @@ msgid "Accounting Properties"
 msgstr "Apskaitos savybės"
 
 #. module: account
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted By"
@@ -2112,6 +2123,7 @@ msgstr ""
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2222,7 +2234,7 @@ msgid "Account Tax Code"
 msgstr "Sąskaitos mokesčio kodas"
 
 #. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2292,7 +2304,7 @@ msgid "Account Model Entries"
 msgstr "Sąskaitos modelio įrašai"
 
 #. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
@@ -2376,7 +2388,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2388,13 +2400,12 @@ msgid "Average Price"
 msgstr ""
 
 #. module: account
-#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
 msgstr "Data:"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
 #, python-format
 msgid ""
 "You cannot modify company of this journal as its related record exist in "
@@ -2430,6 +2441,7 @@ msgstr "Nuolaida (%)"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.overdue:0
 #: report:account.third_party_ledger:0
@@ -2538,16 +2550,16 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2707,7 +2719,7 @@ msgid "Analytic Entries"
 msgstr "Analitiniai įrašai"
 
 #. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
@@ -2830,7 +2842,7 @@ msgid "BNK%s"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2906
+#: code:addons/account/account.py:2950
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
@@ -2939,6 +2951,7 @@ msgstr "Norėdami naudoti sąnaudų sąskaitą, palikite tuščią"
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
 #: view:account.journal.period:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,journal_ids:0
@@ -2999,7 +3012,7 @@ msgid "Starting Balance"
 msgstr "Pradinis likutis"
 
 #. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nėra nurodyta partnerio !"
@@ -3041,7 +3054,6 @@ msgstr ""
 #: view:account.invoice.report:0
 #: selection:account.invoice.report,state:0
 #: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
@@ -3093,7 +3105,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr ""
@@ -3155,7 +3167,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3164,6 +3176,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3268,6 +3281,7 @@ msgstr ""
 #: field:account.entries.report,date:0
 #: selection:account.general.journal,filter:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice.report,date:0
 #: report:account.journal.period.print:0
 #: view:account.move:0
@@ -3312,7 +3326,7 @@ msgid "Chart of Accounts Template"
 msgstr "Sąskaitų plano šablonas"
 
 #. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3321,13 +3335,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Kai kurie įrašai jau yra sugretinti !"
 
 #. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
 #, python-format
 msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
@@ -3449,7 +3463,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Negalima pakeisti mokesčio !"
@@ -3460,14 +3474,14 @@ msgid "#Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3763,7 +3777,7 @@ msgid "Acc.Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr "Sąskaitos faktūros eilutėse nėra nurodyta mokesčių !"
@@ -3822,7 +3836,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -3997,7 +4011,7 @@ msgid "Credit Notes"
 msgstr "Grąžinimas"
 
 #. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
@@ -4068,11 +4082,11 @@ msgid "Change"
 msgstr "Keisti"
 
 #. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
 #: code:addons/account/wizard/account_fiscalyear_close.py:78
 #: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4176,7 +4190,7 @@ msgid "You must define an analytic journal of type '%s' !"
 msgstr "Jūs turite pasirinkti analitinio žurnalo tipą  '%s' !"
 
 #. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4241,7 +4255,7 @@ msgid "Invoices"
 msgstr "Sąskaitos faktūros"
 
 #. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4353,25 +4367,24 @@ msgid "Third Party (Country)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_report_common.py:120
 #: code:addons/account/wizard/account_report_common.py:126
 #, python-format
@@ -4393,7 +4406,7 @@ msgid "Bank Details"
 msgstr "Banko rekvizitai"
 
 #. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
 #, python-format
 msgid "Taxes missing !"
 msgstr "Mokesčiai praleisti !"
@@ -4448,7 +4461,7 @@ msgid "Check Date not in the Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4470,7 +4483,7 @@ msgid "Child Tax Accounts"
 msgstr "Vaikinė mokesčio sąskaita"
 
 #. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4500,6 +4513,7 @@ msgstr "Analitinis balansas -"
 #: report:account.general.journal:0
 #: field:account.general.journal,target_move:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.journal,target_move:0
 #: report:account.partner.balance:0
@@ -4582,7 +4596,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "Integrity Error !"
 msgstr "Integracijos klaida !"
@@ -4728,7 +4742,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
@@ -4802,7 +4816,7 @@ msgstr ""
 "01.15, dienų skaičius=22, mėnesio diena=-1, tai apmokėjimo data 02.28."
 
 #. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
@@ -4830,7 +4844,7 @@ msgid "Start of period"
 msgstr "Periodo pradžia"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
@@ -4888,12 +4902,12 @@ msgstr "Fiskalinių metų uždarymo įrašų žurnalas"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -4970,7 +4984,7 @@ msgid "Sort By"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -5119,7 +5133,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5155,7 +5169,7 @@ msgstr "Vaikinės sąskaitos"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
 #, python-format
 msgid "Write-Off"
 msgstr "Nurašymas"
@@ -5292,7 +5306,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr ""
@@ -5317,14 +5331,14 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Negalite naudoti neaktyvios sąskaitos!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr "Įrašai nėra tos pačios sąskaitos arba jau sugretinti ! "
@@ -5359,7 +5373,7 @@ msgstr "7"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -5570,7 +5584,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
@@ -5836,9 +5850,9 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
 #, python-format
 msgid "Can not find account chart for this company, Please Create account."
 msgstr ""
@@ -5987,8 +6001,8 @@ msgid "Analytic Entries Statistics"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
 #, python-format
 msgid "Entries: "
 msgstr "Įrašai: "
@@ -5999,7 +6013,7 @@ msgid "Create manual recurring entries in a chosen journal."
 msgstr "Sukurti pasikartojančius įrašus pasirinktame žurnale."
 
 #. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Negalima sukurti DK įrašų skirtingoms įmonėms"
@@ -6037,7 +6051,7 @@ msgid "Total debit"
 msgstr "Iš viso debeto"
 
 #. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Įrašas \"%s\" yra nepatvirtintas !"
@@ -6102,30 +6116,31 @@ msgid "  valuation: percent"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:292
 #: code:addons/account/account_bank_statement.py:305
 #: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
 #: code:addons/account/wizard/account_invoice_refund.py:100
 #: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6235,7 +6250,7 @@ msgid "Journal Select"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr ""
@@ -6252,9 +6267,11 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.report.general.ledger:0
 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
 #: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
 #: model:ir.ui.menu,name:account.menu_general_ledger
 msgid "General Ledger"
 msgstr "Didžioji knyga"
@@ -6308,7 +6325,7 @@ msgid "Total:"
 msgstr "Iš viso:"
 
 #. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6338,7 +6355,7 @@ msgid "Child Codes"
 msgstr "Vaikiniai kodai"
 
 #. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6497,7 +6514,7 @@ msgid "Lines"
 msgstr "Eilutės"
 
 #. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
 #, python-format
 msgid ""
 "Can not find account chart for this company in invoice line account, Please "
@@ -6665,7 +6682,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -6769,7 +6786,7 @@ msgid "Sign on Reports"
 msgstr "Ženklas ataskaitose"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
 #, python-format
 msgid "You can not have two open register for the same journal"
 msgstr ""
@@ -6798,7 +6815,6 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
-#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr "Išankstinė sąskaita"
 
@@ -6828,6 +6844,7 @@ msgstr "Papildoma informacija"
 
 #. module: account
 #: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -6853,13 +6870,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
 #, python-format
 msgid "Bad account !"
 msgstr "Bloga sąskaita !"
 
 #. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
@@ -6877,7 +6894,7 @@ msgid "Invoice Tax"
 msgstr "Sąskaitos faktūros mokesčiai"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
 #, python-format
 msgid "No piece number !"
 msgstr "Nenurodytas numeris !"
@@ -7116,17 +7133,17 @@ msgid "Fixed"
 msgstr "Fiksuotas"
 
 #. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
 #: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
 #, python-format
 msgid "Warning !"
 msgstr "Įspėjimas!"
@@ -7158,6 +7175,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7188,7 +7206,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7237,7 +7255,7 @@ msgid "Deferral Method"
 msgstr "Metų pabaigos veiksmas"
 
 #. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7298,7 +7316,7 @@ msgid "Associated Partner"
 msgstr "Susijęs partneris"
 
 #. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Visų pirma turite pasirinkti partnerį !"
@@ -7363,7 +7381,7 @@ msgid "Choose Fiscal Year"
 msgstr "Pasirinkite mokestinius metus"
 
 #. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
@@ -7398,6 +7416,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,period_id:0
 #: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
 #: field:account.journal.period,period_id:0
@@ -7560,7 +7579,7 @@ msgid "Account Types"
 msgstr "Sąskaitų tipai"
 
 #. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr ""
@@ -7611,6 +7630,7 @@ msgstr "Grąžinimų žurnalas"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
 msgid "Filter By"
 msgstr ""
@@ -7649,7 +7669,7 @@ msgid "Payment Term Line"
 msgstr "Mokėjimo terminų eilutės"
 
 #. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
@@ -7818,8 +7838,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
 #, python-format
 msgid "Bad account!"
 msgstr "Netinkama sąskaita !"
@@ -7830,7 +7850,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -7853,6 +7873,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8027,14 +8048,14 @@ msgid "Period from"
 msgstr "Periodas nuo"
 
 #. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
 #, python-format
 msgid ""
 "You cannot modify company of this period as its related record exist in "
@@ -8083,7 +8104,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8099,7 +8120,7 @@ msgid "Configure Your Accounting Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
@@ -8137,6 +8158,7 @@ msgstr ""
 #: report:account.central.journal:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
@@ -8146,7 +8168,7 @@ msgid "Start Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
 #, python-format
 msgid "Cannot locate parent code for template account!"
 msgstr ""
@@ -8183,7 +8205,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. "
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
 #, python-format
 msgid ""
 "You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8211,7 +8233,7 @@ msgid "You can not create move line on view account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr ""
@@ -8260,6 +8282,7 @@ msgstr "Norėdami naudoti pajamų sąskaitą, palikite tuščią"
 #: field:account.entries.report,balance:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8278,6 +8301,7 @@ msgstr ""
 
 #. module: account
 #: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
 msgid "Display Account"
 msgstr ""
 
@@ -8392,6 +8416,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
@@ -8399,7 +8424,7 @@ msgid "Move"
 msgstr "DK įrašas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -8493,6 +8518,7 @@ msgstr ""
 #: report:account.central.journal:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
@@ -8536,7 +8562,7 @@ msgid "Account Subscription"
 msgstr "Periodiniai įrašai"
 
 #. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
 #, python-format
 msgid ""
 "Tax base different !\n"
@@ -8565,6 +8591,7 @@ msgstr "Periodiniai įrašai"
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,date_start:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -8593,7 +8620,7 @@ msgid "Unreconciled"
 msgstr "Nesugretinta"
 
 #. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
 #, python-format
 msgid "Bad total !"
 msgstr "Bloga suma !"
@@ -8651,13 +8678,13 @@ msgid "Active"
 msgstr "Aktyvus"
 
 #. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
 #, python-format
 msgid "Unknown Error"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry !\n"
@@ -8702,10 +8729,10 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
-#: report:account.move.voucher:0
 #: report:account.partner.balance:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
@@ -8941,7 +8968,6 @@ msgstr ""
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
-#: report:account.move.voucher:0
 msgid "Posted"
 msgstr "Užregistruota"
 
@@ -8960,6 +8986,7 @@ msgstr "Užregistruota"
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,date_stop:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -9013,7 +9040,7 @@ msgid "This is a model for recurring accounting entries"
 msgstr "Modelis skirtas pasikartojantiems sąskaitų įrašams"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9163,8 +9190,8 @@ msgid "End period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9230,10 +9257,10 @@ msgstr "Tiekėjo sąskaita faktūra"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
-#: report:account.move.voucher:0
 #: report:account.partner.balance:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
@@ -9267,7 +9294,7 @@ msgid "Recurring"
 msgstr "Pasikartojantis"
 
 #. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Įrašas jau yra sugretintas"
@@ -9288,7 +9315,7 @@ msgid "Range"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece !\n"
@@ -9418,7 +9445,7 @@ msgid "Accounts Mapping"
 msgstr "Sąskaitų nustatymai"
 
 #. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -9443,7 +9470,7 @@ msgid "The income or expense account related to the selected product."
 msgstr "Pajamų ir išlaidų sąskaitos susijusios su pasirinktu produktu."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
 msgstr ""
@@ -9649,7 +9676,7 @@ msgstr ""
 "Turite įvesti periodo trukmę, kuri negali būti lygi 0 ar būti neigiama."
 
 #. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
 msgstr "Jūs negali ištrinti sąskaitos kuri turi įrašų! "
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index e3c4f508e2f..12a1b35a98a 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.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: 2011-05-04 03:16+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2011-07-02 18:53+0000\n"
+"Last-Translator: Nédio Batista Marques <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-05-05 04:40+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-07-03 04:46+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -33,7 +33,7 @@ msgid "No End of year journal defined for the fiscal year"
 msgstr "Nenhum Livro de Encerramento definido para o Ano Fiscal."
 
 #. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
@@ -67,7 +67,7 @@ msgid "Residual"
 msgstr "Residual"
 
 #. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
 #, python-format
 msgid "Please define sequence on invoice journal"
 msgstr "Defina uma sequencia para o diário"
@@ -136,7 +136,7 @@ msgid "Accounting Entries-"
 msgstr "Lançamentos contábeis-"
 
 #. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
 msgstr "Você não pode excluir o movimento postado: \"%s\"!"
@@ -182,7 +182,7 @@ msgstr ""
 "pagamento sem as remover."
 
 #. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
@@ -237,7 +237,7 @@ msgid "account.tax"
 msgstr "account.tax"
 
 #. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -270,7 +270,7 @@ msgstr ""
 "(IVA) relativos a este código de imposto apareçam nas faturas"
 
 #. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Fatura '%s' é parcialmente paga: %s%s of %s%s (%s%s restantes)"
@@ -286,7 +286,7 @@ msgid "Belgian Reports"
 msgstr "Relatórios belgas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Você não pode incluir/modificar as lançamentos em um diário fechado."
@@ -324,12 +324,11 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
-"A companhia da conta da linha da fatura, não corresponde à companhia da "
-"fatura."
+"A empresa da conta da linha da fatura, não corresponde à empresa da fatura."
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -586,7 +585,7 @@ msgid "Not reconciled transactions"
 msgstr "Transação não conciliada"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
 msgstr "Balanço de Caixa não confere com Balanço Calculado"
@@ -671,7 +670,7 @@ msgid "Tax Code Amount"
 msgstr "Valor do Código do Imposto"
 
 #. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -704,8 +703,8 @@ msgid "Journal Period"
 msgstr "Período do Diário"
 
 #. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -768,7 +767,7 @@ msgid "Analytic Entries by line"
 msgstr "Entradas analíticas por linha"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
 msgstr "É permitido alterar a moeda apenas para Fatura Rascunho"
@@ -872,7 +871,7 @@ msgid "Next Partner to reconcile"
 msgstr "Próximo Parceiro a reconciliar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry ! Please note that you "
@@ -999,11 +998,11 @@ msgid "Code"
 msgstr "Código"
 
 #. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
@@ -1084,7 +1083,6 @@ msgstr "Lucros e Perdas (Conta de Despesas)"
 
 #. module: account
 #: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "-"
@@ -1175,6 +1173,7 @@ msgstr "# de transações"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -1182,7 +1181,7 @@ msgid "Entry Label"
 msgstr "Aba de lançamento"
 
 #. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1321,7 +1320,6 @@ msgid "Journal Items Analysis"
 msgstr "Análise de Itens de Diário"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Parceiros"
@@ -1351,7 +1349,7 @@ msgid "Central Journal"
 msgstr "Diário Central"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
 #, python-format
 msgid "You can not use this general account in this journal !"
 msgstr "Voce não pode usar esta conta geral neste diário !"
@@ -1448,7 +1446,7 @@ msgid ""
 msgstr "Exemplo: 2% em 14 dias, restante em 30 dias no fim do mês."
 
 #. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
 #, python-format
 msgid ""
 "Cannot create the invoice !\n"
@@ -1618,7 +1616,6 @@ msgid "Separated Journal Sequences"
 msgstr "Sequências de diário separadas"
 
 #. module: account
-#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Responsável"
@@ -1690,7 +1687,7 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr "Erro! Você não pode definir anos fiscais que se sobreponham."
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
 #, python-format
 msgid "The account is not defined to be reconciled !"
 msgstr "A conta não está definida para ser reconciliada !"
@@ -1725,7 +1722,7 @@ msgid "Receivables & Payables"
 msgstr "Recebíveis & Pagáveis"
 
 #. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
 #, python-format
 msgid "You have to provide an account for the write off entry !"
 msgstr "Você tem que fornecer uma conta para o lançamento da baixa !"
@@ -1761,7 +1758,7 @@ msgid "Customer Ref:"
 msgstr "Ref.Cliente:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Usuário %s não possui permissões para acessar o diário %s !"
@@ -1782,7 +1779,7 @@ msgid "Tax Declaration: Credit Notes"
 msgstr "Declaração de Impostos: Observações de Crédito"
 
 #. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr ""
@@ -1799,7 +1796,7 @@ msgid "You can not create move line on closed account."
 msgstr "Você não pode criar linhas de movimento em uma conta fechada."
 
 #. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
@@ -2082,7 +2079,7 @@ msgid " Journal"
 msgstr " Diário"
 
 #. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2144,7 +2141,7 @@ msgid "Description"
 msgstr "Descrição"
 
 #. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
@@ -2164,7 +2161,7 @@ msgid "Income Account"
 msgstr "Conta de Receita"
 
 #. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Não existe Diário Contábil do tipo Compra/Venda definido!"
@@ -2175,6 +2172,7 @@ msgid "Accounting Properties"
 msgstr "Propriedades da Conta"
 
 #. module: account
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted By"
@@ -2203,6 +2201,7 @@ msgstr "Modelo de produto"
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2312,7 +2311,7 @@ msgid "Account Tax Code"
 msgstr "Código da conta de impostos"
 
 #. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2393,7 +2392,7 @@ msgid "Account Model Entries"
 msgstr "Modelo de entrada de contas"
 
 #. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
@@ -2484,7 +2483,7 @@ msgid "Accounts"
 msgstr "Contas"
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
 #, python-format
 msgid "Configuration Error!"
 msgstr "Erro de Configuração!"
@@ -2496,13 +2495,12 @@ msgid "Average Price"
 msgstr "Preço médio"
 
 #. module: account
-#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
 msgstr "Data:"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
 #, python-format
 msgid ""
 "You cannot modify company of this journal as its related record exist in "
@@ -2540,6 +2538,7 @@ msgstr "Desc.(%)"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.overdue:0
 #: report:account.third_party_ledger:0
@@ -2656,16 +2655,16 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Este assistente irá criar lançamentos contábeis periódicos"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Nenhuma seqüência definida no diário !"
 
 #. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2837,7 +2836,7 @@ msgid "Analytic Entries"
 msgstr "Lançamentos analíticos"
 
 #. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
@@ -2969,7 +2968,7 @@ msgid "BNK%s"
 msgstr "BCO%s"
 
 #. module: account
-#: code:addons/account/account.py:2906
+#: code:addons/account/account.py:2950
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
@@ -3091,6 +3090,7 @@ msgstr "Deixe vazio para usar a conta de despesas"
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
 #: view:account.journal.period:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,journal_ids:0
@@ -3151,7 +3151,7 @@ msgid "Starting Balance"
 msgstr "Saldo Inicial"
 
 #. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Número do parceiro definido !"
@@ -3195,7 +3195,6 @@ msgstr "Diário"
 #: view:account.invoice.report:0
 #: selection:account.invoice.report,state:0
 #: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
@@ -3249,7 +3248,7 @@ msgstr ""
 "que você não poderá mais alterar seus campos."
 
 #. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr "Impossível excluir fatura(s) que já foram abertas ou pagas!"
@@ -3312,7 +3311,7 @@ msgstr ""
 "'Cancelado' ou 'Concluído'!"
 
 #. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3323,6 +3322,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr "Contra-parte"
 
@@ -3428,6 +3428,7 @@ msgstr ""
 #: field:account.entries.report,date:0
 #: selection:account.general.journal,filter:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice.report,date:0
 #: report:account.journal.period.print:0
 #: view:account.move:0
@@ -3471,7 +3472,7 @@ msgid "Chart of Accounts Template"
 msgstr "Modelo de plano de contas"
 
 #. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3483,13 +3484,13 @@ msgstr ""
 "Por favor, defina o parceiro sobre ela!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Alguns lançamentos já estão conciliados !"
 
 #. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
 #, python-format
 msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
@@ -3617,7 +3618,7 @@ msgid "Analytic Items"
 msgstr "Itens Analíticos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Não foi possível alterar o imposto!"
@@ -3628,14 +3629,14 @@ msgid "#Entries"
 msgstr "#Entradas"
 
 #. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
 msgstr "Você selecionou uma unidade que não é compatível com o produto."
 
 #. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3949,7 +3950,7 @@ msgid "Acc.Type"
 msgstr "Tipo de Conta"
 
 #. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr ""
@@ -4014,7 +4015,7 @@ msgstr ""
 "...) os quais já são gerados com status 'Postado'."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4193,7 +4194,7 @@ msgid "Credit Notes"
 msgstr "Notas de crédito"
 
 #. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
@@ -4247,7 +4248,7 @@ msgstr "Taxa incluida no preço"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
 msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr ""
+msgstr "Livro-razão Conta Custo Analítico para o Relatório de Diários"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
@@ -4266,11 +4267,11 @@ msgid "Change"
 msgstr "Alterar"
 
 #. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
 #: code:addons/account/wizard/account_fiscalyear_close.py:78
 #: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4376,7 +4377,7 @@ msgid "You must define an analytic journal of type '%s' !"
 msgstr "Você tem que definir um diário analítico '%s' !"
 
 #. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4448,7 +4449,7 @@ msgid "Invoices"
 msgstr "Faturas"
 
 #. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4562,25 +4563,24 @@ msgid "Third Party (Country)"
 msgstr "Terceiro (País)"
 
 #. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_report_common.py:120
 #: code:addons/account/wizard/account_report_common.py:126
 #, python-format
@@ -4602,7 +4602,7 @@ msgid "Bank Details"
 msgstr "Detalhes bancários"
 
 #. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
 #, python-format
 msgid "Taxes missing !"
 msgstr "Impostos faltando!"
@@ -4661,7 +4661,7 @@ msgid "Check Date not in the Period"
 msgstr "Verificar Data fora do Período"
 
 #. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4683,7 +4683,7 @@ msgid "Child Tax Accounts"
 msgstr "Contas de impostos derivados (subcontas)"
 
 #. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Período Inicial deve ser anterior ao Período Final"
@@ -4713,6 +4713,7 @@ msgstr "Balanço analítico -"
 #: report:account.general.journal:0
 #: field:account.general.journal,target_move:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.journal,target_move:0
 #: report:account.partner.balance:0
@@ -4795,7 +4796,7 @@ msgid "Line 1:"
 msgstr "Linha 1:"
 
 #. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "Integrity Error !"
 msgstr "Erro de integridade !"
@@ -4945,7 +4946,7 @@ msgstr ""
 "um parceiro"
 
 #. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
@@ -5020,7 +5021,7 @@ msgstr ""
 "28/02."
 
 #. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
@@ -5048,7 +5049,7 @@ msgid "Start of period"
 msgstr "Início do período"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
@@ -5060,7 +5061,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
 msgid "Account Common Account Report"
-msgstr ""
+msgstr "Relatório de Contas da Contabilidade Geral"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
@@ -5106,12 +5107,12 @@ msgstr "Diário de lançamentos do fim do ano"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5191,7 +5192,7 @@ msgid "Sort By"
 msgstr "Ordenar Por"
 
 #. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -5346,7 +5347,7 @@ msgid "Generate Opening Entries"
 msgstr "Gerar Lançamentos de Abertura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Já Reconciliado"
@@ -5384,7 +5385,7 @@ msgstr "Sub-contas"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
 #, python-format
 msgid "Write-Off"
 msgstr "Baixa ou exclusão"
@@ -5433,6 +5434,8 @@ msgid ""
 "Streamlines invoice payment and creates hooks to plug automated payment "
 "systems in."
 msgstr ""
+"Simplifica o pagamento de faturas e cria ligações com o sistema de pagamento "
+"automático."
 
 #. module: account
 #: field:account.payment.term.line,value:0
@@ -5534,7 +5537,7 @@ msgid "# of Lines"
 msgstr "# de Linhas"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr "A nova moeda não está configurada corretamente !"
@@ -5559,14 +5562,14 @@ msgid "Filter by"
 msgstr "Filtrar por"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Voce não pode usar uma conta inativa!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr "Lançamentos não são das mesmas contas ou já estão conciliados ! "
@@ -5601,7 +5604,7 @@ msgstr "7"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
 #, python-format
 msgid "Invalid action !"
 msgstr "Ação invalida !"
@@ -5821,7 +5824,7 @@ msgid "Companies"
 msgstr "Empresas"
 
 #. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
@@ -6102,9 +6105,9 @@ msgid "Optional create"
 msgstr "Criação opcional"
 
 #. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
 #, python-format
 msgid "Can not find account chart for this company, Please Create account."
 msgstr ""
@@ -6257,8 +6260,8 @@ msgid "Analytic Entries Statistics"
 msgstr "Estatísticas de Lançamentos Analíticos"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
 #, python-format
 msgid "Entries: "
 msgstr "Lancamentos: "
@@ -6269,7 +6272,7 @@ msgid "Create manual recurring entries in a chosen journal."
 msgstr "Criar lançamentos recorrentes manuais no diário escolhido."
 
 #. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Não foi possível criar movimentação entre empresas diferentes"
@@ -6316,7 +6319,7 @@ msgid "Total debit"
 msgstr "Débito Total"
 
 #. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Lançamento \"%s\" não é válido"
@@ -6386,30 +6389,31 @@ msgid "  valuation: percent"
 msgstr "  valorização: porcentagem"
 
 #. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:292
 #: code:addons/account/account_bank_statement.py:305
 #: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
 #: code:addons/account/wizard/account_invoice_refund.py:100
 #: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6529,7 +6533,7 @@ msgid "Journal Select"
 msgstr "Selecionar Diário"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr "A moeda atual não está configurada corretamente !"
@@ -6546,9 +6550,11 @@ msgstr "Posição Fiscal dos Impostos"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.report.general.ledger:0
 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
 #: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
 #: model:ir.ui.menu,name:account.menu_general_ledger
 msgid "General Ledger"
 msgstr "Livro Razão"
@@ -6609,7 +6615,7 @@ msgid "Total:"
 msgstr "Total:"
 
 #. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6646,7 +6652,7 @@ msgid "Child Codes"
 msgstr "Códigos derivados (sub-contas)"
 
 #. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6830,7 +6836,7 @@ msgid "Lines"
 msgstr "Linhas"
 
 #. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
 #, python-format
 msgid ""
 "Can not find account chart for this company in invoice line account, Please "
@@ -7031,7 +7037,7 @@ msgstr ""
 "personalizado."
 
 #. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "Você deveria ter escolhido períodos que pertencem a mesma empresa"
@@ -7145,7 +7151,7 @@ msgid "Sign on Reports"
 msgstr "Assinar relatórios"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
 #, python-format
 msgid "You can not have two open register for the same journal"
 msgstr "Você não pode ter dois registradores abertos para o mesmo diário"
@@ -7180,7 +7186,6 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
-#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr "Pro-forma"
 
@@ -7212,6 +7217,7 @@ msgstr "Informação Opcional"
 
 #. module: account
 #: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -7239,13 +7245,13 @@ msgstr ""
 "Você pode colocar data limite para o pagamento desta linha."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
 #, python-format
 msgid "Bad account !"
 msgstr "Conta errada!"
 
 #. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
@@ -7263,7 +7269,7 @@ msgid "Invoice Tax"
 msgstr "Taxa de fatura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
 #, python-format
 msgid "No piece number !"
 msgstr "Nenhum número da parte!"
@@ -7510,17 +7516,17 @@ msgid "Fixed"
 msgstr "Fixo"
 
 #. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
 #: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
 #, python-format
 msgid "Warning !"
 msgstr "Atenção !"
@@ -7552,6 +7558,7 @@ msgstr "Valor (por extenso) :"
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7582,7 +7589,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Não pode %s provisório/proforma/cancelar fatura."
 
 #. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Sem Linhas na Fatura !"
@@ -7631,7 +7638,7 @@ msgid "Deferral Method"
 msgstr "Método para deferimento"
 
 #. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "A Fatura '%s' está paga."
@@ -7696,7 +7703,7 @@ msgid "Associated Partner"
 msgstr "Parceiro Associado"
 
 #. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Voce precisa selecionar um parceiro primeiro !"
@@ -7766,7 +7773,7 @@ msgid "Choose Fiscal Year"
 msgstr "Escolha o Ano Fiscal"
 
 #. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
@@ -7804,6 +7811,7 @@ msgstr "Gestão Financeira e Contábil"
 #: view:account.entries.report:0
 #: field:account.entries.report,period_id:0
 #: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
 #: field:account.journal.period,period_id:0
@@ -7983,7 +7991,7 @@ msgid "Account Types"
 msgstr "Tipos de Conta"
 
 #. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr "Não é possível criar um movimento de fatura no diário centralizado"
@@ -8033,6 +8041,7 @@ msgstr "Diário de Devolução"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
 msgid "Filter By"
 msgstr "Filtrar Por"
@@ -8075,7 +8084,7 @@ msgid "Payment Term Line"
 msgstr "Linha da forma de pagamento"
 
 #. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
@@ -8247,8 +8256,8 @@ msgstr ""
 "O valor do recibo deve ser o mesmo valor da linha equivalente no extrato"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
 #, python-format
 msgid "Bad account!"
 msgstr "Conta inválida!"
@@ -8259,7 +8268,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Deixe vazio para todos os anos fiscais abertos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "O movimento de conta (%s) para centralização foi confirmado!"
@@ -8282,6 +8291,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8479,14 +8489,14 @@ msgid "Period from"
 msgstr "Período de"
 
 #. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Diário de Devolução de Vendas"
 
 #. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
 #, python-format
 msgid ""
 "You cannot modify company of this period as its related record exist in "
@@ -8537,7 +8547,7 @@ msgid "Purchase Tax(%)"
 msgstr "Imposto de Compra(%)"
 
 #. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Por favor, crie algumas linhas da fatura."
@@ -8553,7 +8563,7 @@ msgid "Configure Your Accounting Application"
 msgstr "Configure sua Aplicação Contábil"
 
 #. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
@@ -8597,6 +8607,7 @@ msgstr "Gestão de Acompanhamentos"
 #: report:account.central.journal:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
@@ -8606,7 +8617,7 @@ msgid "Start Period"
 msgstr "Período Inicial"
 
 #. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
 #, python-format
 msgid "Cannot locate parent code for template account!"
 msgstr "Impossível localizar o código da conta pai para o modelo de conta!"
@@ -8643,7 +8654,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. "
 msgstr "O Contador valida os lançamentos contábeis vindos da fatura. "
 
 #. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
 #, python-format
 msgid ""
 "You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8673,7 +8684,7 @@ msgid "You can not create move line on view account."
 msgstr "Você não pode criar linhas de movimento em uma conta de exibição."
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr "A moeda atual não está configurada corretamente !"
@@ -8726,6 +8737,7 @@ msgstr "Manter vazio para usar a conta de receita"
 #: field:account.entries.report,balance:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8744,6 +8756,7 @@ msgstr "Entrada manual ou automática no sistema"
 
 #. module: account
 #: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
 msgid "Display Account"
 msgstr "Mostrar Conta"
 
@@ -8870,6 +8883,7 @@ msgstr "Lançamento manual"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
@@ -8877,7 +8891,7 @@ msgid "Move"
 msgstr "Movimento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -8976,6 +8990,7 @@ msgstr "Balanço de Conta Analítica"
 #: report:account.central.journal:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
@@ -9019,7 +9034,7 @@ msgid "Account Subscription"
 msgstr "Inscriçãoda conta"
 
 #. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
 #, python-format
 msgid ""
 "Tax base different !\n"
@@ -9048,6 +9063,7 @@ msgstr "Inscrição de Lançamento"
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,date_start:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -9076,7 +9092,7 @@ msgid "Unreconciled"
 msgstr "Não conciliado"
 
 #. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
 #, python-format
 msgid "Bad total !"
 msgstr "Total inválido!"
@@ -9134,13 +9150,13 @@ msgid "Active"
 msgstr "Ativo"
 
 #. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
 #, python-format
 msgid "Unknown Error"
 msgstr "Erro Desconhecido"
 
 #. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry !\n"
@@ -9188,10 +9204,10 @@ msgstr "Validar Movimento de Conta"
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
-#: report:account.move.voucher:0
 #: report:account.partner.balance:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
@@ -9441,7 +9457,6 @@ msgstr "Selecione o período"
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
-#: report:account.move.voucher:0
 msgid "Posted"
 msgstr "Postado"
 
@@ -9460,6 +9475,7 @@ msgstr "Postado"
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,date_stop:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -9513,7 +9529,7 @@ msgid "This is a model for recurring accounting entries"
 msgstr "Este é um modelo para lançamentos recorrentes de contabilização"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Não há conta de entrada definida para este produto:\"%s\" (id:%d)"
@@ -9668,8 +9684,8 @@ msgid "End period"
 msgstr "Período final"
 
 #. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9735,10 +9751,10 @@ msgstr "Fatura do fornecedor"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
-#: report:account.move.voucher:0
 #: report:account.partner.balance:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
@@ -9775,7 +9791,7 @@ msgid "Recurring"
 msgstr "Recorrente"
 
 #. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Este lançamento já está conciliado"
@@ -9796,7 +9812,7 @@ msgid "Range"
 msgstr "Intervalo"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece !\n"
@@ -9936,7 +9952,7 @@ msgid "Accounts Mapping"
 msgstr "Mapeando contas"
 
 #. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "A fatura '%s' está aguardando validação."
@@ -9961,7 +9977,7 @@ msgid "The income or expense account related to the selected product."
 msgstr "A conta de receita ou despesa relacionada ao produto selecionado."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
 msgstr "A data do seu Lançamento de Diário não está no período definido!"
@@ -10168,7 +10184,7 @@ msgid "You must enter a period length that cannot be 0 or below !"
 msgstr "Você deve digitar um período que não seja 0 ou menor !"
 
 #. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
 msgstr "Você não pode remover uma conta que contém lançamentos! "
@@ -10253,6 +10269,14 @@ msgstr ""
 #~ msgid "x Checks Journal"
 #~ msgstr "x Conferências diárias"
 
+#, python-format
+#~ msgid ""
+#~ "No period defined for this date !\n"
+#~ "Please create a fiscal year."
+#~ msgstr ""
+#~ "Nenhum período definido para esta data !\n"
+#~ "Por favor crie um ano fiscal."
+
 #~ msgid "Account No."
 #~ msgstr "Conta nro."
 
@@ -10412,6 +10436,26 @@ msgstr ""
 #~ "Indica se o imposto deve ser incluído na base de cálculo para calcular os "
 #~ "próximos impostos."
 
+#, python-format
+#~ msgid ""
+#~ "You can specify year, month and date in the name of the model using the "
+#~ "following labels:\n"
+#~ "\n"
+#~ "%(year)s : To Specify Year \n"
+#~ "%(month)s : To Specify Month \n"
+#~ "%(date)s : Current Date\n"
+#~ "\n"
+#~ "e.g. My model on %(date)s"
+#~ msgstr ""
+#~ "Você pode especificar o ano, mês e data no nome do modelo usando as "
+#~ "seguintes expressões:\n"
+#~ "\n"
+#~ "%(year)s : Para especificar o Ano \n"
+#~ "%(month)s : Para especificar o Mês \n"
+#~ "%(date)s : Data corrente\n"
+#~ "\n"
+#~ "ex: Meu modelo em %(date)s"
+
 #~ msgid "Journal - Period"
 #~ msgstr "Dario - Período"
 
@@ -11744,3 +11788,7 @@ msgstr ""
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "está validada."
+
+#, python-format
+#~ msgid "Date not in a defined fiscal year"
+#~ msgstr "A data não está em um ano fiscal definido"
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index f16c1a81618..16b60927980 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.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: 2011-04-15 19:34+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2011-06-27 05:16+0000\n"
+"Last-Translator: Andrew Yashchuk <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-04-29 05:09+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -33,7 +33,7 @@ msgid "No End of year journal defined for the fiscal year"
 msgstr "Не определен журнал конца года для финансового года"
 
 #. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
@@ -67,10 +67,10 @@ msgid "Residual"
 msgstr "Остаток"
 
 #. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
 #, python-format
 msgid "Please define sequence on invoice journal"
-msgstr "Пожалуйста, определите последовательность в журнале счетов"
+msgstr "Пожалуйста, определите нумерацию в журнале счетов"
 
 #. module: account
 #: constraint:account.period:0
@@ -85,12 +85,12 @@ msgstr "Валюта счета"
 #. module: account
 #: view:account.tax:0
 msgid "Children Definition"
-msgstr ""
+msgstr "Определение наследников"
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Просроченная задолженность на сегодня"
 
 #. module: account
 #: field:account.partner.ledger,reconcil:0
@@ -127,6 +127,8 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disabled"
 msgstr ""
+"Если вы отмените сверку транзакций, то вы должны проверить все действия, "
+"связанные с этими транзакциями так, как они не будут отключены"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -134,10 +136,10 @@ msgid "Accounting Entries-"
 msgstr "Бухгалтерские проводки-"
 
 #. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
-msgstr "Нельзя удалить проведенное перемещение: \"%s\"!"
+msgstr "Нельзя удалить проведенную операцию: \"%s\"!"
 
 #. module: account
 #: report:account.invoice:0
@@ -176,11 +178,11 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
-"Если поле 'Активно' имеет значение Ложь, вы сможете скрыть срок оплаты, не "
-"удаляя его."
+"Если поле \"Активно\" имеет значение Ложь, вы сможете скрыть условие оплаты, "
+"не удаляя его."
 
 #. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
 #, python-format
 msgid "Warning!"
 msgstr "Предупреждение!"
@@ -219,6 +221,8 @@ msgid ""
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
 msgstr ""
+"Дает тип журнала аналитики. Когда для документа (для счета) надо создать "
+"проводки аналитики, OpenERP будет искать подходящий журнал такого типа."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -232,7 +236,7 @@ msgid "account.tax"
 msgstr "account.tax"
 
 #. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -244,7 +248,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr "Выбор сверки действия"
+msgstr "Выбор сверки операций"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -252,8 +256,7 @@ msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones"
 msgstr ""
-"Поле \"последовательность\" используется для сортировки. От младшего к "
-"старшему."
+"Поле \"нумерация\" используется для сортировки. От младшего к старшему."
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -266,7 +269,7 @@ msgstr ""
 "налога появился в счетах-фактурах"
 
 #. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Счет '%s' оплачивается частично: %s%s из %s%s (%s%s остаток)"
@@ -282,7 +285,7 @@ msgid "Belgian Reports"
 msgstr "Бельгийские отчеты"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "В не можете добавить/исправить проводки в закрытом журнале"
@@ -320,7 +323,7 @@ msgid "St."
 msgstr "ул."
 
 #. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -336,8 +339,8 @@ msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
 msgstr ""
-"Устанавливает локализованный план счетов, чтобы соответствовать как можно "
-"ближе потребностям учета вашей компании на основе учета в вашей стране."
+"Устанавливает локализованный план счетов для наибольшего соответствия "
+"потребностям учёта в вашей организации для вашей страны."
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:63
@@ -348,6 +351,10 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration/Financial Accounting/Accounts/Journals."
 msgstr ""
+"Не найден журнал счета типа %s для этой компании.\n"
+"\n"
+"Вы можете создать его в меню:\n"
+"Настройки/Финансы и бухгалтерия/Журналы"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
@@ -524,7 +531,7 @@ msgstr "Подтвердить выбранные счета"
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
 msgid "Parent target"
-msgstr ""
+msgstr "Родительская цель"
 
 #. module: account
 #: field:account.bank.statement,account_id:0
@@ -571,7 +578,7 @@ msgid "Not reconciled transactions"
 msgstr "Не сверенные транзакции"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
 msgstr "Баланс кассы не совпадает с рассчитанным балансом !"
@@ -647,7 +654,7 @@ msgstr "Централизованный журнал"
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
-msgstr ""
+msgstr "Основная нумерация должна отличаться от текущей!"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -655,7 +662,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -688,11 +695,12 @@ msgid "Journal Period"
 msgstr "Период журнала"
 
 #. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
-msgstr "Для сверки проводок компания должна быть одна во всех проводках."
+msgstr ""
+"Для проведения сверки, организация в проводках не должна различаться."
 
 #. module: account
 #: view:account.account:0
@@ -729,7 +737,7 @@ msgstr "Проверка"
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
 msgid "Partners Reconciled Today"
-msgstr "Партнеры сверенные сегодня"
+msgstr "Контрагенты сверенные сегодня"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -750,7 +758,7 @@ msgid "Analytic Entries by line"
 msgstr "Аналитические проводки по строкам"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
 msgstr "Вы можете изменить валюту только в черновике счета !"
@@ -805,7 +813,7 @@ msgstr "Вычисление срока"
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr ""
+msgstr "Код журн./Операция"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -834,6 +842,8 @@ msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
 msgstr ""
+"Нельзя \"%s\" счет, который уже сверен, сначала надо отменить сверку. Вы "
+"можете только вернуть счет."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -848,10 +858,10 @@ msgstr "Вычисления"
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner to reconcile"
-msgstr "Следующий партнер для сверки"
+msgstr "Следующий контрагент для сверки"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry ! Please note that you "
@@ -937,7 +947,7 @@ msgstr "Выписка банка"
 #. module: account
 #: field:account.analytic.line,move_id:0
 msgid "Move Line"
-msgstr "Действие"
+msgstr "Операция"
 
 #. module: account
 #: help:account.move.line,tax_amount:0
@@ -975,11 +985,11 @@ msgid "Code"
 msgstr "Код"
 
 #. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
@@ -1003,7 +1013,7 @@ msgstr "Название счета."
 #: field:account.chart.template,property_reserve_and_surplus_account:0
 #: field:res.company,property_reserve_and_surplus_account:0
 msgid "Reserve and Profit/Loss Account"
-msgstr ""
+msgstr "Счет резервов и прибылей/убытков"
 
 #. module: account
 #: field:report.account.receivable,name:0
@@ -1040,7 +1050,7 @@ msgstr ""
 #. module: account
 #: view:account.tax:0
 msgid "Applicability Options"
-msgstr ""
+msgstr "Опции применимости"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1060,7 +1070,6 @@ msgstr "Прибыль и убыток (счета расходов)"
 
 #. module: account
 #: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "-"
@@ -1095,7 +1104,7 @@ msgstr "Подтвердить документ"
 #: field:account.fiscal.position.tax,tax_dest_id:0
 #: field:account.fiscal.position.tax.template,tax_dest_id:0
 msgid "Replacement Tax"
-msgstr ""
+msgstr "Замещающий налог"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -1110,6 +1119,11 @@ msgid ""
 "purchase orders or receipts. This way, you can control the invoice from your "
 "supplier according to what you purchased or received."
 msgstr ""
+"\"Счета поставщиков\" позволяют вам управлять счетами выставленными вашими "
+"поставщиками. OpenERP может генерировать черновики счетов автоматически из "
+"заказов на закупку или прихода товара. В таком случае вы можете "
+"контролировать соответствие счета, полученного от поставщика, закупленному "
+"или полученному."
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -1132,12 +1146,12 @@ msgstr "Код налога"
 #. module: account
 #: field:account.account,currency_mode:0
 msgid "Outgoing Currencies Rate"
-msgstr ""
+msgstr "Исходящий курс валют"
 
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr "Перемещение этой проводки."
+msgstr "Операция этой проводки"
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
@@ -1146,6 +1160,7 @@ msgstr "# транзакции"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -1153,7 +1168,7 @@ msgid "Entry Label"
 msgstr "Метка проводки"
 
 #. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "Вы не можете изменить/удалить журнал с записями за этот период !"
@@ -1291,7 +1306,6 @@ msgid "Journal Items Analysis"
 msgstr "Анализ элементов журнала"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Контрагенты"
@@ -1321,7 +1335,7 @@ msgid "Central Journal"
 msgstr "Центральный журнал"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
 #, python-format
 msgid "You can not use this general account in this journal !"
 msgstr "Вы не можете использовать этот общий счет в этом журнале!"
@@ -1416,15 +1430,18 @@ msgstr "Возвраты поставщику"
 msgid ""
 "Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
 msgstr ""
+"Пример: 2 процента через 14 дней, остаток через 30 дней после конца месяца."
 
 #. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
 #, python-format
 msgid ""
 "Cannot create the invoice !\n"
 "The payment term defined gives a computed amount greater than the total "
 "invoiced amount."
 msgstr ""
+"Невозможно создать счет!\n"
+"Сумма, рассчитанная по условию оплаты больше чем итоговая сумма счета."
 
 #. module: account
 #: field:account.installer.modules,account_anglo_saxon:0
@@ -1440,7 +1457,7 @@ msgstr "Англосаксонский бухгалтерский учет"
 #: selection:account.fiscalyear,state:0
 #: selection:account.period,state:0
 msgid "Closed"
-msgstr "Закрыто"
+msgstr "Закрыт"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1455,7 +1472,7 @@ msgstr "Шаблон для системы налогообложения"
 #. module: account
 #: model:account.tax.code,name:account.account_tax_code_0
 msgid "Tax Code Test"
-msgstr ""
+msgstr "Проверка налогового кода"
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
@@ -1534,6 +1551,11 @@ msgid ""
 "the Payment column of a line, you can press F1 to open the reconciliation "
 "form."
 msgstr ""
+"Банковская выписка является отражением всех финансовых операций, прошедших в "
+"течение определенного периода по банковскому счету, кредитной карте или "
+"любому другому виду финансового счета. Начальный баланс будет предложен "
+"автоматически, а конечное сальдо должно быть в выписке. Когда вы находитесь "
+"в столбце Оплата, вы можете нажать F1, чтобы открыть форму сверки."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -1576,10 +1598,9 @@ msgstr "Последовательность финансовых лет"
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
 msgid "Separated Journal Sequences"
-msgstr "Отдельные последовательности журнала"
+msgstr "Раздельные нумерации журнала"
 
 #. module: account
-#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Ответственный"
@@ -1627,7 +1648,7 @@ msgstr "Годовая сумма"
 #. module: account
 #: model:ir.actions.report.xml,name:account.report_account_voucher_new
 msgid "Print Voucher"
-msgstr ""
+msgstr "Печать ваучера"
 
 #. module: account
 #: view:account.change.currency:0
@@ -1641,7 +1662,7 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
-"Отображение плана счетов вашей компании на финансовый год с фильтром по "
+"Отображение плана счетов вашей организации на финансовый год с фильтром по "
 "периодам. Отображается как древовидная структура всех элементов журнала по "
 "коду счета при нажатии на счет."
 
@@ -1651,7 +1672,7 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr "Ошибка! Вы не можете определить перекрывающиеся отчетные года"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
 #, python-format
 msgid "The account is not defined to be reconciled !"
 msgstr "Счет не определен для сверки !"
@@ -1678,7 +1699,7 @@ msgstr "Дебет по поставщику"
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries"
-msgstr ""
+msgstr "Необязательное количество проводок"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
@@ -1686,7 +1707,7 @@ msgid "Receivables & Payables"
 msgstr "Дебиторы и кредиторы"
 
 #. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
 #, python-format
 msgid "You have to provide an account for the write off entry !"
 msgstr "Вы должны указать счет для проводки списания!"
@@ -1722,7 +1743,7 @@ msgid "Customer Ref:"
 msgstr "Ссылка на клиента:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Пользователь %s не имеет прав доступа к журналу %s !"
@@ -1743,10 +1764,10 @@ msgid "Tax Declaration: Credit Notes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
-msgstr "Вы не можете отключить счет, по которому есть движение."
+msgstr "Вы не можете отключить счет, по которому есть операции."
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
@@ -1756,10 +1777,10 @@ msgstr "Сумма кредита"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr "Нельзя сделать действие по закрытому счету."
+msgstr "Нельзя сделать операцию по закрытому счету."
 
 #. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
@@ -1771,7 +1792,7 @@ msgstr ""
 #. module: account
 #: view:res.company:0
 msgid "Reserve And Profit/Loss Account"
-msgstr ""
+msgstr "Счет резервов и прибылей/убытков"
 
 #. module: account
 #: sql_constraint:account.move.line:0
@@ -1788,7 +1809,7 @@ msgstr "Анализ счетов"
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
-msgstr ""
+msgstr "закрытие периода"
 
 #. module: account
 #: view:account.installer:0
@@ -1829,7 +1850,7 @@ msgstr "Финансовый анализ"
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "Ошибка! Вы не можете создавать рекурсивные компании."
+msgstr "Ошибка ! Нельзя создать организации рекурсивно."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1902,7 +1923,8 @@ msgid ""
 "It adds the currency column if the currency is different then the company "
 "currency"
 msgstr ""
-"Добавляет столбец валюты , если валюта отличается, от валюты компании."
+"Добавляет столбец валюты. Если валюта отличается — указывается валюта "
+"организации"
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -1952,6 +1974,9 @@ msgid ""
 "be with same name as statement name. This allows the statement entries to "
 "have the same references than the statement itself"
 msgstr ""
+"Если вы вводите название отличное от \"/\", то созданные операции проводок "
+"будут иметь названия как у документа. Это позволяет проводкам в документе "
+"иметь названия как и у самого документа"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_unreconcile
@@ -2039,7 +2064,7 @@ msgid " Journal"
 msgstr " журнал"
 
 #. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2059,6 +2084,10 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for depreciated "
 "accounts."
 msgstr ""
+"Этот тип используется, чтобы различать типы со специальными эффектами в "
+"OpenERP: вид - не может иметь проводок, объединение - счета которые могут "
+"иметь субсчета для консолидации нескольких компаний, кредитовые/дебетовые - "
+"для контрагентов (вычисление задолженностей), закрыт - для ненужных счетов."
 
 #. module: account
 #: view:account.chart.template:0
@@ -2096,7 +2125,7 @@ msgid "Description"
 msgstr "Описание"
 
 #. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
@@ -2116,7 +2145,7 @@ msgid "Income Account"
 msgstr "Cчёт доходов и расходов"
 
 #. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Не определен журнал покупок / продаж."
@@ -2127,6 +2156,7 @@ msgid "Accounting Properties"
 msgstr "Установки бухгалтерии"
 
 #. module: account
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted By"
@@ -2155,6 +2185,7 @@ msgstr "Шаблон продукта"
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2206,7 +2237,7 @@ msgstr "Основная Последовательность"
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
 msgid "Payment Term"
-msgstr "Условия оплаты"
+msgstr "Условие оплаты"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
@@ -2264,7 +2295,7 @@ msgid "Account Tax Code"
 msgstr "Код налогового счёта"
 
 #. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2272,6 +2303,10 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
+"Для этой компании не найден журнал типа %s.\n"
+"\n"
+"Вы можете создать его в меню:\n"
+"Настройка\\Финансы и бухгалтерия\\Счета\\Журналы."
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -2326,7 +2361,7 @@ msgstr "День"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
 msgid "Accounts to Renew"
-msgstr ""
+msgstr "Счета для обновления"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
@@ -2334,11 +2369,11 @@ msgid "Account Model Entries"
 msgstr "Проводки модели счета"
 
 #. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
-msgstr ""
+msgstr "ЖР"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
@@ -2354,11 +2389,10 @@ msgid ""
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
-"При использовании условий платежа, дата валютирования будет сгенерирована "
-"автоматически при создании проводок. Если вы оставляете условия платежа и "
-"дату валютирования незаполненными - это будет подразумевать прямой платеж. "
-"Условия платежа могут включать в себя несколько дат валютирования, например "
-"50% сегодня, 50% в следующем месяце."
+"При использовании условий оплаты, срок будет вычислен автоматически при "
+"создании проводок. Если вы оставляете условие оплаты и срок незаполненными - "
+"это будет подразумевать прямой платеж. Условие оплаты может включать в себя "
+"несколько сроков, например 50% сразу, 50% в этом месяце."
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -2373,7 +2407,7 @@ msgstr "Выписки"
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr "Имя перемещения"
+msgstr "Название операции"
 
 #. module: account
 #: help:res.partner,property_account_position:0
@@ -2425,7 +2459,7 @@ msgid "Accounts"
 msgstr "Счета"
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
 #, python-format
 msgid "Configuration Error!"
 msgstr "Ошибка конфигурации!"
@@ -2437,20 +2471,19 @@ msgid "Average Price"
 msgstr "Средняя цена"
 
 #. module: account
-#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
 msgstr "Дата:"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
 #, python-format
 msgid ""
 "You cannot modify company of this journal as its related record exist in "
 "Entry Lines"
 msgstr ""
-"Вы не можете изменить компанию этого журнала, так как существуют связанные с "
-"ним проводки."
+"Вы не можете изменять организацию, связанную с этим журналом, так как "
+"существуют связанные с ним проводки."
 
 #. module: account
 #: report:account.journal.period.print:0
@@ -2477,10 +2510,11 @@ msgstr "Сверка банковской выписки"
 #. module: account
 #: report:account.invoice:0
 msgid "Disc.(%)"
-msgstr "Скид.(%)"
+msgstr "Скидка (%)"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.overdue:0
 #: report:account.third_party_ledger:0
@@ -2549,7 +2583,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
-msgstr ""
+msgstr "Баланс партнера по периодам"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_entriesreconcile0
@@ -2580,7 +2614,7 @@ msgstr ""
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
 msgid "New Company Financial Setting"
-msgstr "Финансовые настройки новой компании"
+msgstr "Финансовые настройки новой организации"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -2595,16 +2629,16 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Этот мастер создаст повторяющиеся бухгалтерские проводки"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Нумерация в журнале не определена !"
 
 #. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2677,11 +2711,14 @@ msgid ""
 "The optional quantity expressed by this line, eg: number of product sold. "
 "The quantity is not a legal requirement but is very useful for some reports."
 msgstr ""
+"Необязательное количество отраженное в этой строке, например, количество "
+"проданных товаров. Количество не является обязательным, но оно очень полезно "
+"для некоторых отчетов."
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 2:"
-msgstr ""
+msgstr "Строка 2:"
 
 #. module: account
 #: field:account.journal.column,required:0
@@ -2710,7 +2747,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr ""
+msgstr "Сумма по основному коду"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
@@ -2724,6 +2761,8 @@ msgid ""
 "between the creation date or the creation date of the entries plus the "
 "partner payment terms."
 msgstr ""
+"Дата проведения созданных проводок для этой модели. Вы можете выбрать между "
+"датой создания и датой создания проводок плюс условия оплаты партнера."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
@@ -2757,6 +2796,8 @@ msgid ""
 "It adds initial balance row on report which display previous sum amount of "
 "debit/credit/balance"
 msgstr ""
+"Добавляет колонку начального баланса к отчету который выводит предыдущую "
+"сумму дебета/кредита/баланса."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -2765,7 +2806,7 @@ msgid "Analytic Entries"
 msgstr "Проводки аналитического учета"
 
 #. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
@@ -2897,7 +2938,7 @@ msgid "BNK%s"
 msgstr "БНК%s"
 
 #. module: account
-#: code:addons/account/account.py:2906
+#: code:addons/account/account.py:2950
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
@@ -2921,12 +2962,12 @@ msgstr "Кредит контрагенту"
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr ""
+msgstr "Шаблон налогового кода"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Starts on"
-msgstr ""
+msgstr "Начинается с"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -2948,7 +2989,7 @@ msgstr "Налоговая декларация"
 #: help:account.account.template,currency_id:0
 #: help:account.bank.accounts.wizard,currency_id:0
 msgid "Forces all moves for this account to have this secondary currency."
-msgstr ""
+msgstr "Все операции по этому счету принудительно будут иметь вторую валюту."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -2956,6 +2997,8 @@ msgid ""
 "This wizard will validate all journal entries of a particular journal and "
 "period. Once journal entries are validated, you can not update them anymore."
 msgstr ""
+"Этот мастер утверждает все проводки журнала для конкретного журнала и "
+"периода. После утверждения проводок вы не сможете их изменить."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -3006,6 +3049,7 @@ msgstr "Оставьте пустым для использования счет
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
 #: view:account.journal.period:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,journal_ids:0
@@ -3066,7 +3110,7 @@ msgid "Starting Balance"
 msgstr "Начальный баланс"
 
 #. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Партнер не определен!"
@@ -3094,6 +3138,7 @@ msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
 msgstr ""
+"Сумма выражена в валюте связанного счета, если не равна валюте компании."
 
 #. module: account
 #: report:account.move.voucher:0
@@ -3108,7 +3153,6 @@ msgstr "Журнал:"
 #: view:account.invoice.report:0
 #: selection:account.invoice.report,state:0
 #: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
@@ -3162,7 +3206,7 @@ msgstr ""
 "больше не сможете изменять их бухгалтерские поля."
 
 #. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr "Нельзя удалить открытый или оплаченный счет !"
@@ -3180,7 +3224,7 @@ msgstr "Переводы"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  value amount: n.a"
-msgstr ""
+msgstr "  значение суммы: неопределено"
 
 #. module: account
 #: view:account.chart:0
@@ -3200,7 +3244,7 @@ msgstr "Ваши банковские и денежные счета"
 #. module: account
 #: view:account.move:0
 msgid "Search Move"
-msgstr "Искать проводку"
+msgstr "Искать операцию"
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -3225,7 +3269,7 @@ msgstr ""
 "состоянии \"Отменено\" или \"Сделано\" !"
 
 #. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3235,6 +3279,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr "Корреспондирующая сторона"
 
@@ -3340,6 +3385,7 @@ msgstr ""
 #: field:account.entries.report,date:0
 #: selection:account.general.journal,filter:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice.report,date:0
 #: report:account.journal.period.print:0
 #: view:account.move:0
@@ -3383,22 +3429,24 @@ msgid "Chart of Accounts Template"
 msgstr "Шаблон плана счетов"
 
 #. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
 "based on partner payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"Дата исполнения проводки созданной строкой \"%s\" модели \"%s\" основана на "
+"условии оплаты контрагента."
 
 #. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Некоторые записи уже сверены!"
 
 #. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
 #, python-format
 msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
@@ -3479,7 +3527,7 @@ msgstr "Судебный спор"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr ""
+msgstr "Искать проводки аналитики"
 
 #. module: account
 #: field:res.partner,property_account_payable:0
@@ -3491,8 +3539,8 @@ msgstr "Счета к оплате"
 msgid ""
 "You cannot create entries on different periods/journals in the same move"
 msgstr ""
-"Вы не можете создавать проводки по разным периодам / журналам в одном "
-"действии."
+"Вы не можете создавать проводки по разным периодам / журналам в одной "
+"операции."
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -3523,7 +3571,7 @@ msgid "Analytic Items"
 msgstr "Элементы аналитики"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Невозможно изменить налог !"
@@ -3534,19 +3582,20 @@ msgid "#Entries"
 msgstr "#Проводок"
 
 #. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
 msgstr "Вы выбрали единицу измерения не совместимую с ТМЦ."
 
 #. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
 "defined !"
 msgstr ""
+"Условие оплаты поставщика не содержит строк условий оплаты(расчетов)!"
 
 #. module: account
 #: view:account.state.open:0
@@ -3584,7 +3633,7 @@ msgstr ""
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
-msgstr "Действительно до"
+msgstr "Дата вступления в силу"
 
 #. module: account
 #: code:addons/account/wizard/account_move_bank_reconcile.py:53
@@ -3605,7 +3654,7 @@ msgstr "Журнал аналитических проводок"
 #: view:product.template:0
 #: view:res.partner:0
 msgid "Accounting"
-msgstr "Бухгалтерия"
+msgstr "Учёт"
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -3616,6 +3665,7 @@ msgid ""
 "Print Report with the currency column if the currency is different then the "
 "company currency"
 msgstr ""
+"Печать отчета с колонкой валюты, если валюта отличается от валюты компании"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3669,6 +3719,8 @@ msgstr "Утвердить"
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
 msgstr ""
+"В модели указано неверное значение прихода или расхода (Приход или Расход "
+"должен быть равен \"0\")!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -3807,6 +3859,8 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category using sale price"
 msgstr ""
+"Этот счет будет использоваться для стоимости исходящих ТМЦ для текущей "
+"категории ТМЦ продажной цене"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3819,6 +3873,8 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft supplier invoices."
 msgstr ""
+"Анализ себестоимости (учет времени, некоторой закупаемой продукции, ...) "
+"берется из счетов аналитики. Генерирует черновик счетов поставщика."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3837,7 +3893,7 @@ msgid "Acc.Type"
 msgstr "Тип счета"
 
 #. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr ""
@@ -3883,7 +3939,7 @@ msgstr "Позиции налога"
 #. module: account
 #: field:account.tax,base_code_id:0
 msgid "Account Base Code"
-msgstr ""
+msgstr "Основной код счёта"
 
 #. module: account
 #: help:account.move,state:0
@@ -3894,9 +3950,14 @@ msgid ""
 "the system on document validation (invoices, bank statements...) and will be "
 "created in 'Posted' state."
 msgstr ""
+"Все созданные вручную новые проводки в журнале обычно в состоянии \"Не "
+"проведено\", но вы можете установить опцию для пропуска этого состояния в "
+"журнале. Проводки в этом случае, как и создаваемые системой при обработке "
+"документов (счетов, банковских выписок, ...), будут создаваться со статусом "
+"\"Проведено\"."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Счет расходов не определен для этого товара: \"%s\" (id:%d)"
@@ -3949,7 +4010,7 @@ msgstr "Ошибка ! Неверная продолжительность фи
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "Месячный период"
 
 #. module: account
 #: help:account.analytic.balance,empty_acc:0
@@ -3983,7 +4044,7 @@ msgid ""
 "When new move line is created the state will be 'Draft'.\n"
 "* When all the payments are done it will be in 'Valid' state."
 msgstr ""
-"Когда новое перемещение создается, его состояние 'Черновик'.\n"
+"Когда новая операция создается, ее состояние 'Черновик'.\n"
 "* Когда все платежи произведены состояние будет 'Проведено'."
 
 #. module: account
@@ -3994,7 +4055,7 @@ msgstr "Режим вывода"
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Statement from invoice or payment"
-msgstr ""
+msgstr "Документ из счета или платежа"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -4032,7 +4093,7 @@ msgstr "Банковские выписки введены в систему."
 #: code:addons/account/wizard/account_reconcile.py:133
 #, python-format
 msgid "Reconcile Writeoff"
-msgstr ""
+msgstr "Сверить списание"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
@@ -4070,10 +4131,10 @@ msgstr "Печать счета"
 #. module: account
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr ""
+msgstr "Кредит-ноты"
 
 #. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
@@ -4146,11 +4207,11 @@ msgid "Change"
 msgstr "Изменить"
 
 #. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
 #: code:addons/account/wizard/account_fiscalyear_close.py:78
 #: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4164,7 +4225,7 @@ msgstr "UserError"
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
-msgstr ""
+msgstr "Контроль типа"
 
 #. module: account
 #: help:account.journal,default_credit_account_id:0
@@ -4221,14 +4282,14 @@ msgstr "Генерировать проводки"
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
 msgid "Select Charts of Taxes"
-msgstr ""
+msgstr "Выбрать налоговые планы счетов"
 
 #. module: account
 #: view:account.fiscal.position:0
 #: field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
-msgstr ""
+msgstr "Отображение счета"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -4256,13 +4317,16 @@ msgid "You must define an analytic journal of type '%s' !"
 msgstr "Вы должны определить журнал аналитики типа '%s' !"
 
 #. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
 "the account \"%s - %s\". Clear the secondary currency field of the account "
 "definition if you want to accept all currencies."
 msgstr ""
+"Нельзя сделать операцию по счету с валютой  отличной от второй валюты счета "
+"\"%s - %s\". Очистите поле ввода второй валюты в форме ввода счета, если "
+"желаете использовать все валюты."
 
 #. module: account
 #: field:account.invoice.refund,date:0
@@ -4323,7 +4387,7 @@ msgid "Invoices"
 msgstr "Счета"
 
 #. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4434,28 +4498,27 @@ msgstr "Баланс (счета активов)"
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "Third Party (Country)"
-msgstr ""
+msgstr "Третье лицо (Страна)"
 
 #. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_report_common.py:120
 #: code:addons/account/wizard/account_report_common.py:126
 #, python-format
@@ -4477,7 +4540,7 @@ msgid "Bank Details"
 msgstr "Банковская информация"
 
 #. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
 #, python-format
 msgid "Taxes missing !"
 msgstr "Налоги отсутствуют !"
@@ -4513,13 +4576,13 @@ msgstr "Закрыть"
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr "Проводки"
+msgstr "Операции"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
 #: model:ir.model,name:account.model_account_vat_declaration
 msgid "Account Vat Declaration"
-msgstr ""
+msgstr "Декларация НДС счета"
 
 #. module: account
 #: view:account.period:0
@@ -4529,10 +4592,10 @@ msgstr "Закрыть"
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date not in the Period"
-msgstr ""
+msgstr "Дата проверки не входит в период"
 
 #. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4554,7 +4617,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Начало периода должно быть меньше, чем конец периода"
@@ -4584,6 +4647,7 @@ msgstr "Остаток по аналитике"
 #: report:account.general.journal:0
 #: field:account.general.journal,target_move:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.journal,target_move:0
 #: report:account.partner.balance:0
@@ -4597,7 +4661,7 @@ msgstr "Остаток по аналитике"
 #: report:account.third_party_ledger_other:0
 #: field:account.vat.declaration,target_move:0
 msgid "Target Moves"
-msgstr "Цель перемещений"
+msgstr "Цель операции"
 
 #. module: account
 #: field:account.subscription,period_type:0
@@ -4625,7 +4689,7 @@ msgstr "Проводка"
 #: field:account.tax,python_compute_inv:0
 #: field:account.tax.template,python_compute_inv:0
 msgid "Python Code (reverse)"
-msgstr ""
+msgstr "Код на Python (реверс)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_payment_term_form
@@ -4642,7 +4706,7 @@ msgstr "Название столбца"
 #: view:account.general.journal:0
 msgid ""
 "This report gives you an overview of the situation of your general journals"
-msgstr ""
+msgstr "Этот доклад дает вам обзор ситуации по общим журналам"
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -4663,10 +4727,10 @@ msgstr "Открытие кассы"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 1:"
-msgstr ""
+msgstr "Строка 1:"
 
 #. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "Integrity Error !"
 msgstr "Ошибка целостности!"
@@ -4695,7 +4759,7 @@ msgstr "Описание счетов"
 #. module: account
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
-msgstr "Следующий партнер для сверки"
+msgstr "Следующий контрагент для сверки"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
@@ -4811,10 +4875,11 @@ msgstr "Налог на детей"
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
-msgstr "Нельзя сделать действие по дебетовому/кредитовому счету без партнера"
+msgstr ""
+"Нельзя сделать действие по дебетовому/кредитовому счету без контрагента"
 
 #. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
@@ -4884,9 +4949,11 @@ msgid ""
 "Number of days to add before computation of the day of month.If Date=15/01, "
 "Number of Days=22, Day of Month=-1, then the due date is 28/02."
 msgstr ""
+"Количество дней для добавления перед вычислением дня месяца. Если "
+"дата=15/01, количество дней=22, день месяца=-1, то срок 28/02."
 
 #. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
@@ -4914,7 +4981,7 @@ msgid "Start of period"
 msgstr "Начало периода"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
@@ -4972,12 +5039,12 @@ msgstr "Журнал проводок конца года"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5054,7 +5121,7 @@ msgid "Sort By"
 msgstr "Сортировать по"
 
 #. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -5066,7 +5133,7 @@ msgstr ""
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr "Валюта суммы"
+msgstr "Сумма в валюте"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:39
@@ -5100,7 +5167,7 @@ msgstr "Количество"
 #. module: account
 #: view:account.move.line:0
 msgid "Number (Move)"
-msgstr "Номер (перемещение)"
+msgstr "Операция"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -5120,8 +5187,8 @@ msgid ""
 "The sequence field is used to order the payment term lines from the lowest "
 "sequences to the higher ones"
 msgstr ""
-"Поле \"последовательность\" используется для упорядочения строк в платежном "
-"документе от наименьшего номера к наибольшему"
+"Поле \"последовательность\" используется для упорядочения строк в условии "
+"оплаты от наименьшего номера к наибольшему"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -5195,7 +5262,7 @@ msgstr "Элемент журнала"
 #. module: account
 #: model:ir.model,name:account.model_account_move_journal
 msgid "Move journal"
-msgstr ""
+msgstr "Журнал операций"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
@@ -5204,7 +5271,7 @@ msgid "Generate Opening Entries"
 msgstr "Генерировать открывающие проводки"
 
 #. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Уже сверено !"
@@ -5240,7 +5307,7 @@ msgstr "Подчиненный счет"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
 #, python-format
 msgid "Write-Off"
 msgstr "Списание"
@@ -5314,7 +5381,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_state_open
 #: model:ir.model,name:account.model_account_state_open
 msgid "Account State Open"
-msgstr ""
+msgstr "Состояние счета открытый"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -5338,6 +5405,8 @@ msgid ""
 "document shows your debit and credit taking in consideration some criteria "
 "you can choose by using the search tool."
 msgstr ""
+"Этот вид предназначен для анализа различных финансовых счетов. Документ "
+"показывает дебет и кредит в соответствии с выбранными критериями поиска."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_list
@@ -5353,6 +5422,9 @@ msgid ""
 "Shows you the progress made today on the reconciliation process. Given by \n"
 "Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
 msgstr ""
+"Показывает прогресс, достигнутый сегодня по сверке. Определяется как\n"
+"Контрагенты сверенные сегодня / (Оставшиеся контрагенты + Контрагенты "
+"сверенные сегодня)"
 
 #. module: account
 #: help:account.payment.term.line,value:0
@@ -5361,6 +5433,9 @@ msgid ""
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be threated."
 msgstr ""
+"Выберите вид расчета относящийся к этой строке условия оплаты. Отметим, что "
+"последняя строка должна быть с типом \"Баланс\" для проверки обработки всей "
+"суммы."
 
 #. module: account
 #: field:account.invoice,period_id:0
@@ -5377,7 +5452,7 @@ msgid "# of Lines"
 msgstr "# строк"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr "Новая валюта неправильно настроена !"
@@ -5402,14 +5477,14 @@ msgid "Filter by"
 msgstr "Фильтровать по"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Нельзя использовать неактивный счет !"
 
 #. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr "Проводки не по одному счету и тому же счету или уже сверены! "
@@ -5444,7 +5519,7 @@ msgstr "7"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
 #, python-format
 msgid "Invalid action !"
 msgstr "Invalid action !"
@@ -5513,7 +5588,7 @@ msgstr "не реализовано"
 #. module: account
 #: help:account.journal,company_id:0
 msgid "Company related to this journal"
-msgstr "Компания связанная с этим журналом"
+msgstr "Организация, связанная с этим журналом"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:44
@@ -5561,6 +5636,10 @@ msgid ""
 "line of the expense account. OpenERP will propose to you automatically the "
 "Tax related to this account and the counterpart \"Account Payable\"."
 msgstr ""
+"Здесь можно быстро вводить бухгалтерские проводки. Если вы хотите отразить "
+"счет-фактуру поставщика, начните с записи движения по счету расходов. "
+"OpenERP автоматически предложит вам налог, относящийся к этому счету и "
+"корреспондирующий счет \"Кредиторская задолженность\"."
 
 #. module: account
 #: field:account.entries.report,date_created:0
@@ -5578,6 +5657,7 @@ msgid ""
 "The code will be used to generate the numbers of the journal entries of this "
 "journal."
 msgstr ""
+"Код будет использоваться для генерации номеров записей этого журнала."
 
 #. module: account
 #: view:account.invoice:0
@@ -5613,7 +5693,7 @@ msgstr "Дата последней сверки"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Позиция аналитики"
 
 #. module: account
 #: field:product.template,taxes_id:0
@@ -5634,7 +5714,7 @@ msgstr "Настройка отчетов"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr "Для счета и периода должна быть одна компания."
+msgstr "Для счета и периода должна быть одна организация."
 
 #. module: account
 #: field:account.tax,type:0
@@ -5646,25 +5726,27 @@ msgstr "Тип налога"
 #: model:ir.actions.act_window,name:account.action_account_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_template_form
 msgid "Account Templates"
-msgstr "Счет: Шаблоны"
+msgstr "Шаблоны счетов"
 
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Statement"
-msgstr ""
+msgstr "Налоговая декларация"
 
 #. module: account
 #: model:ir.model,name:account.model_res_company
 msgid "Companies"
-msgstr "Компании"
+msgstr "Организации"
 
 #. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
 "Lines"
 msgstr ""
+"Нельзя изменить компанию счета так, как связанные с ней записи существуют в "
+"проводках"
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
@@ -5789,7 +5871,7 @@ msgstr "  количество дней: 30"
 #. module: account
 #: help:account.analytic.line,currency_id:0
 msgid "The related account currency if not equal to the company one."
-msgstr ""
+msgstr "Валюта связанного счета, если не одинакова с валютой компании."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -5819,7 +5901,7 @@ msgstr "Мощность"
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Type"
-msgstr ""
+msgstr "Тип возмещения"
 
 #. module: account
 #: report:account.invoice:0
@@ -5878,6 +5960,9 @@ msgid ""
 "higher ones. The order is important if you have a tax that has several tax "
 "children. In this case, the evaluation order is important."
 msgstr ""
+"Поле \"последовательность\" используется для упорядочивания позиций налогов "
+"от меньшего к большему. Последовательность важна при наличии субналогов . В "
+"таком случае важна последовательность вычислений."
 
 #. module: account
 #: selection:account.account,type:0
@@ -5899,6 +5984,10 @@ msgid ""
 "year. Note that you can run this wizard many times for the same fiscal year: "
 "it will simply replace the old opening entries with the new ones."
 msgstr ""
+"Этот мастер генерирует проводки конца года в журнале для выбранного "
+"финансового года. Заметим, что вы можете запустить этот мастер много раз для "
+"того же финансового года: старые проводки открытия просто будут заменены на "
+"новые."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
@@ -5913,25 +6002,29 @@ msgid ""
 "the tool search to analyse information about analytic entries generated in "
 "the system."
 msgstr ""
+"Этот вид позволяет анализировать проводки аналитики в соответствии со счетом "
+"аналитики, который вы создали исходя из особенностей вашего бизнеса. "
+"Используйте поиск для анализа информации о проводках аналитики созданных в "
+"системе."
 
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr "Название журнала должно быть уникальным по компании !"
+msgstr "Название журнала должно быть уникальным внутри организации!"
 
 #. module: account
 #: field:account.account.template,nocreate:0
 msgid "Optional create"
-msgstr ""
+msgstr "Создать дополнительно"
 
 #. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
 #, python-format
 msgid "Can not find account chart for this company, Please Create account."
 msgstr ""
-"Не удалось найти план счетов для компании. Пожалуйста, создайте счет."
+"Не удалось найти план счетов для организации. Пожалуйста, создайте счет."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:57
@@ -6010,6 +6103,8 @@ msgid ""
 "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
 "2% "
 msgstr ""
+"Проценты для позиции условий оплаты должен быть между 0 и 1, например: 0,02 "
+"для 2% "
 
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
@@ -6077,8 +6172,8 @@ msgid "Analytic Entries Statistics"
 msgstr "Статистика аналитических проводок"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
 #, python-format
 msgid "Entries: "
 msgstr "Проводки: "
@@ -6089,10 +6184,10 @@ msgid "Create manual recurring entries in a chosen journal."
 msgstr "Создать вручную повторяющиеся проводки в выбранном журнале"
 
 #. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
 #, python-format
 msgid "Couldn't create move between different companies"
-msgstr ""
+msgstr "Нельзя создать перемещение между разными организациями"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_type_form
@@ -6129,7 +6224,7 @@ msgid "Total debit"
 msgstr "Всего по дебету"
 
 #. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Проводка \"%s\" не верна !"
@@ -6171,6 +6266,8 @@ msgstr "Код на Python"
 msgid ""
 "Please define the Reserve and Profit/Loss account for current user company !"
 msgstr ""
+"Пожалуйста, определите счет резервов и прибылей/убытков для компании "
+"пользователя !"
 
 #. module: account
 #: help:account.journal,update_posted:0
@@ -6178,6 +6275,8 @@ msgid ""
 "Check this box if you want to allow the cancellation the entries related to "
 "this journal or of the invoice related to this journal"
 msgstr ""
+"Отметьте, если вы хотите позволить отменять проводки связанные с этим "
+"журналом или счетом связанным с этим журналом"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6195,30 +6294,31 @@ msgid "  valuation: percent"
 msgstr "  оценка: процент"
 
 #. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:292
 #: code:addons/account/account_bank_statement.py:305
 #: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
 #: code:addons/account/wizard/account_invoice_refund.py:100
 #: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6255,6 +6355,10 @@ msgid ""
 "reconcile in a series of accounts. It finds entries for each partner where "
 "the amounts correspond."
 msgstr ""
+"Для счета, который считается оплаченным, проводки на основе этого счета "
+"должны сверяться с их корреспондирующими частями, обычно платежами. В "
+"процессе автоматической сверки, OpenERP ищет проводки в ряде счетов. Система "
+"ищет проводки с соответствующей суммой для каждого контрагента."
 
 #. module: account
 #: view:account.move:0
@@ -6292,6 +6396,7 @@ msgstr ""
 msgid ""
 "Selected Entry Lines does not have any account move enties in draft state"
 msgstr ""
+"Выбранные проводки не содержат ни одной операции в состоянии \"Черновик\"."
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -6332,7 +6437,7 @@ msgid "Journal Select"
 msgstr "Выбор журнала"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr "Текущая валюта неправильно настроена !"
@@ -6349,9 +6454,11 @@ msgstr "Налоги системы налогообложения"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.report.general.ledger:0
 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
 #: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
 #: model:ir.ui.menu,name:account.menu_general_ledger
 msgid "General Ledger"
 msgstr "Главная книга"
@@ -6394,7 +6501,7 @@ msgstr "Параметры"
 #. module: account
 #: model:ir.model,name:account.model_account_tax_chart
 msgid "Account tax chart"
-msgstr ""
+msgstr "План налоговых счетов"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -6407,7 +6514,7 @@ msgid "Total:"
 msgstr "Всего:"
 
 #. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6436,16 +6543,16 @@ msgstr "Счета доходов"
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
-msgstr ""
+msgstr "Ссылка на документ, создавший этот отчет о счете."
 
 #. module: account
 #: field:account.tax.code,child_ids:0
 #: field:account.tax.code.template,child_ids:0
 msgid "Child Codes"
-msgstr ""
+msgstr "Субкоды"
 
 #. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6529,7 +6636,7 @@ msgstr "Налоги"
 #. module: account
 #: help:account.tax,amount:0
 msgid "For taxes of type percentage, enter % ratio between 0-1."
-msgstr ""
+msgstr "Для процентных налогов, введите % как число от 0 до 1."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_subscription_form
@@ -6594,6 +6701,11 @@ msgid ""
 "Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
 "generate analytic entries on the related account."
 msgstr ""
+"Обычный план счетов имеет структуру определяемую правовыми требованиями "
+"страны. Структура аналитического плана счетов должна отражать требования "
+"вашего бизнеса. Обычно он структурирован по контрактам, проектам, ТМЦ или "
+"отделам. Большинство операций в OpenERP (счета, бюллетени, затраты и т.д.) "
+"создают проводки аналитики в соответствующих счетах."
 
 #. module: account
 #: field:account.analytic.journal,line_ids:0
@@ -6602,14 +6714,14 @@ msgid "Lines"
 msgstr "Строк"
 
 #. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
 #, python-format
 msgid ""
 "Can not find account chart for this company in invoice line account, Please "
 "Create account."
 msgstr ""
-"Не могу найти план счетов для этой компании в позиции счета, пожалуйста "
-"создайте бух. счет."
+"Невозможно найти план счетов для этой организации в позиции счёта. "
+"Пожалуйста, создайте счёт."
 
 #. module: account
 #: view:account.tax.template:0
@@ -6730,6 +6842,9 @@ msgid ""
 "new counterpart but will share the same counterpart. This is used in fiscal "
 "year closing."
 msgstr ""
+"Отметьте, для определения того, что каждая проводка в этом журнале не "
+"создает новой корреспондирующей части, а использует одну и ту же. Это "
+"используется при  закрытии финансового года."
 
 #. module: account
 #: field:account.bank.statement,closing_date:0
@@ -6775,10 +6890,10 @@ msgstr ""
 "домена."
 
 #. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
-msgstr ""
+msgstr "Вы должны выбрать периоды принадлежащие одной компании."
 
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
@@ -6798,7 +6913,7 @@ msgstr "Отчетность"
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr "Код журнала должен быть уникальным для компании !"
+msgstr "Код журнала должен быть уникальным внутри организации!"
 
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
@@ -6823,6 +6938,8 @@ msgid ""
 "the system to go through the reconciliation process, based on the latest day "
 "it have been reconciled."
 msgstr ""
+"Это поле показывает вам следующего контрагента, который автоматически выбран "
+"системой для сверки. Выбор основан на дате последней сверки."
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
@@ -6879,7 +6996,7 @@ msgid "Sign on Reports"
 msgstr "Знак в отчётах"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
 #, python-format
 msgid "You can not have two open register for the same journal"
 msgstr "Вы не можете иметь два открытых регистра для одного журнала"
@@ -6908,7 +7025,6 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
-#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr "Проформа"
 
@@ -6940,6 +7056,7 @@ msgstr "Доп. информация"
 
 #. module: account
 #: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -6965,13 +7082,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
 #, python-format
 msgid "Bad account !"
 msgstr "Неверный счет !"
 
 #. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
@@ -6989,10 +7106,10 @@ msgid "Invoice Tax"
 msgstr "Налог по счету"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
 #, python-format
 msgid "No piece number !"
-msgstr ""
+msgstr "Нет номера части !"
 
 #. module: account
 #: view:product.product:0
@@ -7100,7 +7217,7 @@ msgstr "Оплата счетов"
 #: field:account.tax,sequence:0
 #: field:account.tax.template,sequence:0
 msgid "Sequence"
-msgstr "Последовательность"
+msgstr "Нумерация"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bs_report
@@ -7188,7 +7305,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Reports"
-msgstr ""
+msgstr "Официальные отчеты"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
@@ -7202,6 +7319,9 @@ msgid ""
 "to the higher ones. The order is important if you have a tax with several "
 "tax children. In this case, the evaluation order is important."
 msgstr ""
+"Поле \"последовательность\" используется для упорядочивания позиций налогов "
+"от меньшего к большему. Последовательность важна при наличии субналогов . В "
+"таком случае важна последовательность вычислений."
 
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
@@ -7229,17 +7349,17 @@ msgid "Fixed"
 msgstr "Фиксированный"
 
 #. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
 #: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
 #, python-format
 msgid "Warning !"
 msgstr "Warning !"
@@ -7247,13 +7367,13 @@ msgstr "Warning !"
 #. module: account
 #: field:account.entries.report,move_line_state:0
 msgid "State of Move Line"
-msgstr "Состояние действия"
+msgstr "Состояние операции"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile"
-msgstr "Сверка действия по счету"
+msgstr "Сверка операции по счету"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -7271,6 +7391,7 @@ msgstr "Величина (прописью):"
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7298,10 +7419,10 @@ msgstr "Выбрать валюту применяемую в счете"
 #: code:addons/account/wizard/account_invoice_refund.py:100
 #, python-format
 msgid "Can not %s draft/proforma/cancel invoice."
-msgstr ""
+msgstr "Нельзя %s черновик/проформу/отмененный счет."
 
 #. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Нет позиций в счете !"
@@ -7332,6 +7453,7 @@ msgid ""
 "Select Fiscal Year which you want to remove entries for its End of year "
 "entries journal"
 msgstr ""
+"Выберите финансовый год для удаления проводок из журнала \"Конец года\""
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
@@ -7350,7 +7472,7 @@ msgid "Deferral Method"
 msgstr "Метод отсрочки"
 
 #. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Счет '%s' оплачен."
@@ -7415,7 +7537,7 @@ msgid "Associated Partner"
 msgstr "Связанный контрагент"
 
 #. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Сначала вы должны выбрать партнера !"
@@ -7472,7 +7594,7 @@ msgstr "Проформа"
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr ""
+msgstr "Код журн./Операция"
 
 #. module: account
 #: model:ir.model,name:account.model_account_open_closed_fiscalyear
@@ -7480,7 +7602,7 @@ msgid "Choose Fiscal Year"
 msgstr "Закрыть отчетный год"
 
 #. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
@@ -7489,7 +7611,7 @@ msgstr "Журнал возврата покупок"
 #. module: account
 #: help:account.tax.template,amount:0
 msgid "For Tax Type percent enter % ratio between 0-1."
-msgstr ""
+msgstr "Для налога типа \"процент\" введите %, как число от 0 до 1."
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -7517,6 +7639,7 @@ msgstr "Бухучет и управление финансами"
 #: view:account.entries.report:0
 #: field:account.entries.report,period_id:0
 #: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
 #: field:account.journal.period,period_id:0
@@ -7610,7 +7733,7 @@ msgstr "Тел. :"
 #. module: account
 #: field:account.account,company_currency_id:0
 msgid "Company Currency"
-msgstr "Валюта компании"
+msgstr "Валюта организации"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -7673,7 +7796,7 @@ msgstr "Виды журналов"
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
 msgid "Move bank reconcile"
-msgstr "Сверка проводки по банку"
+msgstr "Сверка операции по банку"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_type_form
@@ -7682,7 +7805,7 @@ msgid "Account Types"
 msgstr "Типы счетов"
 
 #. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr ""
@@ -7732,6 +7855,7 @@ msgstr "Журнал возвратов"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
 msgid "Filter By"
 msgstr "Фильтровать по"
@@ -7744,13 +7868,17 @@ msgid ""
 "sales orders or deliveries. You should only confirm them before sending them "
 "to your customers."
 msgstr ""
+"Вы можете создавать счета заказчикам и управлять счетами выставленными вашим "
+"клиентам. OpenERP может создавать черновики счетов автоматически по заказам "
+"на продажу и доставку. Вы должны только подтвердить их пред выставлением "
+"заказчикам."
 
 #. module: account
 #: view:account.entries.report:0
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_company_analysis_tree
 msgid "Company Analysis"
-msgstr "Анализ компании"
+msgstr "Анализ организации"
 
 #. module: account
 #: help:account.invoice,account_id:0
@@ -7770,7 +7898,7 @@ msgid "Payment Term Line"
 msgstr "Позиция условий оплаты"
 
 #. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
@@ -7839,7 +7967,7 @@ msgstr ""
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  valuation: balance"
-msgstr ""
+msgstr "  расчет: баланс"
 
 #. module: account
 #: view:account.tax.code:0
@@ -7860,7 +7988,7 @@ msgstr "Закрыть финансовый год"
 #. module: account
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
-msgstr "Код счета должен быть уникальным для компании !"
+msgstr "Код счета должен быть уникальным внутри организации!"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
@@ -7939,8 +8067,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
 #, python-format
 msgid "Bad account!"
 msgstr "Плохой счет!"
@@ -7951,7 +8079,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Оставьте пустым для всех открытых финансовых лет"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -7962,6 +8090,7 @@ msgid ""
 "The amount expressed in an optional other currency if it is a multi-currency "
 "entry."
 msgstr ""
+"Сумма выражается в дополнительный валюте, если эта проводка мульти-валютная."
 
 #. module: account
 #: view:account.account:0
@@ -7972,6 +8101,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8062,7 +8192,7 @@ msgstr "неизвестен"
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
 msgid "Opening Entries Journal"
-msgstr "Открытие журнала проводок"
+msgstr "Журнал проводок открытия"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
@@ -8145,14 +8275,14 @@ msgid "Period from"
 msgstr "Период с"
 
 #. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Журнал возврата продаж"
 
 #. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
 #, python-format
 msgid ""
 "You cannot modify company of this period as its related record exist in "
@@ -8201,7 +8331,7 @@ msgid "Purchase Tax(%)"
 msgstr "Налог на покупку(%)"
 
 #. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Пожалуйста, создайте позиции счета"
@@ -8217,7 +8347,7 @@ msgid "Configure Your Accounting Application"
 msgstr "Настройка модуля бухучета"
 
 #. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
@@ -8255,6 +8385,7 @@ msgstr "Управление напоминаниями"
 #: report:account.central.journal:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
@@ -8264,7 +8395,7 @@ msgid "Start Period"
 msgstr "Начало периода"
 
 #. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
 #, python-format
 msgid "Cannot locate parent code for template account!"
 msgstr "Не удается найти родительский код для шаблона счета!"
@@ -8277,7 +8408,7 @@ msgstr "Направление анализа"
 #. module: account
 #: field:res.partner,ref_companies:0
 msgid "Companies that refers to partner"
-msgstr "Ссылающиеся на партнера компании"
+msgstr "Связанные с партнёром организации"
 
 #. module: account
 #: view:account.journal:0
@@ -8301,7 +8432,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. "
 msgstr "Бухгалтер утверждает проводки созданные по счет-фактуре. "
 
 #. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
 #, python-format
 msgid ""
 "You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8328,10 +8459,10 @@ msgstr "Документ: выписка клиенту со счета"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr "Нельзя создать действие по счету с типом Вид."
+msgstr "Нельзя создать операцию по счету с типом Вид."
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr "Текущая валюта неправильно настроена !"
@@ -8380,6 +8511,7 @@ msgstr "Оставьте пустым для использования дохо
 #: field:account.entries.report,balance:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8398,6 +8530,7 @@ msgstr "Вручную или автоматически введенные в 
 
 #. module: account
 #: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
 msgid "Display Account"
 msgstr "Вывод счета"
 
@@ -8512,14 +8645,15 @@ msgstr "Проводка вручную"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
 msgid "Move"
-msgstr "Перемещение"
+msgstr "Операция"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -8528,7 +8662,7 @@ msgstr ""
 #. module: account
 #: report:account.central.journal:0
 msgid "A/C No."
-msgstr ""
+msgstr "Счет №"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
@@ -8616,6 +8750,7 @@ msgstr "Аналитический баланс"
 #: report:account.central.journal:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
@@ -8646,7 +8781,7 @@ msgstr "План счетов"
 #. module: account
 #: field:account.move.line,date_maturity:0
 msgid "Due date"
-msgstr "Срок"
+msgstr "Срок оплаты"
 
 #. module: account
 #: view:account.move.journal:0
@@ -8659,7 +8794,7 @@ msgid "Account Subscription"
 msgstr "Счет подписки"
 
 #. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
 #, python-format
 msgid ""
 "Tax base different !\n"
@@ -8686,6 +8821,7 @@ msgstr "Проводка подписки"
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,date_start:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -8714,7 +8850,7 @@ msgid "Unreconciled"
 msgstr "Не сверенные"
 
 #. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
 #, python-format
 msgid "Bad total !"
 msgstr "Плохой итог !"
@@ -8722,7 +8858,7 @@ msgstr "Плохой итог !"
 #. module: account
 #: field:account.journal,sequence_id:0
 msgid "Entry Sequence"
-msgstr "Последовательный номер проводки"
+msgstr "Нумерация проводок"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_tree
@@ -8772,19 +8908,22 @@ msgid "Active"
 msgstr "Активен"
 
 #. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
 #, python-format
 msgid "Unknown Error"
 msgstr "Неизвестная ошибка"
 
 #. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry !\n"
 "Make sure you have configured Payment Term properly !\n"
 "It should contain atleast one Payment Term Line with type \"Balance\" !"
 msgstr ""
+"Вы не можете утвердить несбалансированную проводку!\n"
+"Проверьте правильность настройки условия оплаты!\n"
+"Должна быть хотя бы одна строка условия оплаты с типом \"Баланс\"!"
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -8808,7 +8947,7 @@ msgstr "Вторичная валюта"
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
 msgid "Validate Account Move"
-msgstr "Утвердить действие по счету"
+msgstr "Утвердить операцию по счету"
 
 #. module: account
 #: field:account.account,credit:0
@@ -8821,10 +8960,10 @@ msgstr "Утвердить действие по счету"
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
-#: report:account.move.voucher:0
 #: report:account.partner.balance:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
@@ -8866,6 +9005,9 @@ msgid ""
 "payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"Дата исполнения проводки созданной строкой \"%s\" основана на условии оплаты "
+"контрагента!\n"
+"Пожалуйста, задайте контрагента!"
 
 #. module: account
 #: field:account.cashbox.line,number:0
@@ -9065,7 +9207,6 @@ msgstr "Выберите период"
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
-#: report:account.move.voucher:0
 msgid "Posted"
 msgstr "Проведено"
 
@@ -9084,6 +9225,7 @@ msgstr "Проведено"
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,date_stop:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -9102,7 +9244,7 @@ msgstr "Дата окончания"
 #: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
 #: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
 msgid "Cancel Opening Entries"
-msgstr "Отмена открывающих проводок"
+msgstr "Отмена проводок открытия"
 
 #. module: account
 #: field:account.payment.term.line,days2:0
@@ -9137,7 +9279,7 @@ msgid "This is a model for recurring accounting entries"
 msgstr "Это модель для повторяющихся проводок"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Не определен счет доходов для ТМЦ: \"%s\" (id:%d)"
@@ -9210,7 +9352,7 @@ msgstr "Журнал: Все"
 #: field:analytic.entries.report,company_id:0
 #: field:wizard.multi.charts.accounts,company_id:0
 msgid "Company"
-msgstr "Компания"
+msgstr "Организация"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
@@ -9289,8 +9431,8 @@ msgid "End period"
 msgstr "Конец периода"
 
 #. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9320,7 +9462,7 @@ msgstr ""
 #: view:account.automatic.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Write-Off Move"
-msgstr ""
+msgstr "Операция списания"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -9358,10 +9500,10 @@ msgstr "Счет поставщика"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
-#: report:account.move.voucher:0
 #: report:account.partner.balance:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
@@ -9395,7 +9537,7 @@ msgid "Recurring"
 msgstr "Повторение"
 
 #. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Проводка уже сверена"
@@ -9408,7 +9550,7 @@ msgstr "Дебиторская задолженность"
 #. module: account
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr "Условия платежа партнера"
+msgstr "Условие оплаты контрагента"
 
 #. module: account
 #: field:temp.range,name:0
@@ -9416,7 +9558,7 @@ msgid "Range"
 msgstr "Диапазон"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece !\n"
@@ -9432,7 +9574,7 @@ msgstr ""
 #: selection:account.pl.report,display_account:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
-msgstr ""
+msgstr "С движением"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -9489,7 +9631,7 @@ msgstr "Этот период уже закрыт !"
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr "Дополнительная валюта, если эта запись мульти-валютная."
+msgstr "Дополнительная валюта, если эта проводка мульти-валютная."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
@@ -9518,12 +9660,12 @@ msgid ""
 "may keep several types of specialized journals such as a cash journal, "
 "purchase journal, sales journal..."
 msgstr ""
-"Создание и управление журналами вашей компании. Журнал используется для "
-"записи всех операций учета данных связанных с ежедневной деятельностью вашей "
-"компании используя двойную запись. В зависимости от характера  деятельности "
-"и количества ежедневных операций, компания может использовать несколько "
-"типов специализированных журналов таких, как кассовый журнал, журнал "
-"покупок, журнал продаж..."
+"Создавайте журналы организации и управляйте ими в этом меню. Журнал "
+"используется для отражения всех данных операций бухгалтерского учёта, "
+"связанных с повседневной деятельностью вашей организации по принципу двойной "
+"записи. В зависимости от характера деятельности и количества операций, "
+"организация может вести несколько типов специализированных журналов, таких "
+"как кассовый журнал, журнал покупок, журнал продаж…"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
@@ -9553,7 +9695,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Счет '%s' ожидает утверждения."
@@ -9578,7 +9720,7 @@ msgid "The income or expense account related to the selected product."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
 msgstr "Дата вашей записи в журнале вне определенного периода!"
@@ -9636,7 +9778,7 @@ msgstr "Бухгалтерские документы"
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
 msgid "Validate Account Move Lines"
-msgstr "Утвердить действия по счету"
+msgstr "Утвердить операции по счету"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
@@ -9776,7 +9918,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.line,amount_currency:0
 msgid "Amount currency"
-msgstr "Валюта суммы"
+msgstr "Сумма в валюте"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:55
@@ -9785,7 +9927,7 @@ msgid "You must enter a period length that cannot be 0 or below !"
 msgstr "Вы должны ввести длину периода больше 0 !"
 
 #. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
 msgstr "Нельзя удалить счет по которому есть проводки ! "
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index f1c1a881d02..54d763a6b69 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-05-04 19:28+0000\n"
+"PO-Revision-Date: 2011-06-06 09:30+0000\n"
 "Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-05 04:39+0000\n"
+"X-Launchpad-Export-Date: 2011-06-07 04:35+0000\n"
 "X-Generator: Launchpad (build 12959)\n"
 
 #. module: account
@@ -34,7 +34,7 @@ msgid "No End of year journal defined for the fiscal year"
 msgstr "Chưa xác định thời điểm kết thúc năm tài chính"
 
 #. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
@@ -47,6 +47,8 @@ msgstr ""
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
 msgstr ""
+"Thuế GTGT này không có vẻ là chính xác. Bạn cần phải có một cái gì đó nhập "
+"như% s này"
 
 #. module: account
 #: field:account.installer.modules,account_voucher:0
@@ -68,10 +70,10 @@ msgid "Residual"
 msgstr "Còn lại"
 
 #. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
 #, python-format
 msgid "Please define sequence on invoice journal"
-msgstr ""
+msgstr "làm ơn định nghĩa cấu hình đường đi và tần suất của hóa đơn"
 
 #. module: account
 #: constraint:account.period:0
@@ -137,7 +139,7 @@ msgid "Accounting Entries-"
 msgstr "Các bút toán Kế toán-"
 
 #. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
 msgstr "Bạn không thể xóa bút toán \"%s\" mà đã được ghi nhận trước đó!"
@@ -179,9 +181,11 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
+"Nếu lĩnh vực hoạt động được thiết lập để sai, nó sẽ cho phép bạn ẩn các hạn "
+"thanh toán mà không cần loại bỏ nó."
 
 #. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
 #, python-format
 msgid "Warning!"
 msgstr "Cảnh báo!"
@@ -236,7 +240,7 @@ msgid "account.tax"
 msgstr "account.tax"
 
 #. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -270,7 +274,7 @@ msgstr ""
 "on invoices"
 
 #. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -287,7 +291,7 @@ msgid "Belgian Reports"
 msgstr "Báo cáo của Bỉ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "You can not add/modify entries in a closed journal."
@@ -325,7 +329,7 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "Invoice line account company does not match with invoice company."
@@ -585,7 +589,7 @@ msgid "Not reconciled transactions"
 msgstr "Các giao dịch chưa đối soát"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
 msgstr "CashBox Balance is not matching with Calculated Balance !"
@@ -661,7 +665,7 @@ msgstr "Sổ nhật ký tập trung"
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
-msgstr ""
+msgstr "trình tự chính phải khác với các hiện tại"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -669,7 +673,7 @@ msgid "Tax Code Amount"
 msgstr "Tax Code Amount"
 
 #. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -702,8 +706,8 @@ msgid "Journal Period"
 msgstr "Chu kỳ của Sổ nhật ký"
 
 #. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "To reconcile the entries company should be the same for all entries"
@@ -764,7 +768,7 @@ msgid "Analytic Entries by line"
 msgstr "Analytic Entries by line"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
 msgstr "Bạn chỉ có thể thay đổi loại tiền cho Hóa đơn Nháp"
@@ -868,7 +872,7 @@ msgid "Next Partner to reconcile"
 msgstr "Đối tác tiếp theo cho đối soát"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry ! Please note that you "
@@ -995,11 +999,11 @@ msgid "Code"
 msgstr "Mã"
 
 #. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
@@ -1080,7 +1084,6 @@ msgstr "Profit & Loss (Expense Accounts)"
 
 #. module: account
 #: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "-"
@@ -1094,7 +1097,7 @@ msgstr "Quản lý"
 #. module: account
 #: view:account.subscription.generate:0
 msgid "Generate Entries before:"
-msgstr ""
+msgstr "Tạo ra các mục trước:"
 
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
@@ -1130,6 +1133,10 @@ msgid ""
 "purchase orders or receipts. This way, you can control the invoice from your "
 "supplier according to what you purchased or received."
 msgstr ""
+"Với hóa đơn cung cấp bạn có thể nhập và quản lý hoá đơn do nhà cung cấp của "
+"bạn. OpenERP cũng có thể tạo ra hóa đơn dự thảo tự động từ các đơn đặt hàng "
+"mua hàng hoặc biên lai. Bằng cách này, bạn có thể kiểm soát các hóa đơn từ "
+"nhà cung cấp của bạn theo những gì bạn mua hay nhận được."
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -1166,6 +1173,7 @@ msgstr "Số lượng giao dịch"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -1173,7 +1181,7 @@ msgid "Entry Label"
 msgstr "Entry Label"
 
 #. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "You can not modify/delete a journal with entries for this period !"
@@ -1311,7 +1319,6 @@ msgid "Journal Items Analysis"
 msgstr "Journal Items Analysis"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Các đối tác"
@@ -1338,10 +1345,10 @@ msgstr "Khoản phải thu"
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr ""
+msgstr "quy trình trung tâm"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
 #, python-format
 msgid "You can not use this general account in this journal !"
 msgstr "You can not use this general account in this journal !"
@@ -1410,6 +1417,10 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
+"Một mục tạp chí bao gồm các hạng mục một số tạp chí, mỗi trong số đó là cả "
+"một thẻ ghi nợ hoặc giao dịch tín dụng. OpenERP tự động tạo ra một mục tạp "
+"chí mỗi kế toán tài liệu: hóa đơn, hoàn thuế, thanh toán nhà cung cấp, báo "
+"cáo ngân hàng, etc"
 
 #. module: account
 #: view:account.entries.report:0
@@ -1435,7 +1446,7 @@ msgstr ""
 "Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
 
 #. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
 #, python-format
 msgid ""
 "Cannot create the invoice !\n"
@@ -1475,7 +1486,7 @@ msgstr "Template for Fiscal Position"
 #. module: account
 #: model:account.tax.code,name:account.account_tax_code_0
 msgid "Tax Code Test"
-msgstr ""
+msgstr "mã thuế kiểm tra"
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
@@ -1523,6 +1534,7 @@ msgstr "Search Bank Statements"
 msgid ""
 "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
 msgstr ""
+"báo có và váo nợ sai giá (báo có và báo nợ bắt buộc bắt đầu từ \"0\")"
 
 #. module: account
 #: view:account.chart.template:0
@@ -1552,6 +1564,12 @@ msgid ""
 "the Payment column of a line, you can press F1 to open the reconciliation "
 "form."
 msgstr ""
+"Một thông cáo của ngân hàng là một bản tóm tắt của tất cả các giao dịch tài "
+"chính xảy ra trong một thời gian nhất định trên tài khoản tiền gửi, thẻ tín "
+"dụng hoặc loại nào khác của tài khoản tài chính. Sự cân bằng sẽ bắt đầu được "
+"đề xuất tự động và số dư đóng cửa là để được tìm thấy trên báo cáo của bạn. "
+"Khi bạn đang ở trong cột Thanh toán của một dòng, bạn có thể nhấn F1 để mở "
+"hình thức hoà giải."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -1597,7 +1615,6 @@ msgid "Separated Journal Sequences"
 msgstr "Separated Journal Sequences"
 
 #. module: account
-#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Chịu trách nhiệm"
@@ -1669,7 +1686,7 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr "Lỗi! Bạn không thể định nghĩa các năm tài chính chồng nhau"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
 #, python-format
 msgid "The account is not defined to be reconciled !"
 msgstr "Tài khoản không được định nghĩa để đối soát !"
@@ -1684,7 +1701,7 @@ msgstr "Các giá trị"
 msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
-msgstr ""
+msgstr "nếu thiết lập này bị sai. bạn có thể ẩn nó thay vì xóa nó."
 
 #. module: account
 #: view:res.partner:0
@@ -1702,7 +1719,7 @@ msgid "Receivables & Payables"
 msgstr "Khoản phải thu & Khoản phải trả"
 
 #. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
 #, python-format
 msgid "You have to provide an account for the write off entry !"
 msgstr "You have to provide an account for the write off entry !"
@@ -1738,7 +1755,7 @@ msgid "Customer Ref:"
 msgstr "Tham chiếu khách hàng:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "User %s does not have rights to access %s journal !"
@@ -1759,7 +1776,7 @@ msgid "Tax Declaration: Credit Notes"
 msgstr "Tax Declaration: Credit Notes"
 
 #. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr "You cannot deactivate an account that contains account moves."
@@ -1772,10 +1789,10 @@ msgstr "Credit amount"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "bạn không thể xóa hay di chuyển dòng này vì tài khoản đã đóng."
 
 #. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
@@ -1792,7 +1809,7 @@ msgstr "Reserve And Profit/Loss Account"
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "báo nợ hay báo có bị sai trong tài khoản kế toán."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1958,7 +1975,7 @@ msgstr "Tài khoản không đánh thuế"
 msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
-msgstr ""
+msgstr "nếu thiết lập này bị sai. bạn sẽ ẩn nó thay vì xóa nó."
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -2039,8 +2056,6 @@ msgid ""
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
 msgstr ""
-"Invalid period ! Some periods overlap or the date period is not in the scope "
-"of the fiscal year. "
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2057,12 +2072,12 @@ msgid " Journal"
 msgstr " Sổ nhật ký"
 
 #. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
-msgstr ""
+msgstr "đây là số tài khoản mặc định được định nghĩa trên quy trìnhl \"%s\""
 
 #. module: account
 #: help:account.account,type:0
@@ -2093,6 +2108,9 @@ msgid ""
 "certified Chart of Accounts exists for your specified country, a generic one "
 "can be installed and will be selected by default."
 msgstr ""
+"Các biểu đồ mặc định của tài khoản là lựa chọn phù hợp với nước bạn. Nếu "
+"không có biểu đồ xác nhận tài khoản kế toán tồn tại cho đất nước chỉ định "
+"của bạn, một chung có thể được cài đặt và sẽ được lựa chọn theo mặc định"
 
 #. module: account
 #: view:account.account.type:0
@@ -2114,7 +2132,7 @@ msgid "Description"
 msgstr "Mô tả"
 
 #. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
@@ -2134,7 +2152,7 @@ msgid "Income Account"
 msgstr "Tài khoản thu nhập"
 
 #. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "There is no Accounting Journal of type Sale/Purchase defined!"
@@ -2145,6 +2163,7 @@ msgid "Accounting Properties"
 msgstr "Accounting Properties"
 
 #. module: account
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted By"
@@ -2173,6 +2192,7 @@ msgstr "Product Template"
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2282,14 +2302,14 @@ msgid "Account Tax Code"
 msgstr "Mã số thuế"
 
 #. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
 "\n"
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
-msgstr ""
+msgstr "không thể tìm trấy tài khoản nào trong quy trình %s của công ty này."
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -2320,12 +2340,6 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
-"This menu prints a VAT declaration based on invoices or payments. Select one "
-"or several periods of the fiscal year. The information required for a tax "
-"declaration is automatically generated by OpenERP from invoices (or "
-"payments, in some countries). This data is updated in real time. That’s very "
-"useful because it enables you to preview at any time the tax that you owe at "
-"the start and end of the month or quarter."
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -2358,7 +2372,7 @@ msgid "Account Model Entries"
 msgstr "Account Model Entries"
 
 #. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
@@ -2412,6 +2426,7 @@ msgstr ""
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
 msgstr ""
+"Báo cáo này cung cấp cho bạn một tổng quan về tình hình cụ thể của quy trình"
 
 #. module: account
 #: constraint:product.category:0
@@ -2448,7 +2463,7 @@ msgid "Accounts"
 msgstr "Các tài khoản"
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
 #, python-format
 msgid "Configuration Error!"
 msgstr "Lỗi cấu hình!"
@@ -2460,13 +2475,12 @@ msgid "Average Price"
 msgstr "Giá trung bình"
 
 #. module: account
-#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
 msgstr "Ngày:"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
 #, python-format
 msgid ""
 "You cannot modify company of this journal as its related record exist in "
@@ -2504,6 +2518,7 @@ msgstr "Chiết khấu.(%)"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.overdue:0
 #: report:account.third_party_ledger:0
@@ -2564,6 +2579,8 @@ msgid ""
 "Automatically generate entries based on what has been entered in the  system "
 "before a specific date."
 msgstr ""
+"Tự động tạo các mục dựa trên những gì đã được nhập vào hệ thống trước khi "
+"một ngày cụ thể"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -2617,16 +2634,16 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "This wizard will create recurring accounting entries"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "No sequence defined on the journal !"
 
 #. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2730,6 +2747,8 @@ msgstr ""
 msgid ""
 "used in statement reconciliation domain, but shouldn't be used elswhere."
 msgstr ""
+"được sử dụng trong lĩnh vực hòa giải tuyên bố, nhưng không nên được sử dụng "
+"ở nơi khác."
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -2794,7 +2813,7 @@ msgid "Analytic Entries"
 msgstr "Analytic Entries"
 
 #. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
@@ -2926,7 +2945,7 @@ msgid "BNK%s"
 msgstr "BNK%s"
 
 #. module: account
-#: code:addons/account/account.py:2906
+#: code:addons/account/account.py:2950
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
@@ -3046,6 +3065,7 @@ msgstr "Keep empty to use the expense account"
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
 #: view:account.journal.period:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,journal_ids:0
@@ -3106,7 +3126,7 @@ msgid "Starting Balance"
 msgstr "Số dư ban đầu"
 
 #. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Không có đối tác được định nghĩa"
@@ -3150,29 +3170,28 @@ msgstr "Sổ nhật ký:"
 #: view:account.invoice.report:0
 #: selection:account.invoice.report,state:0
 #: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
 msgid "Draft"
-msgstr "Dự thảo"
+msgstr "Nháp"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
 msgid "Accounting Chart Configuration"
-msgstr "Cấu hình Hệ thống tài khoản kế toán"
+msgstr "Cấu hình Hệ thống Tài khoản kế toán"
 
 #. module: account
 #: field:account.tax.code,notprintable:0
 #: field:account.tax.code.template,notprintable:0
 msgid "Not Printable in Invoice"
-msgstr "Not Printable in Invoice"
+msgstr "Hóa đơn không thể in"
 
 #. module: account
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,chart_tax_id:0
 msgid "Chart of Tax"
-msgstr "Hệ thống tài khoản thuế"
+msgstr "Hệ thống Thuế"
 
 #. module: account
 #: view:account.journal:0
@@ -3204,7 +3223,7 @@ msgstr ""
 "won't be able to modify their accounting fields anymore."
 
 #. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr "Không thể xóa các hóa đơn đang mở hoặc đã thanh toán !"
@@ -3267,7 +3286,7 @@ msgstr ""
 "or 'Done' state!"
 
 #. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3278,8 +3297,9 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr ""
+msgstr "phẩn tự tăng"
 
 #. module: account
 #: view:account.journal:0
@@ -3342,7 +3362,7 @@ msgstr "Hoạch đồ Kế toán"
 #. module: account
 #: view:account.tax.chart:0
 msgid "(If you do not select period it will take all open periods)"
-msgstr "(If you do not select period it will take all open periods)"
+msgstr ""
 
 #. module: account
 #: field:account.journal,centralisation:0
@@ -3381,6 +3401,7 @@ msgstr ""
 #: field:account.entries.report,date:0
 #: selection:account.general.journal,filter:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice.report,date:0
 #: report:account.journal.period.print:0
 #: view:account.move:0
@@ -3424,22 +3445,25 @@ msgid "Chart of Accounts Template"
 msgstr "Hoạch đồ Kế toán Mẫu"
 
 #. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
 "based on partner payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"Ngày đáo hạn của các dòng nhập được tạo ra bởi '% s' mô hình dòng của '% s' "
+"mô hình dựa trên thời hạn thanh toán đối tác!\n"
+"Hãy xác định đối tác trên nó"
 
 #. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Một số bút toán đã được đối soát !"
 
 #. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
 #, python-format
 msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
@@ -3534,6 +3558,8 @@ msgstr "Tài khoản phải thu"
 msgid ""
 "You cannot create entries on different periods/journals in the same move"
 msgstr ""
+"Bạn không thể tạo mục vào chu kỳ/sổ nhật ký khác nhau trong cùng một di "
+"chuyển"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -3561,10 +3587,10 @@ msgstr "Đơn giá"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tree1
 msgid "Analytic Items"
-msgstr ""
+msgstr "phân tích mặt hàng"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Không thể thay đổi thuế !"
@@ -3575,14 +3601,14 @@ msgid "#Entries"
 msgstr "Số bút toán"
 
 #. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
-msgstr ""
+msgstr "Bạn chọn một Đơn vị đo lường mà không tương thích với sản phẩm"
 
 #. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3680,6 +3706,10 @@ msgid ""
 "debit/credit accounts, of type 'situation' and with a centralized "
 "counterpart."
 msgstr ""
+"Các thực hành tốt nhất ở đây là sử dụng một tạp chí dành riêng để chứa các "
+"mục mở của tất cả năm tài chính. Lưu ý rằng bạn nên xác định nó với mặc định "
+"ghi nợ tài khoản tín dụng /, trong 'tình trạng' loại và với một đối tác tập "
+"trung."
 
 #. module: account
 #: view:account.installer:0
@@ -3714,6 +3744,8 @@ msgstr "Validate"
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
 msgstr ""
+"Sai tín dụng hoặc giá trị ghi nợ trong mô hình (tín dụng hay nợ phải trở "
+"thành \"0 \")!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -3801,6 +3833,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
 msgstr ""
+"Nếu lĩnh vực hoạt động được thiết lập để sai, nó sẽ cho phép bạn ẩn các tài "
+"khoản mà không cần loại bỏ nó."
 
 #. module: account
 #: view:account.tax.template:0
@@ -3853,6 +3887,8 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category using sale price"
 msgstr ""
+"Tài khoản này sẽ được sử dụng để chứng khoán đi giá trị cho các loại sản "
+"phẩm hiện tại bằng cách sử dụng giá bán"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3885,7 +3921,7 @@ msgid "Acc.Type"
 msgstr "Loại tài khoản"
 
 #. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr "Global taxes defined, but are not in invoice lines !"
@@ -3949,10 +3985,11 @@ msgstr ""
 "created in 'Posted' state."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
+"Không có tài khoản chi phí quy định cho sản phẩm này: \"% s \" (id:% d)"
 
 #. module: account
 #: view:res.partner:0
@@ -4012,7 +4049,7 @@ msgstr "Check if you want to display Accounts with 0 balance too."
 #. module: account
 #: view:account.tax:0
 msgid "Compute Code"
-msgstr ""
+msgstr "mã tự động tính"
 
 #. module: account
 #: view:account.account.template:0
@@ -4126,7 +4163,7 @@ msgid "Credit Notes"
 msgstr "Credit Notes"
 
 #. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
@@ -4168,6 +4205,8 @@ msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
 msgstr ""
+"Điều này sẽ tự động cấu hình biểu đồ của bạn các tài khoản, tài khoản ngân "
+"hàng, thuế và các tạp chí theo mẫu được lựa chọn"
 
 #. module: account
 #: field:account.tax,price_include:0
@@ -4197,11 +4236,11 @@ msgid "Change"
 msgstr "Thay đổi"
 
 #. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
 #: code:addons/account/wizard/account_fiscalyear_close.py:78
 #: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4305,13 +4344,16 @@ msgid "You must define an analytic journal of type '%s' !"
 msgstr "You must define an analytic journal of type '%s' !"
 
 #. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
 "the account \"%s - %s\". Clear the secondary currency field of the account "
 "definition if you want to accept all currencies."
 msgstr ""
+"Không thể tạo ra di chuyển với tiền tệ khác nhau từ các loại tiền tệ thứ cấp "
+"của tài khoản \"% s -% s\". Rõ ràng lĩnh vực tiền tệ thứ cấp của định nghĩa "
+"tài khoản nếu bạn muốn chấp nhận tất cả các loại tiền tệ."
 
 #. module: account
 #: field:account.invoice.refund,date:0
@@ -4373,7 +4415,7 @@ msgid "Invoices"
 msgstr "Các hóa đơn"
 
 #. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4487,25 +4529,24 @@ msgid "Third Party (Country)"
 msgstr "Third Party (Country)"
 
 #. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_report_common.py:120
 #: code:addons/account/wizard/account_report_common.py:126
 #, python-format
@@ -4519,7 +4560,7 @@ msgstr "Lỗi"
 #: field:account.analytic.cost.ledger.journal.report,date2:0
 #: field:account.analytic.inverted.balance,date2:0
 msgid "End of period"
-msgstr "Cuối chu kỳ"
+msgstr "Kết thúc chu kỳ"
 
 #. module: account
 #: view:res.partner:0
@@ -4527,7 +4568,7 @@ msgid "Bank Details"
 msgstr "Chi tiết ngân hàng"
 
 #. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
 #, python-format
 msgid "Taxes missing !"
 msgstr "Taxes missing !"
@@ -4584,7 +4625,7 @@ msgid "Check Date not in the Period"
 msgstr "Kiểm tra Ngày có nằm trong Chu kỳ"
 
 #. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4606,7 +4647,7 @@ msgid "Child Tax Accounts"
 msgstr "Child Tax Accounts"
 
 #. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Chu kỳ bắt đầu phải nhỏ hơn chu kỳ kết thúc"
@@ -4636,6 +4677,7 @@ msgstr "Analytic Balance -"
 #: report:account.general.journal:0
 #: field:account.general.journal,target_move:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.journal,target_move:0
 #: report:account.partner.balance:0
@@ -4666,7 +4708,7 @@ msgstr "Thanh toán"
 #. module: account
 #: view:account.tax:0
 msgid "Reverse Compute Code"
-msgstr ""
+msgstr "Tính mã Ngược"
 
 #. module: account
 #: field:account.subscription.line,move_id:0
@@ -4695,6 +4737,7 @@ msgstr "Tên cột"
 msgid ""
 "This report gives you an overview of the situation of your general journals"
 msgstr ""
+"Báo cáo này cung cấp cho bạn một tổng quan về tình hình chung của bạn"
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -4718,7 +4761,7 @@ msgid "Line 1:"
 msgstr "Dòng 1:"
 
 #. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "Integrity Error !"
 msgstr "Lỗi toàn vẹn !"
@@ -4832,7 +4875,7 @@ msgstr "Giá trị"
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
 #, python-format
 msgid "End of Fiscal Year Entry"
-msgstr ""
+msgstr "cuối năm tài chính"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_customerinvoice0
@@ -4866,7 +4909,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
@@ -4940,7 +4983,7 @@ msgstr ""
 "Ngày = 22, Ngày trong Tháng =- 1, sau đó đúng hạn là 28/02"
 
 #. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
@@ -4968,7 +5011,7 @@ msgid "Start of period"
 msgstr "Bắt đầu chu kỳ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
@@ -5026,12 +5069,12 @@ msgstr "End of Year Entries Journal"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5113,12 +5156,14 @@ msgid "Sort By"
 msgstr "Sắp xếp theo"
 
 #. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
 "on journal \"%s\""
 msgstr ""
+"Không có mặc định tài khoản mặc định tín dụng quy định\n"
+"trên tạp chí \"% s \""
 
 #. module: account
 #: field:account.entries.report,amount_currency:0
@@ -5206,6 +5251,10 @@ msgid ""
 "impossible any new entry record. Close a fiscal year when you need to "
 "finalize your end of year results definitive "
 msgstr ""
+"Nếu không có mục nhập bổ sung phải được ghi trên một năm tài chính, bạn có "
+"thể đóng nó từ đây. Nó sẽ đóng tất cả các thời kỳ mở cửa trong năm nay sẽ "
+"làm cho không thể ghi lại bất kỳ mục nhập mới. Gần một năm tài chính khi bạn "
+"cần phải hoàn thiện cuối cùng của bạn kết quả năm dứt khoát "
 
 #. module: account
 #: field:account.central.journal,amount_currency:0
@@ -5241,7 +5290,7 @@ msgstr "Có hiệu lực đến"
 #. module: account
 #: view:board.board:0
 msgid "Aged Receivables"
-msgstr ""
+msgstr "Tuổi từ khoản phải thu"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
@@ -5266,7 +5315,7 @@ msgid "Generate Opening Entries"
 msgstr "Generate Opening Entries"
 
 #. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Đã được đối soát!"
@@ -5304,7 +5353,7 @@ msgstr "Tài khoản con"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
 #, python-format
 msgid "Write-Off"
 msgstr "Miễn bỏ"
@@ -5415,6 +5464,9 @@ msgid ""
 "OpenERP allows you to define the tax structure and manage it from this menu. "
 "You can define both numeric and alphanumeric tax codes."
 msgstr ""
+"Việc xác định mã số thuế phụ thuộc vào việc kê khai thuế của các nước bạn. "
+"OpenERP cho phép bạn xác định cấu trúc thuế và quản lý nó từ trình đơn này. "
+"Bạn có thể xác định cả hai mã số thuế số và chữ số."
 
 #. module: account
 #: help:account.partner.reconcile.process,progress:0
@@ -5451,7 +5503,7 @@ msgid "# of Lines"
 msgstr "Số dòng"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr "Loại tiền mới chưa được cấu hình đúng !"
@@ -5476,14 +5528,14 @@ msgid "Filter by"
 msgstr "Lọc theo"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Bạn không thể sử dụng một tài khoản không hoạt động!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr "Entries are not of the same account or already reconciled ! "
@@ -5504,7 +5556,7 @@ msgstr "Account General Journal"
 #: code:addons/account/report/common_report_header.py:100
 #, python-format
 msgid "No Filter"
-msgstr ""
+msgstr "không có ô trống"
 
 #. module: account
 #: field:account.payment.term.line,days:0
@@ -5518,7 +5570,7 @@ msgstr "7"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
 #, python-format
 msgid "Invalid action !"
 msgstr "Hành động không hợp lệ !"
@@ -5527,7 +5579,7 @@ msgstr "Hành động không hợp lệ !"
 #: code:addons/account/wizard/account_move_journal.py:102
 #, python-format
 msgid "Period: %s"
-msgstr ""
+msgstr "thời gian: %s"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
@@ -5635,6 +5687,11 @@ msgid ""
 "line of the expense account. OpenERP will propose to you automatically the "
 "Tax related to this account and the counterpart \"Account Payable\"."
 msgstr ""
+"Quan điểm này có thể được sử dụng bởi các kế toán để nhanh chóng ghi lại các "
+"mục trong OpenERP. Nếu bạn muốn ghi lại một hóa đơn nhà cung cấp, bắt đầu "
+"bằng cách ghi các dòng của các tài khoản chi phí. OpenERP sẽ đề xuất để bạn "
+"tự động các thuế liên quan đến tài khoản này và đối tác \"Tài khoản phải "
+"trả\"."
 
 #. module: account
 #: field:account.entries.report,date_created:0
@@ -5710,7 +5767,7 @@ msgstr "Cấu hình Báo cáo"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Công ty phải cùng cho tài khoản thời gian liên quan và của nó."
 
 #. module: account
 #: field:account.tax,type:0
@@ -5735,7 +5792,7 @@ msgid "Companies"
 msgstr "Các công ty"
 
 #. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
@@ -6015,9 +6072,9 @@ msgid "Optional create"
 msgstr "Optional create"
 
 #. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
 #, python-format
 msgid "Can not find account chart for this company, Please Create account."
 msgstr "Can not find account chart for this company, Please Create account."
@@ -6054,7 +6111,7 @@ msgstr "Tập trung"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Accounting Chart from a Chart Template"
-msgstr ""
+msgstr "Tạo Sơ đồ kế toán của bạn từ một biểu  đồ"
 
 #. module: account
 #: view:account.account:0
@@ -6127,7 +6184,7 @@ msgstr "Đã được đối soát"
 #: report:account.invoice:0
 #: field:account.invoice.tax,base:0
 msgid "Base"
-msgstr "Cơ sở"
+msgstr "Gốc"
 
 #. module: account
 #: field:account.model,name:0
@@ -6168,8 +6225,8 @@ msgid "Analytic Entries Statistics"
 msgstr "Analytic Entries Statistics"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
 #, python-format
 msgid "Entries: "
 msgstr "Các bút toán: "
@@ -6177,10 +6234,10 @@ msgstr "Các bút toán: "
 #. module: account
 #: view:account.use.model:0
 msgid "Create manual recurring entries in a chosen journal."
-msgstr ""
+msgstr "Tạo các mục hướng dẫn định kỳ trên quy trình lựa chọn"
 
 #. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Couldn't create move between different companies"
@@ -6196,6 +6253,13 @@ msgid ""
 "account. From this view, you can create and manage the account types you "
 "need for your company."
 msgstr ""
+"Một loại tài khoản được sử dụng để xác định một tài khoản được sử dụng trong "
+"từng tạp chí. Phương pháp hoãn của một loại tài khoản xác định quy trình "
+"đóng hàng năm. Các báo cáo như Bảng cân đối và báo cáo lãi lỗ, và sử dụng "
+"các loại (lãi / lỗ hay bảng cân đối). Ví dụ, các loại tài khoản có thể được "
+"liên kết đến một tài khoản tài khoản tài sản, chi phí, hoặc tài khoản phải "
+"nộp. Từ quan điểm này, bạn có thể tạo và quản lý các loại tài khoản bạn cần "
+"cho công ty của bạn."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
@@ -6221,7 +6285,7 @@ msgid "Total debit"
 msgstr "Tổng nợ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Bút toán \"%s\" không hợp lệ !"
@@ -6290,30 +6354,31 @@ msgid "  valuation: percent"
 msgstr "  định giá: phần trăm"
 
 #. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:292
 #: code:addons/account/account_bank_statement.py:305
 #: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
 #: code:addons/account/wizard/account_invoice_refund.py:100
 #: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6350,6 +6415,10 @@ msgid ""
 "reconcile in a series of accounts. It finds entries for each partner where "
 "the amounts correspond."
 msgstr ""
+"Đối với hoá đơn được coi là thanh toán, ghi hoá đơn phải được đối chiếu với "
+"các đối tác, thường là các khoản thanh toán. Với các chức năng tự động hoà "
+"giải, OpenERP làm cho tìm kiếm của riêng mình cho các mục để hòa giải trong "
+"một loạt các tài khoản. Nó tìm thấy mục cho từng đối tác mà số tiền tương ứng"
 
 #. module: account
 #: view:account.move:0
@@ -6378,6 +6447,8 @@ msgid ""
 "This report is an analysis done by a partner. It is a PDF report containing "
 "one line per partner representing the cumulative credit balance"
 msgstr ""
+"Báo cáo này là một phân tích được thực hiện bởi một đối tác. Đây là một báo "
+"cáo PDF có chứa một dòng cho mỗi đối tác đại diện cho số dư tích lũy"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:61
@@ -6416,7 +6487,7 @@ msgstr "Tất cả bút toán"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "Lỗi: UOM  mặc định và UOM  mua phải được trong cùng thể loại."
 
 #. module: account
 #: view:account.journal.select:0
@@ -6424,7 +6495,7 @@ msgid "Journal Select"
 msgstr "Journal Select"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr "Loại tiền hiện tại không được cấu hình đúng !"
@@ -6441,9 +6512,11 @@ msgstr "Taxes Fiscal Position"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.report.general.ledger:0
 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
 #: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
 #: model:ir.ui.menu,name:account.menu_general_ledger
 msgid "General Ledger"
 msgstr "Sổ cái"
@@ -6461,6 +6534,9 @@ msgid ""
 "allowing you to quickly check the balance of each of your accounts in a "
 "single report"
 msgstr ""
+"Báo cáo này cho phép bạn in hay tạo ra một pdf cân bằng thử nghiệm của bạn "
+"cho phép bạn nhanh chóng kiểm tra số dư của từng tài khoản của bạn trong một "
+"báo cáo duy nhất."
 
 #. module: account
 #: help:account.move,to_check:0
@@ -6501,7 +6577,7 @@ msgid "Total:"
 msgstr "Tổng cộng:"
 
 #. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6539,7 +6615,7 @@ msgid "Child Codes"
 msgstr "Child Codes"
 
 #. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6642,6 +6718,10 @@ msgid ""
 "an agreement with a customer or a supplier. With Define Recurring Entries, "
 "you can create such entries to automate the postings in the system."
 msgstr ""
+"Một mục định kỳ là một mục linh tinh xảy ra trên một cơ sở thường xuyên từ "
+"một ngày cụ thể, tức là tương ứng với chữ ký của hợp đồng hoặc thỏa thuận "
+"với một khách hàng hay nhà cung cấp. Với Xác định định kỳ mục, bạn có thể "
+"tạo mục này để tự động hoá các thông tin đăng trong hệ thống"
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
@@ -6658,6 +6738,11 @@ msgid ""
 "basis. You can enter the coins that are in your cash box, and then post "
 "entries when money comes in or goes out of the cash box."
 msgstr ""
+"Một tính tiền cho phép bạn quản lý các mục tiền mặt trong các tạp chí tiền "
+"mặt của bạn. Tính năng này cung cấp một cách dễ dàng để theo dõi các khoản "
+"thanh toán tiền mặt trên cơ sở hàng ngày. Bạn có thể nhập các đồng tiền có "
+"trong hộp bằng tiền mặt của bạn, và sau đó đăng nhập khi tiền đến trong hoặc "
+"đi ra khỏi hộp bằng tiền mặt."
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -6713,7 +6798,7 @@ msgid "Lines"
 msgstr "Lines"
 
 #. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
 #, python-format
 msgid ""
 "Can not find account chart for this company in invoice line account, Please "
@@ -6741,7 +6826,7 @@ msgstr "Are you sure you want to open this invoice ?"
 #: code:addons/account/account_move_line.py:963
 #, python-format
 msgid "Accounting Entries"
-msgstr ""
+msgstr "kế toán Entries"
 
 #. module: account
 #: field:account.account.template,parent_id:0
@@ -6812,6 +6897,9 @@ msgid ""
 "You can search for individual account entries through useful information. To "
 "search for account entries, open a journal, then select a record line."
 msgstr ""
+"Bạn có thể tìm kiếm các mục tài khoản cá nhân thông qua các thông tin hữu "
+"ích. Để tìm kiếm các mục tài khoản, mở một tạp chí, sau đó chọn một dòng ghi "
+"lại."
 
 #. module: account
 #: report:account.invoice:0
@@ -6910,10 +6998,10 @@ msgstr ""
 "to create specific taxes in a custom domain."
 
 #. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
-msgstr "You should have chosen periods that belongs to the same company"
+msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
@@ -7024,7 +7112,7 @@ msgid "Sign on Reports"
 msgstr "Sign on Reports"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
 #, python-format
 msgid "You can not have two open register for the same journal"
 msgstr "You can not have two open register for the same journal"
@@ -7037,7 +7125,7 @@ msgstr "  ngày trong tháng= -1"
 #. module: account
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Lỗi! Bạn không thể tạo ra các thành viên đệ quy có liên quan."
 
 #. module: account
 #: help:account.journal,type:0
@@ -7059,7 +7147,6 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
-#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
@@ -7091,6 +7178,7 @@ msgstr "Thông tin tùy chọn"
 
 #. module: account
 #: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -7118,13 +7206,13 @@ msgstr ""
 "the limit date for the payment of this line."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
 #, python-format
 msgid "Bad account !"
 msgstr "Tài khoản không đúng !"
 
 #. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
@@ -7134,7 +7222,7 @@ msgstr "Sổ nhật ký Bán hàng"
 #: code:addons/account/wizard/account_move_journal.py:104
 #, python-format
 msgid "Open Journal Items !"
-msgstr ""
+msgstr "mở quy trình của một mặt hàng"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -7142,7 +7230,7 @@ msgid "Invoice Tax"
 msgstr "Thuế Hóa đơn"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
 #, python-format
 msgid "No piece number !"
 msgstr "No piece number !"
@@ -7299,6 +7387,11 @@ msgid ""
 "in which they will appear. Then you can create a new journal and link your "
 "view to it."
 msgstr ""
+"Tại đây bạn có thể tùy chỉnh một xem tạp chí hiện có hoặc tạo ra một cái "
+"nhìn mới. Tạp chí xác định xem cách bạn có thể ghi các mục trong tạp chí của "
+"bạn. Chọn các trường bạn muốn xuất hiện trên tạp chí và xác định trình tự, "
+"trong đó họ sẽ xuất hiện. Sau đó, bạn có thể tạo ra một tạp chí mới và liên "
+"kết của bạn để xem nó."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -7384,17 +7477,17 @@ msgid "Fixed"
 msgstr "Đã sửa"
 
 #. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
 #: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
 #, python-format
 msgid "Warning !"
 msgstr "Cảnh báo !"
@@ -7426,6 +7519,7 @@ msgstr "Số tiền (bằng chữ) :"
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7456,7 +7550,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Can not %s draft/proforma/cancel invoice."
 
 #. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "No Invoice Lines !"
@@ -7507,7 +7601,7 @@ msgid "Deferral Method"
 msgstr "Phương pháp hoãn lại"
 
 #. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Hóa đơn '%s' đã được trả."
@@ -7520,7 +7614,7 @@ msgstr "Bút toán Tự động"
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
+msgstr "Lỗi! Bạn không thể tạo mã số thuế đệ quy."
 
 #. module: account
 #: view:account.invoice.line:0
@@ -7572,7 +7666,7 @@ msgid "Associated Partner"
 msgstr "Đối tác Liên quan"
 
 #. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
 #, python-format
 msgid "You must first select a partner !"
 msgstr "You must first select a partner !"
@@ -7607,11 +7701,14 @@ msgid ""
 "will see the taxes with codes related to your legal statement according to "
 "your country."
 msgstr ""
+"Các biểu đồ các loại thuế được sử dụng để tạo ra các báo cáo thuế định kỳ "
+"của bạn. Bạn sẽ thấy các loại thuế với mã số liên quan tới tuyên bố pháp lý "
+"của mình theo quy định của nước bạn."
 
 #. module: account
 #: view:account.installer.modules:0
 msgid "Add extra Accounting functionalities to the ones already installed."
-msgstr ""
+msgstr "Thêm Kế toán thêm chức năng cho những người đã được cài đặt."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -7637,7 +7734,7 @@ msgid "Choose Fiscal Year"
 msgstr "Chọn năm tài chính"
 
 #. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
@@ -7674,6 +7771,7 @@ msgstr "Quản lý Kế toán và Tài chính"
 #: view:account.entries.report:0
 #: field:account.entries.report,period_id:0
 #: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
 #: field:account.journal.period,period_id:0
@@ -7748,6 +7846,10 @@ msgid ""
 "can easily generate refunds and reconcile them directly from the invoice "
 "form."
 msgstr ""
+"Với khách hàng Hoàn lại tiền bạn có thể quản lý các ghi chú tín dụng cho "
+"khách hàng của bạn. Hoàn là một tài liệu mà các khoản tín dụng hoá đơn hoàn "
+"toàn hoặc một phần. Bạn có thể dễ dàng tạo ra hoàn và đối chiếu trực tiếp từ "
+"các mẫu hoá đơn"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_vat_declaration
@@ -7759,12 +7861,6 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
-"This menu print a VAT declaration based on invoices or payments. You can "
-"select one or several periods of the fiscal year. Information required for a "
-"tax declaration is automatically generated by OpenERP from invoices (or "
-"payments, in some countries). This data is updated in real time. That’s very "
-"useful because it enables you to preview at any time the tax that you owe at "
-"the start and end of the month or quarter."
 
 #. module: account
 #: report:account.invoice:0
@@ -7797,6 +7893,8 @@ msgid ""
 "added, Loss: Amount will be duducted), which is calculated from Profilt & "
 "Loss Report"
 msgstr ""
+"Tài khoản này dùng để chuyển lợi nhuận / lỗ (lợi nhuận: Số tiền sẽ được thêm "
+"vào, Mất: Số tiền sẽ được duducted), được tính từ Profilt & Loss Báo cáo"
 
 #. module: account
 #: help:account.move.line,blocked:0
@@ -7846,7 +7944,7 @@ msgid "Account Types"
 msgstr "Loại tài khoản"
 
 #. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr "Cannot create invoice move on centralised journal"
@@ -7896,6 +7994,7 @@ msgstr "Sổ nhật ký Hoàn tiền"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
 msgid "Filter By"
 msgstr "Lọc bởi"
@@ -7908,6 +8007,10 @@ msgid ""
 "sales orders or deliveries. You should only confirm them before sending them "
 "to your customers."
 msgstr ""
+"Với hóa đơn khách hàng bạn có thể tạo và quản lý hoá đơn bán hàng cấp cho "
+"khách hàng của bạn. OpenERP cũng có thể tạo ra các hoá đơn bán hàng dự thảo "
+"tự động từ các đơn đặt hàng hoặc giao hàng. Bạn chỉ nên xác nhận chúng trước "
+"khi gửi cho khách hàng của bạn."
 
 #. module: account
 #: view:account.entries.report:0
@@ -7934,7 +8037,7 @@ msgid "Payment Term Line"
 msgstr "Payment Term Line"
 
 #. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
@@ -7980,6 +8083,8 @@ msgstr "Các nhà cung cấp"
 msgid ""
 "You cannot create more than one move per period on centralized journal"
 msgstr ""
+"Bạn không thể tạo ra nhiều hơn một khoảng thời gian di chuyển mỗi ngày tập "
+"trung"
 
 #. module: account
 #: view:account.journal:0
@@ -7997,6 +8102,8 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in the company currency."
 msgstr ""
+"Số tiền còn dư trên phải thu hoặc phải trả của một mục tạp chí thể hiện bằng "
+"tiền của công ty"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -8101,10 +8208,11 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
 msgstr ""
+"Số tiền của chứng từ phải được cùng một số tiền như trên các dòng lệnh"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
 #, python-format
 msgid "Bad account!"
 msgstr "Tài khoản không hợp lệ!"
@@ -8115,10 +8223,10 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Keep empty for all open fiscal years"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
-msgstr ""
+msgstr "Việc di chuyển tài khoản (% s) để tập trung đã được khẳng định!"
 
 #. module: account
 #: help:account.move.line,amount_currency:0
@@ -8138,6 +8246,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8179,6 +8288,13 @@ msgid ""
 "would be referred to as FY 2011. You are not obliged to follow the actual "
 "calendar year."
 msgstr ""
+"Xác định năm tài chính của công ty theo nhu cầu của bạn. Một năm tài chính "
+"là một khoảng thời gian cuối cùng mà một công ty tài khoản được tạo thành "
+"(thường là 12 tháng). Năm tài chính thường được gọi theo ngày, trong đó nó "
+"kết thúc. Ví dụ, nếu năm tài chính của công ty kết thúc ngày 30 tháng 11 năm "
+"2011, sau đó tất cả mọi thứ từ 01 tháng mười hai năm 2010 và ngày 30 Tháng "
+"11 năm 2011 sẽ được gọi là năm tài chính 2011. Bạn không có trách nhiệm làm "
+"theo năm dương lịch thực tế."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
@@ -8327,14 +8443,14 @@ msgid "Period from"
 msgstr "Chu kỳ từ"
 
 #. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Sales Refund Journal"
 
 #. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
 #, python-format
 msgid ""
 "You cannot modify company of this period as its related record exist in "
@@ -8348,7 +8464,7 @@ msgstr ""
 #: view:account.move.line:0
 #: view:account.payment.term:0
 msgid "Information"
-msgstr "Information"
+msgstr "Thông tin"
 
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
@@ -8358,7 +8474,7 @@ msgstr "Registered payment"
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close states of Fiscal year and periods"
-msgstr "Close states of Fiscal year and periods"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
@@ -8385,7 +8501,7 @@ msgid "Purchase Tax(%)"
 msgstr "Thuế mua hàng(%)"
 
 #. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Please create some invoice lines."
@@ -8401,7 +8517,7 @@ msgid "Configure Your Accounting Application"
 msgstr "Cấu hình Ứng dụng Kế toán của bạn"
 
 #. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
@@ -8445,6 +8561,7 @@ msgstr "Followups Management"
 #: report:account.central.journal:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
@@ -8454,7 +8571,7 @@ msgid "Start Period"
 msgstr "Bắt đầu chu kỳ"
 
 #. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
 #, python-format
 msgid "Cannot locate parent code for template account!"
 msgstr "Cannot locate parent code for template account!"
@@ -8492,7 +8609,7 @@ msgstr ""
 "Accountant validates the accounting entries coming from the invoice. "
 
 #. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
 #, python-format
 msgid ""
 "You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8519,10 +8636,10 @@ msgstr "Document: Customer account statement"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "Bạn không thể tạo ra các dòng di chuyển vào tài khoản xem."
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr "Current currency is not confirured properly !"
@@ -8535,6 +8652,10 @@ msgid ""
 "partially. You can easily generate refunds and reconcile them directly from "
 "the invoice form."
 msgstr ""
+"Với Nhà cung cấp hoàn phí bạn có thể quản lý tín dụng các ghi chú mà bạn "
+"nhận được từ nhà cung cấp của bạn. Hoàn là một tài liệu mà các khoản tín "
+"dụng hoá đơn hoàn toàn hoặc một phần. Bạn có thể dễ dàng tạo ra hoàn và đối "
+"chiếu trực tiếp từ các mẫu hoá đơn."
 
 #. module: account
 #: view:account.account.template:0
@@ -8571,6 +8692,7 @@ msgstr "Để trống để sử dụng tài khoản thu nhập"
 #: field:account.entries.report,balance:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8589,6 +8711,7 @@ msgstr "Manually or automatically entered in the system"
 
 #. module: account
 #: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
 msgid "Display Account"
 msgstr "Hiển thị tài khoản"
 
@@ -8688,6 +8811,12 @@ msgid ""
 "closed or left open depending on your company's activities over a specific "
 "period."
 msgstr ""
+"Tại đây bạn có thể định nghĩa một khoảng thời gian tài chính, một khoảng "
+"thời gian trong năm tài chính của công ty. Kỳ kế toán thông thường là một "
+"tháng hoặc quý. Nó thường tương ứng với các giai đoạn của việc kê khai thuế. "
+"Tạo và quản lý thời gian từ đây và quyết định có một khoảng thời gian cần "
+"được đóng hoặc mở lại tùy thuộc vào các hoạt động của công ty bạn trong "
+"khoảng thời gian cụ thể."
 
 #. module: account
 #: report:account.move.voucher:0
@@ -8710,6 +8839,7 @@ msgstr "Manual entry"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
@@ -8717,7 +8847,7 @@ msgid "Move"
 msgstr "Move"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr "You can not change the tax, you should remove and recreate lines !"
@@ -8751,6 +8881,8 @@ msgid ""
 "You have to define the bank account\n"
 "in the journal definition for reconciliation."
 msgstr ""
+"Bạn phải xác định các tài khoản ngân hàng\n"
+"trong định nghĩa tạp chí cho hoà giải."
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -8814,6 +8946,7 @@ msgstr "Account Analytic Balance"
 #: report:account.central.journal:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
@@ -8857,7 +8990,7 @@ msgid "Account Subscription"
 msgstr "Account Subscription"
 
 #. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
 #, python-format
 msgid ""
 "Tax base different !\n"
@@ -8886,6 +9019,7 @@ msgstr "Entry Subscription"
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,date_start:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -8914,7 +9048,7 @@ msgid "Unreconciled"
 msgstr "Chưa được đối soát"
 
 #. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
 #, python-format
 msgid "Bad total !"
 msgstr "Tổng không hợp lệ !"
@@ -8935,13 +9069,6 @@ msgid ""
 "open period. Close a period when you do not want to record new entries and "
 "want to lock this period for tax related calculation."
 msgstr ""
-"A period is a fiscal period of time during which accounting entries should "
-"be recorded for accounting related activities. Monthly period is the norm "
-"but depending on your countries or company needs, you could also have "
-"quarterly periods. Closing a period will make it impossible to record new "
-"accounting entries, all new entries should then be made on the following "
-"open period. Close a period when you do not want to record new entries and "
-"want to lock this period for tax related calculation."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -8979,13 +9106,13 @@ msgid "Active"
 msgstr "Đang hoạt động"
 
 #. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
 #, python-format
 msgid "Unknown Error"
 msgstr "Lỗi chưa biết"
 
 #. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry !\n"
@@ -9033,10 +9160,10 @@ msgstr "Validate Account Move"
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
-#: report:account.move.voucher:0
 #: report:account.partner.balance:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
@@ -9081,6 +9208,9 @@ msgid ""
 "payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"Ngày đáo hạn của các dòng nhập được tạo ra bởi '% s' mô hình dựa trên dòng "
+"thời hạn thanh toán đối tác!\n"
+"Hãy xác định đối tác trên nó!"
 
 #. module: account
 #: field:account.cashbox.line,number:0
@@ -9126,7 +9256,7 @@ msgstr "Tổng quát"
 #: model:ir.ui.menu,name:account.next_id_23
 #, python-format
 msgid "Periods"
-msgstr "Periods"
+msgstr "Các chu kỳ"
 
 #. module: account
 #: field:account.invoice.report,currency_rate:0
@@ -9232,6 +9362,8 @@ msgid ""
 "This report allows you to print or generate a pdf of your general ledger "
 "with details of all your account journals"
 msgstr ""
+"Báo cáo này cho phép bạn in hay tạo ra một pdf của sổ cái của bạn với các "
+"chi tiết của tất cả các tạp chí tài khoản của bạn"
 
 #. module: account
 #: selection:account.account,type:0
@@ -9281,7 +9413,6 @@ msgstr "Chọn chu kỳ"
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
-#: report:account.move.voucher:0
 msgid "Posted"
 msgstr "Posted"
 
@@ -9300,6 +9431,7 @@ msgstr "Posted"
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,date_stop:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -9353,10 +9485,11 @@ msgid "This is a model for recurring accounting entries"
 msgstr "This is a model for recurring accounting entries"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
+"Không có tài khoản thu nhập được xác định cho sản phẩm này: \"% s \" (id:% d)"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -9396,7 +9529,7 @@ msgstr "Tổng"
 #: code:addons/account/wizard/account_move_journal.py:97
 #, python-format
 msgid "Journal: All"
-msgstr ""
+msgstr "Journal: Tẩt cả"
 
 #. module: account
 #: field:account.account,company_id:0
@@ -9457,7 +9590,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create Monthly Periods"
-msgstr "Create Monthly Periods"
+msgstr "Tạo các chu kỳ theo tháng"
 
 #. module: account
 #: field:account.tax.code.template,sign:0
@@ -9507,8 +9640,8 @@ msgid "End period"
 msgstr "Chu kỳ kết thúc"
 
 #. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9526,6 +9659,8 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category using cost price"
 msgstr ""
+"Tài khoản này sẽ được sử dụng để chứng khoán đi giá trị cho các loại sản "
+"phẩm hiện tại bằng cách sử dụng giá"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -9574,10 +9709,10 @@ msgstr "Hóa đơn nhà cung cấp"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
-#: report:account.move.voucher:0
 #: report:account.partner.balance:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
@@ -9595,7 +9730,7 @@ msgstr "Invoice Lines"
 #. module: account
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
-msgstr ""
+msgstr "Lỗi! Bạn không thể tạo tài khoản đệ quy mẫu."
 
 #. module: account
 #: constraint:account.account.template:0
@@ -9611,7 +9746,7 @@ msgid "Recurring"
 msgstr "Recurring"
 
 #. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Entry is already reconciled"
@@ -9632,7 +9767,7 @@ msgid "Range"
 msgstr "Range"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece !\n"
@@ -9738,6 +9873,12 @@ msgid ""
 "may keep several types of specialized journals such as a cash journal, "
 "purchase journal, sales journal..."
 msgstr ""
+"Tạo và quản lý tạp chí của công ty bạn từ trình đơn này. Một tạp chí được sử "
+"dụng để ghi lại các giao dịch của tất cả các số liệu kế toán liên quan đến "
+"việc kinh doanh hằng ngày của công ty của bạn sử dụng hệ thống sổ sách kế "
+"toán kép. Tuỳ theo tính chất của các hoạt động của nó và số lượng giao dịch "
+"hàng ngày, một công ty có thể giữ một số loại tạp chí chuyên ngành như một "
+"tạp chí tiền mặt, tạp chí mua, tạp chí bán hàng ..."
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
@@ -9767,7 +9908,7 @@ msgid "Accounts Mapping"
 msgstr "Accounts Mapping"
 
 #. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Hóa đơn '%s' đang chờ kiểm tra."
@@ -9792,7 +9933,7 @@ msgid "The income or expense account related to the selected product."
 msgstr "The income or expense account related to the selected product."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
 msgstr "The date of your Journal Entry is not in the defined period!"
@@ -9912,6 +10053,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the analytic "
 "journal without removing it."
 msgstr ""
+"Nếu lĩnh vực hoạt động được thiết lập để sai, nó sẽ cho phép bạn ẩn các tạp "
+"chí phân tích mà không cần loại bỏ nó."
 
 #. module: account
 #: field:account.analytic.line,ref:0
@@ -9997,7 +10140,7 @@ msgid "You must enter a period length that cannot be 0 or below !"
 msgstr "You must enter a period length that cannot be 0 or below !"
 
 #. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
 msgstr "You cannot remove an account which has account entries!. "
@@ -10013,6 +10156,13 @@ msgid ""
 "certain amount of information. They have to be certified by an external "
 "auditor annually."
 msgstr ""
+"Tạo và quản lý các tài khoản mà bạn cần để ghi lại các mục nhật ký. Một tài "
+"khoản là một phần của một sổ cái cho phép các công ty của bạn để đăng ký tất "
+"cả các loại giao dịch thẻ ghi nợ và tín dụng. Các công ty hiện nay các tài "
+"khoản hàng năm của họ trong hai phần chính: bảng cân đối và báo cáo thu nhập "
+"(lợi nhuận và tài khoản thua lỗ). Các tài khoản hàng năm của một công ty "
+"luật pháp yêu cầu tiết lộ một số tiền nhất định của thông tin. Họ phải có "
+"xác nhận của kiểm toán viên bên ngoài hàng năm."
 
 #. module: account
 #: help:account.move.line,amount_residual_currency:0
@@ -10020,6 +10170,8 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+"Số tiền còn dư trên phải thu hoặc phải trả của một mục tạp chí thể hiện bằng "
+"đồng tiền của mình (có thể khác nhau của các loại tiền tệ của công ty)."
 
 #~ msgid "Asset"
 #~ msgstr "Tài sản"
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 19544fb613b..a76da12910a 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.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: 2011-02-03 07:35+0000\n"
+"PO-Revision-Date: 2011-07-02 15:26+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@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-04-29 05:14+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-03 04:46+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -33,7 +33,7 @@ msgid "No End of year journal defined for the fiscal year"
 msgstr "此财务年度没有定义年终日记账"
 
 #. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
@@ -65,7 +65,7 @@ msgid "Residual"
 msgstr "剩余的"
 
 #. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
 #, python-format
 msgid "Please define sequence on invoice journal"
 msgstr "请为发票日记账对应序列"
@@ -110,7 +110,7 @@ msgstr "从发票或支付凭证导入"
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr "wizard.multi.charts.accounts"
+msgstr "多科目图表向导"
 
 #. module: account
 #: view:account.move:0
@@ -122,7 +122,7 @@ msgstr "借方合计"
 msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disabled"
-msgstr ""
+msgstr "如果您用非关联交易，您还必须验证所有链接到这些交易行动，因为他们不会被禁用"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -130,7 +130,7 @@ msgid "Accounting Entries-"
 msgstr "会计分录"
 
 #. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
 msgstr "不能删除已登账的凭证行：\"%s\"！"
@@ -171,10 +171,10 @@ msgstr "选择会计年度 "
 msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
-msgstr ""
+msgstr "如果设置为false，该付款条款将会被隐藏。"
 
 #. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
 #, python-format
 msgid "Warning!"
 msgstr "警告！"
@@ -212,7 +212,7 @@ msgid ""
 "Gives the type of the analytic journal. When it needs for a document (eg: an "
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
-msgstr ""
+msgstr "给出了分析报表类型。当一个文件（如：发票），需要创建解析条目，OpenERP将寻找一个相同类型的匹配杂志。"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -223,10 +223,10 @@ msgstr "税模板"
 #. module: account
 #: model:ir.model,name:account.model_account_tax
 msgid "account.tax"
-msgstr "科目.税"
+msgstr "税科目"
 
 #. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -238,7 +238,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr ""
+msgstr "选择核销行"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -256,15 +256,15 @@ msgid ""
 msgstr "勾选此项使发票上不显示增值税"
 
 #. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
-msgstr ""
+msgstr "发票'%s'已部分支付了%s%s ，总金额为：%s%s, 尚余%s%s未付"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
-msgstr ""
+msgstr "会计分录必须借贷相等"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@@ -272,7 +272,7 @@ msgid "Belgian Reports"
 msgstr "比利时报表"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "不能添加/修改已结帐的凭证"
@@ -280,7 +280,7 @@ msgstr "不能添加/修改已结帐的凭证"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Calculated Balance"
-msgstr ""
+msgstr "计算余额"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -310,7 +310,7 @@ msgid "St."
 msgstr "结单编码"
 
 #. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "发票明细的科目公司与发票头的公司不匹配。"
@@ -325,7 +325,7 @@ msgstr "字段名"
 msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
-msgstr ""
+msgstr "安装本地化财务系统以尽可能的适应本国的财务要求"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:63
@@ -335,12 +335,12 @@ msgid ""
 "\n"
 "You can create one in the menu: \n"
 "Configuration/Financial Accounting/Accounts/Journals."
-msgstr ""
+msgstr "无法找到针对该公司%s类型的分类账簿"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr ""
+msgstr "科目反核销"
 
 #. module: account
 #: view:product.product:0
@@ -352,7 +352,7 @@ msgstr "采购属性"
 #: view:account.installer:0
 #: view:account.installer.modules:0
 msgid "Configure"
-msgstr ""
+msgstr "设置"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -370,11 +370,12 @@ msgid ""
 "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 "Cash Registers, or Customer/Supplier payments."
 msgstr ""
+"本界面供财务人员在OpenERP中批量录入凭证之用。如果你在OpenERP使用银行对帐单，收银机，或者客户/供应商付款, 相应的分录会由系统自动产生。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "account.tax.template"
-msgstr ""
+msgstr "account.tax.template"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
@@ -390,7 +391,7 @@ msgstr "建立日期"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr ""
+msgstr "采购退款"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -412,7 +413,7 @@ msgstr "打开会计年度"
 msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
-msgstr ""
+msgstr "该字段包含该分类账簿记录数量的信息"
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
@@ -462,6 +463,7 @@ msgid ""
 "amount of each area of the tax declaration for your country. It’s presented "
 "in a hierarchical structure, which can be modified to fit your needs."
 msgstr ""
+"税务表是一个树状视图，反映了税务结构，并显示当前的纳税情况。税务表反映了国家规定的不同纳税领域的纳税申报数量情况。其设置为一个层次结构，请根据需要修改。"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -500,17 +502,17 @@ msgstr "业务类型"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
 msgid "Confirm the selected invoices"
-msgstr ""
+msgstr "确认选定的发票"
 
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
 msgid "Parent target"
-msgstr ""
+msgstr "上级目标"
 
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr ""
+msgstr "这个分类账簿上的科目"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -529,7 +531,7 @@ msgstr ""
 #: help:account.report.general.ledger,chart_account_id:0
 #: help:account.vat.declaration,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr ""
+msgstr "选择科目表"
 
 #. module: account
 #: view:product.product:0
@@ -539,7 +541,7 @@ msgstr "进项税"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr ""
+msgstr "发票退款"
 
 #. module: account
 #: report:account.overdue:0
@@ -552,10 +554,10 @@ msgid "Not reconciled transactions"
 msgstr "没核销的交易"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
-msgstr ""
+msgstr "出纳帐与现金不一致"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -589,12 +591,12 @@ msgstr "所有"
 #. module: account
 #: field:account.invoice.report,address_invoice_id:0
 msgid "Invoice Address Name"
-msgstr ""
+msgstr "发票地址"
 
 #. module: account
 #: selection:account.installer,period:0
 msgid "3 Monthly"
-msgstr ""
+msgstr "3个月"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
@@ -606,7 +608,7 @@ msgstr "如果执行反核销, 你必须检验链接该处理的所有操作. 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "   30 Days   "
-msgstr ""
+msgstr "   30 天   "
 
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
@@ -626,7 +628,7 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
-msgstr ""
+msgstr "序列号必须唯一"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -634,7 +636,7 @@ msgid "Tax Code Amount"
 msgstr "税事务金额"
 
 #. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -654,7 +656,7 @@ msgstr "关闭会计期间"
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr ""
+msgstr "普通合伙人的科目报表"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
@@ -664,11 +666,11 @@ msgstr "会计期间的启用凭证"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal Period"
-msgstr ""
+msgstr "明细帐期间"
 
 #. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -688,7 +690,7 @@ msgstr "应收款科目"
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr ""
+msgstr "总账报表"
 
 #. module: account
 #: view:account.invoice:0
@@ -708,7 +710,7 @@ msgstr ""
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
 msgid "Partners Reconciled Today"
-msgstr ""
+msgstr "今天合作伙伴不开心"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -726,13 +728,13 @@ msgstr "表"
 #: model:ir.model,name:account.model_project_account_analytic_line
 #, python-format
 msgid "Analytic Entries by line"
-msgstr ""
+msgstr "按行显示分析科目数据"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
-msgstr ""
+msgstr "您只能更改发票草案金额！"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -769,17 +771,17 @@ msgstr "反核销"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_Journal_report
 msgid "Account Analytic Journal"
-msgstr ""
+msgstr "科目分析报表"
 
 #. module: account
 #: model:ir.model,name:account.model_account_automatic_reconcile
 msgid "Automatic Reconcile"
-msgstr ""
+msgstr "自己核销"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Due date Computation"
-msgstr ""
+msgstr "计算截止日期"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -793,7 +795,7 @@ msgstr "成本业务类型/凭证名称"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -804,7 +806,7 @@ msgstr "天"
 #: help:account.account.template,nocreate:0
 msgid ""
 "If checked, the new chart of accounts will not contain this by default."
-msgstr ""
+msgstr "如果选中，这一点的新报表科目将不包含在默认情况下。"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:102
@@ -812,7 +814,7 @@ msgstr ""
 msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
-msgstr ""
+msgstr "无法%s该发票，该发票已核销，除非先将其反核销。目前只能对该发票做退款处理"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -827,10 +829,10 @@ msgstr "计算"
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner to reconcile"
-msgstr ""
+msgstr "与下一个合作伙伴对帐"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry ! Please note that you "
@@ -841,7 +843,7 @@ msgstr "您不能修改已确认的凭证！您只能修改一些非重要字段
 #: view:account.invoice.report:0
 #: field:account.invoice.report,delay_to_pay:0
 msgid "Avg. Delay To Pay"
-msgstr ""
+msgstr "延迟付款平均时间"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_chart
@@ -864,7 +866,7 @@ msgstr "到期"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total_tax:0
 msgid "Total With Tax"
-msgstr ""
+msgstr "总税单（纳税合计）"
 
 #. module: account
 #: view:account.invoice:0
@@ -872,7 +874,7 @@ msgstr ""
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Approve"
-msgstr ""
+msgstr "核准"
 
 #. module: account
 #: view:account.invoice:0
@@ -894,22 +896,22 @@ msgstr "合并"
 #: view:account.invoice.report:0
 #: view:account.move.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "增加筛选条件"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr ""
+msgstr "合并报表"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr ""
+msgstr "销售退款(货)"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Bank statement"
-msgstr ""
+msgstr "银行对帐单"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
@@ -927,7 +929,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "Purchases"
-msgstr ""
+msgstr "采购单列表"
 
 #. module: account
 #: field:account.model,lines_id:0
@@ -952,11 +954,11 @@ msgid "Code"
 msgstr "代码"
 
 #. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
@@ -974,13 +976,13 @@ msgstr "业务伙伴余额"
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
 msgid "Account Name."
-msgstr ""
+msgstr "科目名称"
 
 #. module: account
 #: field:account.chart.template,property_reserve_and_surplus_account:0
 #: field:res.company,property_reserve_and_surplus_account:0
 msgid "Reserve and Profit/Loss Account"
-msgstr ""
+msgstr "所有者权益类科目"
 
 #. module: account
 #: field:report.account.receivable,name:0
@@ -997,12 +999,12 @@ msgstr "横向模式"
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
-msgstr ""
+msgstr "客户发票审核"
 
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
 msgid "Select a Fiscal year to close"
-msgstr ""
+msgstr "关闭一个财政年度"
 
 #. module: account
 #: help:account.account,user_type:0
@@ -1010,12 +1012,12 @@ msgstr ""
 msgid ""
 "These types are defined according to your country. The type contains more "
 "information about the account and its specificities."
-msgstr ""
+msgstr "根据你的国家定义这些类型,该类型包含有关科目及其具体的信息。"
 
 #. module: account
 #: view:account.tax:0
 msgid "Applicability Options"
-msgstr ""
+msgstr "可选项"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1026,16 +1028,15 @@ msgstr "争议中"
 #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
 #: model:ir.ui.menu,name:account.journal_cash_move_lines
 msgid "Cash Registers"
-msgstr ""
+msgstr "出纳现金"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Profit & Loss (Expense Accounts)"
-msgstr ""
+msgstr "损益表"
 
 #. module: account
 #: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "-"
@@ -1044,7 +1045,7 @@ msgstr "-"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Manager"
-msgstr ""
+msgstr "经理"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -1054,7 +1055,7 @@ msgstr ""
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Bank"
-msgstr ""
+msgstr "银行"
 
 #. module: account
 #: field:account.period,date_start:0
@@ -1064,7 +1065,7 @@ msgstr "开始会计期间"
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
-msgstr ""
+msgstr "确认报表"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1085,11 +1086,12 @@ msgid ""
 "purchase orders or receipts. This way, you can control the invoice from your "
 "supplier according to what you purchased or received."
 msgstr ""
+"供应商发票，您可以输入和管理你的供应商发出的发票。 OpenERP还可以自动生成草案从采购订单发票或收据。这样，您就可以控制从供应商的发票."
 
 #. module: account
 #: view:account.invoice.cancel:0
 msgid "Cancel Invoices"
-msgstr ""
+msgstr "作废发票"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
@@ -1121,6 +1123,7 @@ msgstr "# 处理"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -1128,7 +1131,7 @@ msgid "Entry Label"
 msgstr "凭证标签"
 
 #. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "您不能修改/删除这业务类型和在此会计期间的凭证！"
@@ -1175,19 +1178,19 @@ msgstr "科目"
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Included in base amount"
-msgstr ""
+msgstr "含基数"
 
 #. module: account
 #: view:account.entries.report:0
 #: model:ir.actions.act_window,name:account.action_account_entries_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
 msgid "Entries Analysis"
-msgstr ""
+msgstr "项目分析"
 
 #. module: account
 #: field:account.account,level:0
 msgid "Level"
-msgstr ""
+msgstr "级别"
 
 #. module: account
 #: report:account.invoice:0
@@ -1208,7 +1211,7 @@ msgstr "税"
 #: code:addons/account/wizard/account_report_common.py:120
 #, python-format
 msgid "Select a starting and an ending period"
-msgstr ""
+msgstr "选择一个开始和结束时间"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1218,12 +1221,12 @@ msgstr "科目模板"
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr ""
+msgstr "搜索税模板"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Your Reference"
-msgstr ""
+msgstr "你的关联单号"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -1242,12 +1245,12 @@ msgstr "逾期付款"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Initial Balance"
-msgstr ""
+msgstr "期初余额"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "重置为草稿"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -1263,13 +1266,12 @@ msgstr "报表选项"
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr ""
+msgstr "日记帐明细分析"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
-msgstr ""
+msgstr "业务伙伴列表"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1296,7 +1298,7 @@ msgid "Central Journal"
 msgstr "主要的业务类型"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
 #, python-format
 msgid "You can not use this general account in this journal !"
 msgstr "在这业务类型您不能用这科目！"
@@ -1314,7 +1316,7 @@ msgstr "余额不为0"
 #. module: account
 #: view:account.tax:0
 msgid "Search Taxes"
-msgstr ""
+msgstr "察找税种"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
@@ -1329,7 +1331,7 @@ msgstr "创建凭证"
 #. module: account
 #: field:account.entries.report,nbr:0
 msgid "# of Items"
-msgstr ""
+msgstr "项目"
 
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
@@ -1349,13 +1351,13 @@ msgstr "数字 #"
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Manual Entries"
-msgstr ""
+msgstr "如果是手工分录的话就跳过“草稿”状态"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "不含税总金额"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -1369,12 +1371,12 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
-msgstr ""
+msgstr "号分录 "
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
 msgid "A Temporary table used for Dashboard view"
-msgstr ""
+msgstr "用于仪表盘视图的临时表"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
@@ -1386,10 +1388,10 @@ msgstr "供应商红字发票"
 #: view:account.payment.term.line:0
 msgid ""
 "Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
-msgstr ""
+msgstr "例如：在14天内付款减百分之2，30天则没有减。"
 
 #. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
 #, python-format
 msgid ""
 "Cannot create the invoice !\n"
@@ -1400,7 +1402,7 @@ msgstr ""
 #. module: account
 #: field:account.installer.modules,account_anglo_saxon:0
 msgid "Anglo-Saxon Accounting"
-msgstr ""
+msgstr "英国会计系统"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1416,7 +1418,7 @@ msgstr "已关闭"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurring Entries"
-msgstr ""
+msgstr "经常性项目"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
@@ -1426,7 +1428,7 @@ msgstr "财务结构模板"
 #. module: account
 #: model:account.tax.code,name:account.account_tax_code_0
 msgid "Tax Code Test"
-msgstr ""
+msgstr "测试税代码"
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
@@ -1462,18 +1464,18 @@ msgstr "未完税"
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to next partner"
-msgstr ""
+msgstr "下一个合作伙伴"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
-msgstr ""
+msgstr "查阅银行对帐单"
 
 #. module: account
 #: sql_constraint:account.model.line:0
 msgid ""
 "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
-msgstr ""
+msgstr "错误的现金或银行模型（信用+借方必须大于“0”）！"
 
 #. module: account
 #: view:account.chart.template:0
@@ -1502,12 +1504,12 @@ msgid ""
 "and the closing balance is to be found on your statement. When you are in "
 "the Payment column of a line, you can press F1 to open the reconciliation "
 "form."
-msgstr ""
+msgstr "银行对帐单是在一个给定的时间上的存款帐户发生的明细。当是你的一个网上交易清单，你可以按F1打开核销的形式。"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+msgstr "日期/代码"
 
 #. module: account
 #: field:account.analytic.line,general_account_id:0
@@ -1535,7 +1537,7 @@ msgstr "发票"
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to invoice"
-msgstr ""
+msgstr "开票成本分析"
 
 #. module: account
 #: view:ir.sequence:0
@@ -1548,10 +1550,9 @@ msgid "Separated Journal Sequences"
 msgstr "分散的业务类型序列"
 
 #. module: account
-#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
-msgstr ""
+msgstr "负责人"
 
 #. module: account
 #: report:account.overdue:0
@@ -1561,14 +1562,14 @@ msgstr "小计 :"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
 msgid "Sales by Account Type"
-msgstr ""
+msgstr "销售科目类型"
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
-msgstr ""
+msgstr "作废发票，退货发票，核销当前发票"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -1594,12 +1595,12 @@ msgstr "年合计"
 #. module: account
 #: model:ir.actions.report.xml,name:account.report_account_voucher_new
 msgid "Print Voucher"
-msgstr ""
+msgstr "打印原始凭证"
 
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr ""
+msgstr "该向导将改变发票的币种"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@@ -1612,10 +1613,10 @@ msgstr ""
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! You cannot define overlapping fiscal years"
-msgstr ""
+msgstr "错误！你不能重复定义会计年度"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
 #, python-format
 msgid "The account is not defined to be reconciled !"
 msgstr "科目未设定为可核销！"
@@ -1623,14 +1624,14 @@ msgstr "科目未设定为可核销！"
 #. module: account
 #: field:account.cashbox.line,pieces:0
 msgid "Values"
-msgstr ""
+msgstr "值"
 
 #. module: account
 #: help:account.journal.period,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
-msgstr ""
+msgstr "如果此字段设置为False，你可以让他隐藏而不删除它的报表。"
 
 #. module: account
 #: view:res.partner:0
@@ -1648,7 +1649,7 @@ msgid "Receivables & Payables"
 msgstr "应收&应付"
 
 #. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
 #, python-format
 msgid "You have to provide an account for the write off entry !"
 msgstr "必须为差异凭证指定默认借贷方科目"
@@ -1656,17 +1657,17 @@ msgstr "必须为差异凭证指定默认借贷方科目"
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
 msgid "Account Common Journal Report"
-msgstr ""
+msgstr "科目常用报表"
 
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr ""
+msgstr "所有合作伙伴"
 
 #. module: account
 #: report:account.move.voucher:0
 msgid "Ref. :"
-msgstr ""
+msgstr "关联单号:"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -1676,7 +1677,7 @@ msgstr "辅助核算项目一览表"
 #. module: account
 #: view:account.analytic.line:0
 msgid "My Entries"
-msgstr ""
+msgstr "我的工作区"
 
 #. module: account
 #: report:account.overdue:0
@@ -1684,7 +1685,7 @@ msgid "Customer Ref:"
 msgstr "客户关联:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -1702,10 +1703,10 @@ msgstr "银行单据草稿"
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Credit Notes"
-msgstr ""
+msgstr "纳税申报：欠款"
 
 #. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr "你不能停用这科目因为它有凭证"
@@ -1718,10 +1719,10 @@ msgstr "贷方金额"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "您不能在关闭的科目上建立分录。"
 
 #. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
@@ -1731,65 +1732,65 @@ msgstr "你不能改变包含\"已关闭\"科目类型的凭证!"
 #. module: account
 #: view:res.company:0
 msgid "Reserve And Profit/Loss Account"
-msgstr ""
+msgstr "损益类科目"
 
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "错误的出纳会计分录"
 
 #. module: account
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
 msgid "Invoices Analysis"
-msgstr ""
+msgstr "开票分析"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
-msgstr ""
+msgstr "关闭一个会计期间"
 
 #. module: account
 #: view:account.installer:0
 msgid "Configure Fiscal Year"
-msgstr ""
+msgstr "配置会计年度"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
 msgid "Entries By Line"
-msgstr ""
+msgstr "进行中的项目"
 
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "A/c Code"
-msgstr ""
+msgstr "A/c编码"
 
 #. module: account
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "分类账"
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Invoices"
-msgstr ""
+msgstr "纳税申报：发票"
 
 #. module: account
 #: field:account.cashbox.line,subtotal:0
 msgid "Sub Total"
-msgstr ""
+msgstr "小计"
 
 #. module: account
 #: view:account.account:0
 msgid "Treasury Analysis"
-msgstr ""
+msgstr "出纳报表"
 
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "错误！您不能创建循环的公司。"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1812,12 +1813,12 @@ msgstr "生效"
 #: model:ir.actions.act_window,name:account.action_account_print_journal
 #: model:ir.model,name:account.model_account_print_journal
 msgid "Account Print Journal"
-msgstr ""
+msgstr "打印科目明细帐"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "产品类别"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -1827,18 +1828,18 @@ msgstr "/"
 #. module: account
 #: field:account.bs.report,reserve_account_id:0
 msgid "Reserve & Profit/Loss Account"
-msgstr ""
+msgstr "损益类科目"
 
 #. module: account
 #: help:account.bank.statement,balance_end:0
 msgid "Closing balance based on Starting Balance and Cash Transactions"
-msgstr ""
+msgstr "关闭现金交易，出纳对帐"
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Comparison between accounting and payment entries"
-msgstr ""
+msgstr "比较会计和支付项目"
 
 #. module: account
 #: view:account.tax:0
@@ -1859,7 +1860,7 @@ msgstr "勾选此项, 如果你想每个新建的业务类型使用不同的序
 msgid ""
 "It adds the currency column if the currency is different then the company "
 "currency"
-msgstr ""
+msgstr "此选项增加一个辅助核算币种，他会自动转为记帐本位币。"
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -1871,19 +1872,19 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_pl_report
 msgid "Account Profit And Loss"
-msgstr ""
+msgstr "帐户盈亏"
 
 #. module: account
 #: field:account.installer,config_logo:0
 #: field:account.installer.modules,config_logo:0
 #: field:wizard.multi.charts.accounts,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "图像"
 
 #. module: account
 #: report:account.move.voucher:0
 msgid "Canceled"
-msgstr ""
+msgstr "已作废"
 
 #. module: account
 #: view:account.invoice:0
@@ -1896,7 +1897,7 @@ msgstr "未完税金额"
 msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
-msgstr ""
+msgstr "如果此字段设置为False，你可以让他隐藏而不删除它的税表。"
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -1932,7 +1933,7 @@ msgstr "打开凭证"
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
 msgid "Accounts to Reconcile"
-msgstr ""
+msgstr "科目核销"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
@@ -1942,7 +1943,7 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
 msgid "Import from invoice"
-msgstr ""
+msgstr "进口发票"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -1951,7 +1952,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "January"
-msgstr ""
+msgstr "一月"
 
 #. module: account
 #: view:account.journal:0
@@ -1961,12 +1962,12 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "This F.Year"
-msgstr ""
+msgstr "本财年"
 
 #. module: account
 #: view:account.tax.chart:0
 msgid "Account tax charts"
-msgstr ""
+msgstr "纳税明细表"
 
 #. module: account
 #: constraint:account.period:0
@@ -1987,10 +1988,10 @@ msgstr "形式发票"
 #: code:addons/account/installer.py:348
 #, python-format
 msgid " Journal"
-msgstr ""
+msgstr " 日记帐"
 
 #. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2012,7 +2013,7 @@ msgstr ""
 #. module: account
 #: view:account.chart.template:0
 msgid "Search Chart of Account Templates"
-msgstr ""
+msgstr "搜索图表科目模板"
 
 #. module: account
 #: view:account.installer:0
@@ -2042,7 +2043,7 @@ msgid "Description"
 msgstr "说明"
 
 #. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
@@ -2062,7 +2063,7 @@ msgid "Income Account"
 msgstr "收入科目"
 
 #. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "没定义销售/采购业务类型!"
@@ -2073,6 +2074,7 @@ msgid "Accounting Properties"
 msgstr "会计属性"
 
 #. module: account
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted By"
@@ -2081,17 +2083,17 @@ msgstr "凭证排序按"
 #. module: account
 #: field:account.change.currency,currency_id:0
 msgid "Change to"
-msgstr ""
+msgstr "更改为"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Products Qty "
-msgstr ""
+msgstr "产品数量 "
 
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "产品模板"
 
 #. module: account
 #: report:account.account.balance:0
@@ -2101,6 +2103,7 @@ msgstr ""
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2189,7 +2192,7 @@ msgstr "待处理"
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Draft state of an invoice"
-msgstr ""
+msgstr "草稿状态的发票"
 
 #. module: account
 #: help:account.account,reconcile:0
@@ -2200,7 +2203,7 @@ msgstr "勾选, 如果用户可以在这科目核销凭证."
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
-msgstr ""
+msgstr "往来业务核销"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
@@ -2209,7 +2212,7 @@ msgid "Account Tax Code"
 msgstr "税事务科目"
 
 #. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2227,7 +2230,7 @@ msgstr "基础税事务代码"
 #. module: account
 #: help:account.invoice.tax,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice tax."
-msgstr ""
+msgstr "按顺序显示发票税列表."
 
 #. module: account
 #: field:account.tax,base_sign:0
@@ -2257,7 +2260,7 @@ msgstr "借方汇总"
 #: view:account.invoice.confirm:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_confirm
 msgid "Confirm Draft Invoices"
-msgstr ""
+msgstr "草案确认发票"
 
 #. module: account
 #: field:account.entries.report,day:0
@@ -2266,12 +2269,12 @@ msgstr ""
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "日"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
 msgid "Accounts to Renew"
-msgstr ""
+msgstr "延续科目有效期"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
@@ -2279,11 +2282,11 @@ msgid "Account Model Entries"
 msgstr "凭证模板"
 
 #. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
-msgstr ""
+msgstr "EXJ"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
@@ -2310,7 +2313,7 @@ msgstr "选择会计期间"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
 msgid "Statements"
-msgstr ""
+msgstr "描述"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -2322,18 +2325,18 @@ msgstr "凭证名称"
 msgid ""
 "The fiscal position will determine taxes and the accounts used for the "
 "partner."
-msgstr ""
+msgstr "会计制度决定税的科目."
 
 #. module: account
 #: view:account.print.journal:0
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
-msgstr ""
+msgstr "这份报告是给你一个特定财务情况概述"
 
 #. module: account
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "错误!你不能创建递归的类型."
 
 #. module: account
 #: report:account.invoice:0
@@ -2362,10 +2365,10 @@ msgstr "辅助核算项目"
 #: model:ir.ui.menu,name:account.menu_action_account_form
 #: model:ir.ui.menu,name:account.menu_analytic
 msgid "Accounts"
-msgstr ""
+msgstr "科目"
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
 #, python-format
 msgid "Configuration Error!"
 msgstr "设置错误!"
@@ -2374,16 +2377,15 @@ msgstr "设置错误!"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "平均价格"
 
 #. module: account
-#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
 msgstr "日期:"
 
 #. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
 #, python-format
 msgid ""
 "You cannot modify company of this journal as its related record exist in "
@@ -2393,12 +2395,12 @@ msgstr ""
 #. module: account
 #: report:account.journal.period.print:0
 msgid "Label"
-msgstr ""
+msgstr "标签"
 
 #. module: account
 #: view:account.tax:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "会计信息"
 
 #. module: account
 #: view:account.tax:0
@@ -2419,6 +2421,7 @@ msgstr "折扣(%)"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.overdue:0
 #: report:account.third_party_ledger:0
@@ -2429,12 +2432,12 @@ msgstr "关联单号"
 #. module: account
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or a tax code account."
-msgstr ""
+msgstr "该科目可以是一个基本的税法或税法帐户。（如营业税）"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
-msgstr ""
+msgstr "自动核销"
 
 #. module: account
 #: field:account.invoice,reconciled:0
@@ -2452,7 +2455,7 @@ msgstr "退税事务代码"
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Bank Statements"
-msgstr ""
+msgstr "银行对帐单"
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -2465,7 +2468,7 @@ msgstr "真"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Dates"
-msgstr ""
+msgstr "日期"
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -2478,7 +2481,7 @@ msgstr "上级税科目"
 msgid ""
 "Automatically generate entries based on what has been entered in the  system "
 "before a specific date."
-msgstr ""
+msgstr "自动生成以这之前的预约项目."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -2491,7 +2494,7 @@ msgstr "账龄分析表"
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries"
-msgstr ""
+msgstr "会计分录"
 
 #. module: account
 #: field:account.invoice.line,discount:0
@@ -2512,31 +2515,31 @@ msgstr ""
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
 msgid "New Company Financial Setting"
-msgstr ""
+msgstr "新公司财务设置"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
 #: view:report.account.sales:0
 #: view:report.account_type.sales:0
 msgid "Sales by Account"
-msgstr ""
+msgstr "销售科目"
 
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
-msgstr ""
+msgstr "该向导将创建经常性的会计分录"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
 #, python-format
 msgid "No sequence defined on the journal !"
-msgstr ""
+msgstr "在日记帐中没有定义的序列！"
 
 #. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2569,7 +2572,7 @@ msgstr "会计期间到"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:306
@@ -2601,7 +2604,7 @@ msgstr "关联单号数"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: account
 #: help:account.move.line,quantity:0
@@ -2613,7 +2616,7 @@ msgstr ""
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 2:"
-msgstr ""
+msgstr "第2行"
 
 #. module: account
 #: field:account.journal.column,required:0
@@ -2646,7 +2649,7 @@ msgstr "基础税事务代码的金额"
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
-msgstr ""
+msgstr "默认销项税"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -2654,7 +2657,7 @@ msgid ""
 "The maturity date of the generated entries for this model. You can choose "
 "between the creation date or the creation date of the entries plus the "
 "partner payment terms."
-msgstr ""
+msgstr "您可以选择开始日期且加上该项止合作伙伴的付款条件,由此模型生成的项目的到期日."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
@@ -2665,7 +2668,7 @@ msgstr "财务会计"
 #: view:account.pl.report:0
 #: model:ir.ui.menu,name:account.menu_account_pl_report
 msgid "Profit And Loss"
-msgstr ""
+msgstr "盈利或亏损"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -2696,7 +2699,7 @@ msgid "Analytic Entries"
 msgstr "辅助核算凭证"
 
 #. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
@@ -2728,12 +2731,12 @@ msgstr "这用户负责这业务类型"
 #. module: account
 #: view:account.period:0
 msgid "Search Period"
-msgstr ""
+msgstr "搜寻时期"
 
 #. module: account
 #: view:account.change.currency:0
 msgid "Invoice Currency"
-msgstr ""
+msgstr "货币种类"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -2743,7 +2746,7 @@ msgstr "条款"
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Cash Transaction"
-msgstr ""
+msgstr "现金交易"
 
 #. module: account
 #: view:res.partner:0
@@ -2779,7 +2782,7 @@ msgstr "条款名称"
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Search Fiscalyear"
-msgstr ""
+msgstr "搜索会计年度"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
@@ -2789,7 +2792,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total Quantity"
-msgstr ""
+msgstr "合计数量"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
@@ -2822,11 +2825,11 @@ msgid "BNK%s"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2906
+#: code:addons/account/account.py:2950
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
-msgstr ""
+msgstr "银行"
 
 #. module: account
 #: field:account.move.line,analytic_lines:0
@@ -2851,17 +2854,17 @@ msgstr "税事务模板"
 #. module: account
 #: view:account.subscription:0
 msgid "Starts on"
-msgstr ""
+msgstr "开始"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
 msgid "Account Partner Ledger"
-msgstr ""
+msgstr "合作伙伴会计帐本(往来帐)"
 
 #. module: account
 #: help:account.journal.column,sequence:0
 msgid "Gives the sequence order to journal column."
-msgstr ""
+msgstr "给日记帐排序号"
 
 #. module: account
 #: view:account.tax.template:0
@@ -2873,7 +2876,7 @@ msgstr "税说明"
 #: help:account.account.template,currency_id:0
 #: help:account.bank.accounts.wizard,currency_id:0
 msgid "Forces all moves for this account to have this secondary currency."
-msgstr ""
+msgstr "将此科目的所有发生都转移到他的二级科目。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -2896,7 +2899,7 @@ msgstr "从模板产生科目一览表"
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
 msgid "Account Unreconcile Reconcile"
-msgstr ""
+msgstr "科目核销反核销"
 
 #. module: account
 #: help:account.account.type,close_method:0
@@ -2931,6 +2934,7 @@ msgstr "为使用费用科目而留空"
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
 #: view:account.journal.period:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,journal_ids:0
@@ -2952,7 +2956,7 @@ msgstr "业务类型"
 #. module: account
 #: field:account.partner.reconcile.process,to_reconcile:0
 msgid "Remaining Partners"
-msgstr ""
+msgstr "剩下的合作伙伴"
 
 #. module: account
 #: view:account.subscription:0
@@ -2977,7 +2981,7 @@ msgstr "采购"
 #: model:ir.actions.act_window,name:account.action_account_installer
 #: view:wizard.multi.charts.accounts:0
 msgid "Accounting Application Configuration"
-msgstr ""
+msgstr "会计应用程序配置"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -2991,7 +2995,7 @@ msgid "Starting Balance"
 msgstr "开始余额"
 
 #. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
 #, python-format
 msgid "No Partner Defined !"
 msgstr "未定义业务伙伴！"
@@ -3018,12 +3022,12 @@ msgstr "增值税"
 msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
-msgstr ""
+msgstr "如果不是同一公司, 这金额表示相关项的货币"
 
 #. module: account
 #: report:account.move.voucher:0
 msgid "Journal:"
-msgstr ""
+msgstr "账簿："
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3033,7 +3037,6 @@ msgstr ""
 #: view:account.invoice.report:0
 #: selection:account.invoice.report,state:0
 #: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
@@ -3043,7 +3046,7 @@ msgstr "草稿"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
 msgid "Accounting Chart Configuration"
-msgstr ""
+msgstr "会计图表配置"
 
 #. module: account
 #: field:account.tax.code,notprintable:0
@@ -3055,17 +3058,17 @@ msgstr "不打印在发票上"
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,chart_tax_id:0
 msgid "Chart of Tax"
-msgstr ""
+msgstr "税表"
 
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr ""
+msgstr "搜索科目报表"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
 msgid "Pending Invoice"
-msgstr ""
+msgstr "待开票"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -3075,17 +3078,17 @@ msgstr "年"
 #. module: account
 #: report:account.move.voucher:0
 msgid "Authorised Signatory"
-msgstr ""
+msgstr "授权的签字人"
 
 #. module: account
 #: view:validate.account.move.lines:0
 msgid ""
 "All selected journal entries will be validated and posted. It means you "
 "won't be able to modify their accounting fields anymore."
-msgstr ""
+msgstr "所有的凭证和报表将过帐,这意味着你将不能修改之个会计期间了。"
 
 #. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr "无法删除未结或已付款的发票！"
@@ -3118,12 +3121,12 @@ msgstr "税金额"
 #. module: account
 #: view:account.installer:0
 msgid "Your bank and cash accounts"
-msgstr ""
+msgstr "你的科目和现金科目"
 
 #. module: account
 #: view:account.move:0
 msgid "Search Move"
-msgstr ""
+msgstr "移动搜索"
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -3143,10 +3146,10 @@ msgstr "发票草稿"
 msgid ""
 "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state!"
-msgstr ""
+msgstr "选择的发票不能被取消，因为它们已“取消”或“完成”状态了！"
 
 #. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3155,24 +3158,25 @@ msgstr "你不能修改这会计类型从'%s'  到 '%s' 因为它含有凭证"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr ""
+msgstr "对方"
 
 #. module: account
 #: view:account.journal:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "进销存数据"
 
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice State"
-msgstr ""
+msgstr "发票状态"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "产品类别"
 
 #. module: account
 #: view:account.move:0
@@ -3180,18 +3184,18 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.move.line,narration:0
 msgid "Narration"
-msgstr ""
+msgstr "描述"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
 #: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
 msgid "Create Account"
-msgstr ""
+msgstr "创建科目"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_type_sales
 msgid "Report of the Sales by Account Type"
-msgstr ""
+msgstr "销售报表的科目类型"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -3201,7 +3205,7 @@ msgstr "详情"
 #. module: account
 #: field:account.installer,bank_accounts_id:0
 msgid "Your Bank and Cash Accounts"
-msgstr ""
+msgstr "您的银行及现金帐户"
 
 #. module: account
 #: report:account.invoice:0
@@ -3219,7 +3223,7 @@ msgstr "科目表"
 #. module: account
 #: view:account.tax.chart:0
 msgid "(If you do not select period it will take all open periods)"
-msgstr ""
+msgstr "如果你不选择时间，将可以在任何期间看到"
 
 #. module: account
 #: field:account.journal,centralisation:0
@@ -3229,7 +3233,7 @@ msgstr "汇总副本"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
 msgid "Reconcilation Process partner by partner"
-msgstr ""
+msgstr "核销合作进程的合作伙伴"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3257,6 +3261,7 @@ msgstr "如果你不选择会计年度将使用所有开启的会计年度"
 #: field:account.entries.report,date:0
 #: selection:account.general.journal,filter:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice.report,date:0
 #: report:account.journal.period.print:0
 #: view:account.move:0
@@ -3300,7 +3305,7 @@ msgid "Chart of Accounts Template"
 msgstr "科目表模板"
 
 #. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3309,13 +3314,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "部分凭证已核销！"
 
 #. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
 #, python-format
 msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
@@ -3330,7 +3335,7 @@ msgstr "税"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
 msgid "Budgets"
-msgstr ""
+msgstr "预算"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -3349,7 +3354,7 @@ msgstr ""
 #: selection:account.report.general.ledger,filter:0
 #: selection:account.vat.declaration,filter:0
 msgid "No Filters"
-msgstr ""
+msgstr "无过滤器"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -3359,7 +3364,7 @@ msgstr "状况"
 #. module: account
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "历史记录"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -3379,7 +3384,7 @@ msgstr "可用代码(如果类型=代码)"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,product_qty:0
 msgid "Qty"
-msgstr ""
+msgstr "数量"
 
 #. module: account
 #: field:account.invoice.report,address_contact_id:0
@@ -3435,7 +3440,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
 #, python-format
 msgid "Unable to change tax !"
 msgstr "无法更改税目!"
@@ -3446,14 +3451,14 @@ msgid "#Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3491,7 +3496,7 @@ msgstr "名称"
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
 msgid "Account Aged Trial balance Report"
-msgstr ""
+msgstr "账龄试算平衡表"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -3570,7 +3575,7 @@ msgstr ""
 #. module: account
 #: field:account.partner.balance,display_partner:0
 msgid "Display Partners"
-msgstr ""
+msgstr "显示业务伙伴"
 
 #. module: account
 #: view:account.invoice:0
@@ -3747,7 +3752,7 @@ msgid "Acc.Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr "已定义通用税目， 但未在发票行中出现！"
@@ -3806,7 +3811,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -3981,7 +3986,7 @@ msgid "Credit Notes"
 msgstr "退还"
 
 #. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
@@ -4052,11 +4057,11 @@ msgid "Change"
 msgstr "改变"
 
 #. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
 #: code:addons/account/wizard/account_fiscalyear_close.py:78
 #: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4160,7 +4165,7 @@ msgid "You must define an analytic journal of type '%s' !"
 msgstr "您必须定义这辅助核算类型'%s' !"
 
 #. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4225,7 +4230,7 @@ msgid "Invoices"
 msgstr "发票列表"
 
 #. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4337,25 +4342,24 @@ msgid "Third Party (Country)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_report_common.py:120
 #: code:addons/account/wizard/account_report_common.py:126
 #, python-format
@@ -4377,7 +4381,7 @@ msgid "Bank Details"
 msgstr "银行信息"
 
 #. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
 #, python-format
 msgid "Taxes missing !"
 msgstr "缺少税目！"
@@ -4432,7 +4436,7 @@ msgid "Check Date not in the Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4453,7 +4457,7 @@ msgid "Child Tax Accounts"
 msgstr "子税科目"
 
 #. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4483,6 +4487,7 @@ msgstr "辅助核算余额 -"
 #: report:account.general.journal:0
 #: field:account.general.journal,target_move:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.journal,target_move:0
 #: report:account.partner.balance:0
@@ -4565,7 +4570,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "Integrity Error !"
 msgstr "完整性错误！"
@@ -4711,7 +4716,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
@@ -4783,7 +4788,7 @@ msgid ""
 msgstr "在计算前加入的天数, 如日期为01/15, 天数是22, 月天数为-1,则应付日期是02/28。"
 
 #. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
@@ -4811,7 +4816,7 @@ msgid "Start of period"
 msgstr "开始会计期间"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
@@ -4867,12 +4872,12 @@ msgstr "结束会计年度业务类型"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -4949,7 +4954,7 @@ msgid "Sort By"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -5096,7 +5101,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5132,7 +5137,7 @@ msgstr "子科目"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
 #, python-format
 msgid "Write-Off"
 msgstr "补差额"
@@ -5269,7 +5274,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr ""
@@ -5294,14 +5299,14 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "您不能使用一个停用的科目！"
 
 #. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr "不同科目或已核算的凭证！ "
@@ -5336,7 +5341,7 @@ msgstr "7"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
 #, python-format
 msgid "Invalid action !"
 msgstr "无效动作！"
@@ -5547,7 +5552,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
@@ -5813,9 +5818,9 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
 #, python-format
 msgid "Can not find account chart for this company, Please Create account."
 msgstr ""
@@ -5964,8 +5969,8 @@ msgid "Analytic Entries Statistics"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
 #, python-format
 msgid "Entries: "
 msgstr "凭证： "
@@ -5976,7 +5981,7 @@ msgid "Create manual recurring entries in a chosen journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "无法创建公司之间的过帐"
@@ -6014,7 +6019,7 @@ msgid "Total debit"
 msgstr "借方合计"
 
 #. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "凭证\"%s\"无效！"
@@ -6078,30 +6083,31 @@ msgid "  valuation: percent"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
 #: code:addons/account/account_bank_statement.py:292
 #: code:addons/account/account_bank_statement.py:305
 #: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
 #: code:addons/account/wizard/account_invoice_refund.py:100
 #: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6211,7 +6217,7 @@ msgid "Journal Select"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr ""
@@ -6228,9 +6234,11 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.report.general.ledger:0
 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
 #: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
 #: model:ir.ui.menu,name:account.menu_general_ledger
 msgid "General Ledger"
 msgstr "按全部业务类型打印全部凭证"
@@ -6284,7 +6292,7 @@ msgid "Total:"
 msgstr "合计:"
 
 #. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6314,7 +6322,7 @@ msgid "Child Codes"
 msgstr "子代码"
 
 #. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6471,7 +6479,7 @@ msgid "Lines"
 msgstr "明细"
 
 #. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
 #, python-format
 msgid ""
 "Can not find account chart for this company in invoice line account, Please "
@@ -6639,7 +6647,7 @@ msgid ""
 msgstr "这字段只用于如果你开发自己的模块允许开发者在自定义域创建特定的税"
 
 #. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -6743,7 +6751,7 @@ msgid "Sign on Reports"
 msgstr "报表上的符号"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
 #, python-format
 msgid "You can not have two open register for the same journal"
 msgstr ""
@@ -6772,7 +6780,6 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
-#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr "形式发票"
 
@@ -6788,7 +6795,7 @@ msgstr ""
 #: view:account.move.line:0
 #: selection:account.move.line,state:0
 msgid "Unbalanced"
-msgstr ""
+msgstr "不平衡"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -6802,6 +6809,7 @@ msgstr "可选信息"
 
 #. module: account
 #: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -6827,13 +6835,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
 #, python-format
 msgid "Bad account !"
 msgstr "无效科目!"
 
 #. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
@@ -6851,7 +6859,7 @@ msgid "Invoice Tax"
 msgstr "发票税"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
 #, python-format
 msgid "No piece number !"
 msgstr "没会计期间!"
@@ -7085,17 +7093,17 @@ msgid "Fixed"
 msgstr "固定"
 
 #. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
 #: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
 #, python-format
 msgid "Warning !"
 msgstr "警告 !"
@@ -7127,6 +7135,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7157,7 +7166,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "不能注销 %s 草稿/形式/取消的发票"
 
 #. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7206,7 +7215,7 @@ msgid "Deferral Method"
 msgstr "递延方法"
 
 #. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7267,7 +7276,7 @@ msgid "Associated Partner"
 msgstr "相关业务伙伴"
 
 #. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
 #, python-format
 msgid "You must first select a partner !"
 msgstr "你必须首先选择一个业务伙伴!"
@@ -7332,7 +7341,7 @@ msgid "Choose Fiscal Year"
 msgstr "选择会计年度"
 
 #. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
@@ -7367,6 +7376,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,period_id:0
 #: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
 #: field:account.journal.period,period_id:0
@@ -7529,7 +7539,7 @@ msgid "Account Types"
 msgstr "科目类型"
 
 #. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr "你不能在汇总的副本里创建发票凭证"
@@ -7579,6 +7589,7 @@ msgstr "退款(开红字发票)业务类型"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
 msgid "Filter By"
 msgstr ""
@@ -7617,7 +7628,7 @@ msgid "Payment Term Line"
 msgstr "付款条款明细"
 
 #. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
@@ -7784,8 +7795,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
 #, python-format
 msgid "Bad account!"
 msgstr "无效科目！"
@@ -7796,7 +7807,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -7817,6 +7828,7 @@ msgstr "如果它是一个多货币凭证,这金额表示一个可选的其它
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -7989,14 +8001,14 @@ msgid "Period from"
 msgstr "会计期间从"
 
 #. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
 #, python-format
 msgid ""
 "You cannot modify company of this period as its related record exist in "
@@ -8045,7 +8057,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8061,7 +8073,7 @@ msgid "Configure Your Accounting Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
@@ -8099,6 +8111,7 @@ msgstr ""
 #: report:account.central.journal:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
@@ -8108,7 +8121,7 @@ msgid "Start Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
 #, python-format
 msgid "Cannot locate parent code for template account!"
 msgstr ""
@@ -8145,7 +8158,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. "
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
 #, python-format
 msgid ""
 "You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8173,7 +8186,7 @@ msgid "You can not create move line on view account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr ""
@@ -8222,6 +8235,7 @@ msgstr "留空为使用收入科目"
 #: field:account.entries.report,balance:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8240,6 +8254,7 @@ msgstr ""
 
 #. module: account
 #: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
 msgid "Display Account"
 msgstr ""
 
@@ -8354,6 +8369,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
@@ -8361,7 +8377,7 @@ msgid "Move"
 msgstr "凭证"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr "您不能更改此税目，请移除并重新创建凭证！"
@@ -8455,6 +8471,7 @@ msgstr ""
 #: report:account.central.journal:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
@@ -8498,7 +8515,7 @@ msgid "Account Subscription"
 msgstr "周期性凭证科目"
 
 #. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
 #, python-format
 msgid ""
 "Tax base different !\n"
@@ -8527,6 +8544,7 @@ msgstr "周期性凭证"
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,date_start:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -8555,7 +8573,7 @@ msgid "Unreconciled"
 msgstr "反核销"
 
 #. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
 #, python-format
 msgid "Bad total !"
 msgstr "坏的合计!"
@@ -8613,13 +8631,13 @@ msgid "Active"
 msgstr "启用"
 
 #. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
 #, python-format
 msgid "Unknown Error"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry !\n"
@@ -8662,10 +8680,10 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
-#: report:account.move.voucher:0
 #: report:account.partner.balance:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
@@ -8901,7 +8919,6 @@ msgstr "选择会计期间"
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
-#: report:account.move.voucher:0
 msgid "Posted"
 msgstr "已登账"
 
@@ -8920,6 +8937,7 @@ msgstr "已登账"
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,date_stop:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -8973,7 +8991,7 @@ msgid "This is a model for recurring accounting entries"
 msgstr "这是一个循环凭证模型"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9123,8 +9141,8 @@ msgid "End period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9190,10 +9208,10 @@ msgstr "供应商发票"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
-#: report:account.move.voucher:0
 #: report:account.partner.balance:0
 #: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
@@ -9227,7 +9245,7 @@ msgid "Recurring"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "凭证已经核销"
@@ -9248,7 +9266,7 @@ msgid "Range"
 msgstr "范围"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece !\n"
@@ -9327,17 +9345,17 @@ msgstr "如果是一个多货币凭证可选其它货币"
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid ""
 "Import of the statement in the system from a supplier or customer invoice"
-msgstr ""
+msgstr "供应商或客户发票在系统中的入口"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
 msgid "Billing"
-msgstr ""
+msgstr "发票"
 
 #. module: account
 #: view:account.account:0
 msgid "Parent Account"
-msgstr ""
+msgstr "父科目"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_form
@@ -9353,7 +9371,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
 msgid "Account Analytic Chart"
-msgstr ""
+msgstr "科目分析图表"
 
 #. module: account
 #: help:account.invoice,residual:0
@@ -9363,14 +9381,14 @@ msgstr "剩余的欠款"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
 msgid "Statistic Reports"
-msgstr ""
+msgstr "统计报告"
 
 #. module: account
 #: field:account.installer,progress:0
 #: field:account.installer.modules,progress:0
 #: field:wizard.multi.charts.accounts,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "配置进度"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -9378,7 +9396,7 @@ msgid "Accounts Mapping"
 msgstr "科目一览"
 
 #. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -9403,7 +9421,7 @@ msgid "The income or expense account related to the selected product."
 msgstr "和选择的产品相关的收入或费用科目"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
 msgstr ""
@@ -9487,7 +9505,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.tax:0
 msgid "Manual Invoice Taxes"
-msgstr "手动发票税"
+msgstr "上门纳税(非主营业务纳税)"
 
 #. module: account
 #: field:account.account,parent_right:0
@@ -9589,7 +9607,7 @@ msgstr "通常用 1或-1"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Template Account Fiscal Mapping"
-msgstr ""
+msgstr "以这个会计科目为模版制图"
 
 #. module: account
 #: field:account.chart.template,property_account_expense:0
@@ -9599,7 +9617,7 @@ msgstr "产品模板的费用科目"
 #. module: account
 #: field:account.analytic.line,amount_currency:0
 msgid "Amount currency"
-msgstr ""
+msgstr "金额"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:55
@@ -9608,7 +9626,7 @@ msgid "You must enter a period length that cannot be 0 or below !"
 msgstr "您必须输入的期间长度不能为0或以下 !"
 
 #. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
 msgstr "你不能删除这科目因为它已有凭证! "
diff --git a/addons/account/installer.py b/addons/account/installer.py
index b9de39043ee..39c0863b3c1 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -118,7 +118,6 @@ class account_installer(osv.osv_memory):
     def execute(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        super(account_installer, self).execute(cr, uid, ids, context=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')
@@ -226,6 +225,7 @@ class account_installer(osv.osv_memory):
                         fy_obj.create_period(cr, uid, [fiscal_id])
                     elif res['period'] == '3months':
                         fy_obj.create_period3(cr, uid, [fiscal_id])
+        super(account_installer, self).execute(cr, uid, ids, context=context)
 
     def modules_to_install(self, cr, uid, ids, context=None):
         modules = super(account_installer, self).modules_to_install(
@@ -240,8 +240,7 @@ class account_installer(osv.osv_memory):
 account_installer()
 
 class account_installer_modules(osv.osv_memory):
-    _name = 'account.installer.modules'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
     _columns = {
         'account_analytic_plans': fields.boolean('Multiple Analytic Plans',
             help="Allows invoice lines to impact multiple analytic accounts "
@@ -253,18 +252,11 @@ class account_installer_modules(osv.osv_memory):
             help="Helps you generate reminder letters for unpaid invoices, "
                  "including multiple levels of reminding and customized "
                  "per-partner policies."),
-        'account_voucher': fields.boolean('Voucher Management',
-            help="Account Voucher module includes all the basic requirements of "
-                 "Voucher Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "),
         'account_anglo_saxon': fields.boolean('Anglo-Saxon Accounting',
             help="This module will support the Anglo-Saxons accounting methodology by "
                 "changing the accounting logic with stock transactions."),
     }
 
-    _defaults = {
-        'account_voucher': True,
-    }
-
 account_installer_modules()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 77cf968355b..8b1b2a0edda 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -227,21 +227,21 @@ class account_invoice(osv.osv):
         'tax_line': fields.one2many('account.invoice.tax', 'invoice_id', 'Tax Lines', readonly=True, states={'draft':[('readonly',False)]}),
 
         'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True, select=1, ondelete='restrict', help="Link to the automatically generated Journal Items."),
-        'amount_untaxed': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Untaxed',
+        'amount_untaxed': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Untaxed',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
                 'account.invoice.tax': (_get_invoice_tax, None, 20),
                 'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 20),
             },
             multi='all'),
-        'amount_tax': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Tax',
+        'amount_tax': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Tax',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
                 'account.invoice.tax': (_get_invoice_tax, None, 20),
                 'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 20),
             },
             multi='all'),
-        'amount_total': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Total',
+        'amount_total': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Total',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
                 'account.invoice.tax': (_get_invoice_tax, None, 20),
@@ -252,7 +252,7 @@ class account_invoice(osv.osv):
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
         'check_total': fields.float('Total', digits_compute=dp.get_precision('Account'), states={'open':[('readonly',True)],'close':[('readonly',True)]}),
-        'reconciled': fields.function(_reconciled, method=True, string='Paid/Reconciled', type='boolean',
+        'reconciled': fields.function(_reconciled, string='Paid/Reconciled', type='boolean',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 50), # Check if we can remove ?
                 'account.move.line': (_get_invoice_from_line, None, 50),
@@ -260,17 +260,17 @@ class account_invoice(osv.osv):
             }, help="The Journal Entry of the invoice have been totally reconciled with one or several Journal Entries of payment."),
         '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, method=True, type='many2many', relation='account.move.line', string='Entry Lines'),
-        'residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual',
+        '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',
             store={
-                'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 50),
+                'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line','move_id'], 50),
                 'account.invoice.tax': (_get_invoice_tax, None, 50),
                 'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 50),
                 'account.move.line': (_get_invoice_from_line, None, 50),
                 'account.move.reconcile': (_get_invoice_from_reconcile, None, 50),
             },
             help="Remaining amount due."),
-        'payment_ids': fields.function(_compute_lines, method=True, relation='account.move.line', type="many2many", string='Payments'),
+        'payment_ids': fields.function(_compute_lines, relation='account.move.line', type="many2many", string='Payments'),
         'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}),
         'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]})
@@ -1282,7 +1282,7 @@ class account_invoice_line(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
         'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Account')),
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', type="float",
+        'price_subtotal': fields.function(_amount_line, string='Subtotal', type="float",
             digits_compute= dp.get_precision('Account'), store=True),
         'quantity': fields.float('Quantity', required=True),
         'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Account')),
@@ -1505,8 +1505,8 @@ class account_invoice_tax(osv.osv):
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', help="The tax basis of the tax declaration."),
         'tax_amount': fields.float('Tax Code Amount', digits_compute=dp.get_precision('Account')),
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
-        'factor_base': fields.function(_count_factor, method=True, string='Multipication factor for Base code', type='float', multi="all"),
-        'factor_tax': fields.function(_count_factor, method=True, string='Multipication factor Tax code', type='float', multi="all")
+        'factor_base': fields.function(_count_factor, string='Multipication factor for Base code', type='float', multi="all"),
+        'factor_tax': fields.function(_count_factor, string='Multipication factor Tax code', type='float', multi="all")
     }
 
     def base_change(self, cr, uid, ids, base, currency_id=False, company_id=False, date_invoice=False):
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 9e2aafe849a..6ff3879889c 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -142,15 +142,14 @@ class res_partner(osv.osv):
 
     _columns = {
         'credit': fields.function(_credit_debit_get,
-            fnct_search=_credit_search, method=True, string='Total Receivable', multi='dc', help="Total amount this customer owes you."),
-        'debit': fields.function(_credit_debit_get, fnct_search=_debit_search, method=True, string='Total Payable', multi='dc', help="Total amount you have to pay to this supplier."),
+            fnct_search=_credit_search, string='Total Receivable', multi='dc', help="Total amount this customer owes you."),
+        'debit': fields.function(_credit_debit_get, fnct_search=_debit_search, string='Total Payable', multi='dc', help="Total amount you have to pay to this supplier."),
         'debit_limit': fields.float('Payable Limit'),
         'property_account_payable': fields.property(
             'account.account',
             type='many2one',
             relation='account.account',
             string="Account Payable",
-            method=True,
             view_load=True,
             domain="[('type', '=', 'payable')]",
             help="This account will be used instead of the default one as the payable account for the current partner",
@@ -160,7 +159,6 @@ class res_partner(osv.osv):
             type='many2one',
             relation='account.account',
             string="Account Receivable",
-            method=True,
             view_load=True,
             domain="[('type', '=', 'receivable')]",
             help="This account will be used instead of the default one as the receivable account for the current partner",
@@ -170,7 +168,6 @@ class res_partner(osv.osv):
             type='many2one',
             relation='account.fiscal.position',
             string="Fiscal Position",
-            method=True,
             view_load=True,
             help="The fiscal position will determine taxes and the accounts used for the partner.",
         ),
@@ -179,7 +176,6 @@ class res_partner(osv.osv):
             type='many2one',
             relation='account.payment.term',
             string ='Payment Term',
-            method=True,
             view_load=True,
             help="This payment term will be used instead of the default one for the current partner"),
         'ref_companies': fields.one2many('res.company', 'partner_id',
diff --git a/addons/account/product.py b/addons/account/product.py
index b8af27b03e5..9be49b4c56a 100644
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -29,7 +29,6 @@ class product_category(osv.osv):
             type='many2one',
             relation='account.account',
             string="Income Account",
-            method=True,
             view_load=True,
             help="This account will be used for invoices to value sales for the current product category"),
         'property_account_expense_categ': fields.property(
@@ -37,7 +36,6 @@ class product_category(osv.osv):
             type='many2one',
             relation='account.account',
             string="Expense Account",
-            method=True,
             view_load=True,
             help="This account will be used for invoices to value expenses for the current product category"),
     }
@@ -61,7 +59,6 @@ class product_template(osv.osv):
             type='many2one',
             relation='account.account',
             string="Income Account",
-            method=True,
             view_load=True,
             help="This account will be used for invoices instead of the default one to value sales for the current product"),
         'property_account_expense': fields.property(
@@ -69,7 +66,6 @@ class product_template(osv.osv):
             type='many2one',
             relation='account.account',
             string="Expense Account",
-            method=True,
             view_load=True,
             help="This account will be used for invoices instead of the default one to value expenses for the current product"),
     }
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 8fd35a21a89..e1f383f4792 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -17,6 +17,7 @@
                     <field name="user_id" invisible="1"/>
                     <field name="parent_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
+                    <field name="state" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -44,6 +45,7 @@
                         <filter string="Associated Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="State" icon="terp-folder-green" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -88,11 +90,12 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Account Data">
-                            <field name="partner_id" select="1"/>
-                            <field name="currency_id" select="1"/>
+                            <field name="partner_id"/>
+                            <field name="contact_id"/>
+                            <field name="currency_id"/>
                             <newline/>
                             <field name="date_start"/>
-                            <field name="date" select="2"/>
+                            <field name="date"/>
                             <newline/>
                             <field name="quantity_max"/>
                             <field name="user_id"/>
diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py
index d525d3a331b..7c09027f3ca 100644
--- a/addons/account/report/__init__.py
+++ b/addons/account/report/__init__.py
@@ -41,6 +41,7 @@ import account_entries_report
 import account_analytic_entries_report
 import account_balance_sheet
 import account_profit_loss
+import account_treasury_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index 80508ede44b..c3117e60379 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -88,10 +88,10 @@ class account_balance(report_sxw.rml_parse, common_report_header):
                 }
                 self.sum_debit += account_rec['debit']
                 self.sum_credit += account_rec['credit']
-                if disp_acc == 'bal_movement':
+                if disp_acc == 'movement':
                     if not currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) or not currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) or not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']):
                         self.result_acc.append(res)
-                elif disp_acc == 'bal_solde':
+                elif disp_acc == 'not_zero':
                     if not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']):
                         self.result_acc.append(res)
                 else:
diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index 7c9aa13da2e..3d971862bdc 100644
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -233,7 +233,7 @@
         <td>
           <para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
         </td>
-          <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></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_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
           <blockTable colWidths="60.0,60.0" style="Table5">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
             <tr>
diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index 79bcce882ae..b1e51e6fc46 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -137,16 +137,17 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
                         'name': account.name,
                         'level': account.level,
                         'balance':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'] == 'bal_movement':
+                    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'] == 'bal_solde':
+                    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:
@@ -163,10 +164,12 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
             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'],
@@ -176,10 +179,12 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
                 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'],
@@ -188,10 +193,12 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
                         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,
diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml
index 680c7d4bb43..205bfff497b 100644
--- a/addons/account/report/account_balance_sheet.rml
+++ b/addons/account/report/account_balance_sheet.rml
@@ -26,7 +26,6 @@
       <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="Table5">
       <blockAlignment value="LEFT"/>
@@ -115,7 +114,7 @@
     <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_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"/>
@@ -124,6 +123,36 @@
     <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>
@@ -174,7 +203,7 @@
             </tr>
            </blockTable>
           </td>
-    <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></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>
@@ -187,35 +216,32 @@
     <blockTable colWidths="539.0" style="Table_Company_Name">
       <tr>
         <td>
-          <para style="terp_header_Centre">Assets</para>
+          <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="Table1" repeatRows="1">
+    <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">Assets</para>
+          <para style="terp_default_Bold_9">Account</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Balance</para>
         </td>
       </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('asset'), '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'])) ]] [[ company.currency_id.symbol ]]</font></para>
-        </td>
+      <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']) ]] [[company.currency_id.symbol ]]</para></td>
+        <td>[[ a['level'] == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a['balance']) ]] [[company.currency_id.symbol ]]</u></para></td>
       </tr>
     </blockTable>
     <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
@@ -224,7 +250,7 @@
           <para style="terp_default_Bold_9">Balance:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr()) ]] [[ company.currency_id.symbol ]]</u></para>
         </td>
       </tr>
     </blockTable>
@@ -235,7 +261,7 @@
     <blockTable colWidths="539.0" style="Table_Company_Name">
       <tr>
         <td>
-          <para style="terp_header_Centre">Liabilities</para>
+          <para style="terp_header_Left">Liabilities</para>
         </td>
       </tr>
     </blockTable>
@@ -245,22 +271,19 @@
           <para style="terp_default_Bold_9">Code</para>
         </td>
         <td>
-          <para style="terp_default_Bold_9">Liabilities</para>
+          <para style="terp_default_Bold_9">Account</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Balance</para>
         </td>
       </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('liability'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] </font><font>[[ 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 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</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'])) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]]</font></para>
-        </td>
+      <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']) ]] [[company.currency_id.symbol ]]</para></td>
+        <td>[[ a['level'] == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a['balance']) ]] [[company.currency_id.symbol ]]</u></para></td>
       </tr>
     </blockTable>
     <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
@@ -269,7 +292,7 @@
           <para style="terp_default_Bold_9">Balance:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr()) ]] [[ company.currency_id.symbol ]]</u></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml
index f9942c41b95..7e4f9f844a5 100644
--- a/addons/account/report/account_balance_sheet_horizontal.rml
+++ b/addons/account/report/account_balance_sheet_horizontal.rml
@@ -163,7 +163,7 @@
             </tr>
            </blockTable>
           </td>
-    <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></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>
@@ -202,7 +202,7 @@
           <para style="terp_default_9"><font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) 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(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]]</font></para>
+          <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']) ]] [[ company.currency_id.symbol ]]</font></para>
         </td>
         <td>
           <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]]</font><font>[[ a['code'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
@@ -213,7 +213,7 @@
         <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>[[ 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(abs(a['balance'])) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
+<font> [[(a['code'] and a['name']) and formatLang(a['balance']) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
         </td>
      </tr>
      </blockTable>
@@ -223,13 +223,13 @@
           <para style="terp_default_Bold_9">Balance:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr()) ]] [[ company.currency_id.symbol ]]</u></para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Balance:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr()) ]] [[ company.currency_id.symbol ]]</u></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index a42f6bface8..294c7fa99cf 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -117,10 +117,10 @@ class general_ledger(report_sxw.rml_parse, common_report_header):
             num_entry = self.cr.fetchone()[0] or 0
             sold_account = self._sum_balance_account(child_account)
             self.sold_accounts[child_account.id] = sold_account
-            if self.display_account == 'bal_movement':
+            if self.display_account == 'movement':
                 if child_account.type != 'view' and num_entry <> 0:
                     res.append(child_account)
-            elif self.display_account == 'bal_solde':
+            elif self.display_account == 'not_zero':
                 if child_account.type != 'view' and num_entry <> 0:
                     if not currency_obj.is_zero(self.cr, self.uid, currency, sold_account):
                         res.append(child_account)
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 22712af0f8c..ac100c3ecd0 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -395,7 +395,7 @@
           <para style="terp_default_Centre_7">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_7">[[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para>
+          <para style="terp_default_Centre_7">[[ (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_7">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml
index ca444bb4eca..6c70bb47310 100644
--- a/addons/account/report/account_profit_horizontal.rml
+++ b/addons/account/report/account_profit_horizontal.rml
@@ -180,7 +180,7 @@
 	        	</tr>
         	 </blockTable>
         	</td>
-		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></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>
diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py
index b672c930f95..4c8896ee630 100644
--- a/addons/account/report/account_profit_loss.py
+++ b/addons/account/report/account_profit_loss.py
@@ -101,6 +101,7 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
 
         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)
 
@@ -110,18 +111,21 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
                 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 += abs(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 += abs(account.debit - account.credit)
-                    if data['form']['display_account'] == 'bal_movement':
+                        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'] == 'bal_solde':
+                    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 self.result_sum_dr > self.result_sum_cr:
+            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:
diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml
index 582885d89dc..2b29f479478 100644
--- a/addons/account/report/account_profit_loss.rml
+++ b/addons/account/report/account_profit_loss.rml
@@ -24,9 +24,8 @@
     </blockTableStyle>
     <blockTableStyle id="Table_Account_Line_Title">
       <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
+      <blockValign value="MIDDLE"/>
       <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="Table3">
       <blockAlignment value="LEFT"/>
@@ -41,17 +40,6 @@
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <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="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-    </blockTableStyle>
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -136,7 +124,38 @@
     <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>
+
+    <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">
@@ -156,7 +175,7 @@
       	<td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
-		<td><para style="terp_tblheader_General_Centre">Display Account</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>
@@ -184,42 +203,33 @@
 	        	</tr>
         	 </blockTable>
         	</td>
-		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></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>
+    <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">Expenses</para>
+          <para style="terp_default_Bold_9">Account</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Balance</para>
         </td>
       </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9">
-            <font face="Times-Roman">[[ repeatIn(get_lines_another('expense'),'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)) ]] [[ company.currency_id.symbol ]]</font></para>
-        </td>
+      <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) ]] [[company.currency_id.symbol ]]</para></td>
+        <td>[[ a.level == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.balance) ]] [[company.currency_id.symbol ]]</u></para></td>
       </tr>
     </blockTable>
     <blockTable colWidths="100.0,326.0,113.0" style="Table_Net_Profit_Loss">
@@ -231,7 +241,7 @@
           <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(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and  formatLang(final_result()['balance']) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -241,7 +251,7 @@
           <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr()) ]] [[ company.currency_id.symbol ]]</u></para>
         </td>
       </tr>
     </blockTable>
@@ -249,32 +259,26 @@
     <para style="terp_default_Right_9_Bold">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="100.0,326.0,113.0" style="Table2" repeatRows="1">
+    <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">Incomes</para>
+          <para style="terp_default_Bold_9">Account</para>
         </td>
         <td>
           <para style="P1">Balance</para>
         </td>
       </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9">
-            <font face="Times-Roman">[[ repeatIn(get_lines_another('income'),'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)) ]] [[ company.currency_id.symbol ]]</font></para>
-        </td>
+      <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) ]] [[company.currency_id.symbol ]]</para></td>
+        <td>[[ a.level == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.balance) ]] [[company.currency_id.symbol ]]</u></para></td>
       </tr>
     </blockTable>
     <blockTable colWidths="100.0,326.0,113.0" style="Table4">
@@ -286,7 +290,7 @@
           <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(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and  formatLang(final_result()['balance']) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -296,7 +300,7 @@
           <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr()) ]] [[ company.currency_id.symbol ]]</u></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py
index 6b22dc21fdf..6666b1ccd83 100644
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@@ -114,7 +114,7 @@ class report_aged_receivable(osv.osv):
 
     _columns = {
         'name': fields.char('Month Range', size=7, readonly=True),
-        'balance': fields.function(_calc_bal, method=True, string='Balance', readonly=True),
+        'balance': fields.function(_calc_bal, string='Balance', readonly=True),
     }
 
     def init(self, cr, uid=1):
diff --git a/addons/account/report/account_treasury_report.py b/addons/account/report/account_treasury_report.py
new file mode 100644
index 00000000000..fce3661b4c4
--- /dev/null
+++ b/addons/account/report/account_treasury_report.py
@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import tools
+from osv import fields,osv
+import decimal_precision as dp
+
+class account_treasury_report(osv.osv):
+    _name = "account.treasury.report"
+    _description = "Treasury Analysis"
+    _auto = False
+
+    def _compute_balances(self, cr, uid, ids, field_names, arg=None, context=None,
+                  query='', query_params=()):
+        all_treasury_lines = self.search(cr, uid, [], context=context)
+        all_companies = self.pool.get('res.company').search(cr, uid, [], context=context)
+        current_sum = dict((company, 0.0) for company in all_companies)
+        res = dict((id, dict((fn, 0.0) for fn in field_names)) for id in all_treasury_lines)
+        for record in self.browse(cr, uid, all_treasury_lines, context=context):
+            res[record.id]['starting_balance'] = current_sum[record.company_id.id] 
+            current_sum[record.company_id.id] += record.balance
+            res[record.id]['ending_balance'] = current_sum[record.company_id.id]
+        return res    
+
+    _columns = {
+        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscalyear', readonly=True),
+        'period_id': fields.many2one('account.period', 'Period', readonly=True),
+        'debit': fields.float('Debit', readonly=True),
+        'credit': fields.float('Credit', readonly=True),
+        'balance': fields.float('Balance', readonly=True),
+        'date': fields.date('Beginning of Period Date', readonly=True),
+        'starting_balance': fields.function(_compute_balances, digits_compute=dp.get_precision('Account'), string='Starting Balance', multi='balance'),
+        'ending_balance': fields.function(_compute_balances, digits_compute=dp.get_precision('Account'), string='Ending Balance', multi='balance'),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
+    }
+
+    _order = 'date asc'
+
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'account_treasury_report')
+        cr.execute("""
+            create or replace view account_treasury_report as (
+            select
+                p.id as id,
+                p.fiscalyear_id as fiscalyear_id,
+                p.id as period_id,
+                sum(l.debit) as debit,
+                sum(l.credit) as credit,
+                sum(l.debit-l.credit) as balance,
+                p.date_start as date,
+                am.company_id as company_id
+            from
+                account_move_line l
+                left join account_account a on (l.account_id = a.id)
+                left join account_move am on (am.id=l.move_id)
+                left join account_period p on (am.period_id=p.id)
+            where l.state != 'draft'
+              and a.type = 'liquidity'
+            group by p.id, p.fiscalyear_id, p.date_start, am.company_id
+            )
+        """)
+account_treasury_report()
diff --git a/addons/account/report/account_treasury_report_view.xml b/addons/account/report/account_treasury_report_view.xml
new file mode 100644
index 00000000000..eceb1e5c760
--- /dev/null
+++ b/addons/account/report/account_treasury_report_view.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <record id="view_account_treasury_report_tree" model="ir.ui.view">
+        <field name="name">account.treasury.report.tree</field>
+        <field name="model">account.treasury.report</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Treasury Analysis">
+                <field name="date" invisible="1"/>
+                <field name="fiscalyear_id"/>
+                <field name="period_id"/>
+                <field name="debit"/>
+                <field name="credit"/>
+                <field name="balance"/>
+                <field name="starting_balance"/>
+                <field name="ending_balance"/>
+                <field name="company_id" groups="base.group_multi_company"/>
+           </tree>
+        </field>
+    </record>
+    <record id="view_account_treasury_report_graph" model="ir.ui.view">
+         <field name="name">account.treasury.report.graph</field>
+         <field name="model">account.treasury.report</field>
+         <field name="type">graph</field>
+         <field name="arch" type="xml">
+             <graph string="Treasury Analysis" type="bar">
+                <field name="period_id"/>
+                <field name="balance" operator="+"/>
+             </graph>
+         </field>
+    </record>
+    <record id="view_account_treasury_report_search" model="ir.ui.view">
+        <field name="name">account.treasury.report.search</field>
+        <field name="model">account.treasury.report</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Treasury Analysis">
+                <group colspan="10" col="12">
+                    <field name="fiscalyear_id"/>
+                    <field name="period_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                </group>
+                 <newline/>
+            </search>
+        </field>
+    </record>
+    <record id="action_account_treasury_report_all" model="ir.actions.act_window">
+        <field name="name">Treasury Analysis</field>
+        <field name="res_model">account.treasury.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="search_view_id" ref="view_account_treasury_report_search"/>
+        <field name="view_id" ref="view_account_treasury_report_tree"/>
+        <field name="context">{'group_by':[], 'group_by_no_leaf':0}</field>
+        <field name="help">From this view, have an analysis of your treasury. It sums the balance of every accounting entries made on liquidity accounts per period.</field>
+    </record>
+    <menuitem action="action_account_treasury_report_all" id="menu_action_account_treasury_report_all"
+        parent="account.menu_finance_statistic_report_statement"
+        groups="group_account_manager"
+        sequence="2"/>
+</data>
+</openerp>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index b7271fec84b..016c147be91 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -97,6 +97,13 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
+    <record id="invoice_analysis_comp_rule" model="ir.rule">
+        <field name="name">Invoice Analysis multi-company</field>
+        <field model="ir.model" name="model_id" ref="model_account_invoice_report"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
     <record id="account_fiscal_position_comp_rule" model="ir.rule">
         <field name="name">Account fiscal Mapping company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_fiscal_position"/>
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 1ab94806b63..50e8dced7e6 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -125,3 +125,5 @@
 "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
+
diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index 89e28950535..927f895bb3b 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -103,6 +103,14 @@ class account_fiscalyear_close(osv.osv_memory):
             if accnt_type_data.close_method=='none' or account.type == 'view':
                 continue
             if accnt_type_data.close_method=='balance':
+                balance_in_currency = 0.0
+                if account.currency_id:
+                    cr.execute('SELECT sum(amount_currency) as balance_in_currency FROM account_move_line ' \
+                            'WHERE account_id = %s ' \
+                                'AND ' + query_line + ' ' \
+                                'AND currency_id = %s', (account.id, account.currency_id.id)) 
+                    balance_in_currency = cr.dictfetchone()['balance_in_currency']
+
                 if abs(account.balance)>0.0001:
                     obj_acc_move_line.create(cr, uid, {
                         'debit': account.balance>0 and account.balance,
@@ -111,7 +119,9 @@ class account_fiscalyear_close(osv.osv_memory):
                         'date': period.date_start,
                         'journal_id': new_journal.id,
                         'period_id': period.id,
-                        'account_id': account.id
+                        'account_id': account.id,
+                        'currency_id': account.currency_id and account.currency_id.id or False,
+                        'amount_currency': balance_in_currency,
                     }, {'journal_id': new_journal.id, 'period_id':period.id})
             if accnt_type_data.close_method == 'unreconciled':
                 offset = 0
diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py
index 18d3622b16c..873ede3832c 100644
--- a/addons/account/wizard/account_report_balance_sheet.py
+++ b/addons/account/wizard/account_report_balance_sheet.py
@@ -48,7 +48,7 @@ class account_bs_report(osv.osv_memory):
     }
 
     _defaults={
-        'display_type': True,
+        'display_type': False,
         'journal_ids': [],
         'reserve_account_id': _get_def_reserve_account,
     }
diff --git a/addons/account/wizard/account_report_common_account.py b/addons/account/wizard/account_report_common_account.py
index 0040d563bdd..4e0fe2d6c66 100644
--- a/addons/account/wizard/account_report_common_account.py
+++ b/addons/account/wizard/account_report_common_account.py
@@ -26,13 +26,13 @@ class account_common_account_report(osv.osv_memory):
     _description = 'Account Common Account Report'
     _inherit = "account.common.report"
     _columns = {
-        'display_account': fields.selection([('bal_all','All'), ('bal_movement','With movements'),
-                                            ('bal_solde','With balance is not equal to 0'),
+        'display_account': fields.selection([('all','All'), ('movement','With movements'),
+                                            ('not_zero','With balance is not equal to 0'),
                                             ],'Display Accounts', required=True),
 
     }
     _defaults = {
-        'display_account': 'bal_all',
+        'display_account': 'movement',
     }
 
     def pre_print_report(self, cr, uid, ids, data, context=None):
diff --git a/addons/account/wizard/account_report_profit_loss.py b/addons/account/wizard/account_report_profit_loss.py
index c526550e789..6372539c056 100644
--- a/addons/account/wizard/account_report_profit_loss.py
+++ b/addons/account/wizard/account_report_profit_loss.py
@@ -33,7 +33,7 @@ class account_pl_report(osv.osv_memory):
     }
 
     _defaults = {
-        'display_type': True,
+        'display_type': False,
         'journal_ids': [],
         'target_move': False
     }
diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index e00353f28ce..5daaf4f4f3e 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -38,6 +38,7 @@ user rights to Demo user.
     "depends" : ["account"],
     'update_xml': [
         'security/account_security.xml',
+        'account_accountant_data.xml'
     ],
     'demo_xml': ['account_accountant_demo.xml'],
     'test': [],
diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
new file mode 100644
index 00000000000..5962ae95dcd
--- /dev/null
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+<!--
+        It's easier for new users to not activate this (ex: they misconfigure
+        header and footer.)
+
+        <record model="ir.actions.report.xml" id="account.account_invoices">
+            <field name="attachment_use">1</field>
+        </record>
+-->
+
+    </data>
+</openerp>
diff --git a/addons/account_accountant/i18n/fi.po b/addons/account_accountant/i18n/fi.po
new file mode 100644
index 00000000000..1e1c0a25072
--- /dev/null
+++ b/addons/account_accountant/i18n/fi.po
@@ -0,0 +1,33 @@
+# Finnish 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-06-22 05:51+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,description:account_accountant.module_meta_information
+msgid ""
+"\n"
+"This module gives the admin user the access to all the accounting features "
+"like the journal\n"
+"items and the chart of accounts.\n"
+"    "
+msgstr ""
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "Kirjanpitäjä"
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 11f92614b73..22eb9401ad7 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -375,49 +375,49 @@ class account_analytic_account(osv.osv):
         return res
 
     _columns ={
-        'ca_invoiced': fields.function(_ca_invoiced_calc, method=True, type='float', string='Invoiced Amount',
+        'ca_invoiced': fields.function(_ca_invoiced_calc, type='float', string='Invoiced Amount',
             help="Total customer invoiced amount for this account.",
             digits_compute=dp.get_precision('Account')),
-        'total_cost': fields.function(_total_cost_calc, method=True, type='float', string='Total Costs',
+        'total_cost': fields.function(_total_cost_calc, type='float', string='Total Costs',
             help="Total of costs for this account. It includes real costs (from invoices) and indirect costs, like time spent on timesheets.",
             digits_compute=dp.get_precision('Account')),
-        'ca_to_invoice': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Uninvoiced Amount',
+        'ca_to_invoice': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Uninvoiced Amount',
             help="If invoice from analytic account, the remaining amount you can invoice to the customer based on the total costs.",
             digits_compute=dp.get_precision('Account')),
-        'ca_theorical': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Theoretical Revenue',
+        'ca_theorical': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Theoretical Revenue',
             help="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.",
             digits_compute=dp.get_precision('Account')),
-        'hours_quantity': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Hours Tot',
+        'hours_quantity': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Hours Tot',
             help="Number of hours you spent on the analytic account (from timesheet). It computes on all journal of type 'general'."),
-        'last_invoice_date': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='date', string='Last Invoice Date',
+        'last_invoice_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Last Invoice Date',
             help="If invoice from the costs, this is the date of the latest invoiced."),
-        'last_worked_invoiced_date': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='date', string='Date of Last Invoiced Cost',
+        'last_worked_invoiced_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Date of Last Invoiced Cost',
             help="If invoice from the costs, this is the date of the latest work or cost that have been invoiced."),
-        'last_worked_date': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='date', string='Date of Last Cost/Work',
+        'last_worked_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Date of Last Cost/Work',
             help="Date of the latest work done on this account."),
-        'hours_qtt_non_invoiced': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Uninvoiced Hours',
+        'hours_qtt_non_invoiced': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Uninvoiced Hours',
             help="Number of hours (from journal of type 'general') that can be invoiced if you invoice based on analytic account."),
-        'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, method=True, type='float', string='Invoiced Hours',
+        'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, type='float', string='Invoiced Hours',
             help="Number of hours that can be invoiced plus those that already have been invoiced."),
-        'remaining_hours': fields.function(_remaining_hours_calc, method=True, type='float', string='Remaining Hours',
+        'remaining_hours': fields.function(_remaining_hours_calc, type='float', string='Remaining Hours',
             help="Computed using the formula: Maximum Quantity - Hours Tot."),
-        'remaining_ca': fields.function(_remaining_ca_calc, method=True, type='float', string='Remaining Revenue',
+        'remaining_ca': fields.function(_remaining_ca_calc, type='float', string='Remaining Revenue',
             help="Computed using the formula: Max Invoice Price - Invoiced Amount.",
             digits_compute=dp.get_precision('Account')),
-        'revenue_per_hour': fields.function(_revenue_per_hour_calc, method=True, type='float', string='Revenue per Hours (real)',
+        'revenue_per_hour': fields.function(_revenue_per_hour_calc, type='float', string='Revenue per Hours (real)',
             help="Computed using the formula: Invoiced Amount / Hours Tot.",
             digits_compute=dp.get_precision('Account')),
-        'real_margin': fields.function(_real_margin_calc, method=True, type='float', string='Real Margin',
+        'real_margin': fields.function(_real_margin_calc, type='float', string='Real Margin',
             help="Computed using the formula: Invoiced Amount - Total Costs.",
             digits_compute=dp.get_precision('Account')),
-        'theorical_margin': fields.function(_theorical_margin_calc, method=True, type='float', string='Theoretical Margin',
+        'theorical_margin': fields.function(_theorical_margin_calc, type='float', string='Theoretical Margin',
             help="Computed using the formula: Theorial Revenue - Total Costs",
             digits_compute=dp.get_precision('Account')),
-        'real_margin_rate': fields.function(_real_margin_rate_calc, method=True, type='float', string='Real Margin Rate (%)',
+        'real_margin_rate': fields.function(_real_margin_rate_calc, type='float', string='Real Margin Rate (%)',
             help="Computes using the formula: (Real Margin / Total Costs) * 100.",
             digits_compute=dp.get_precision('Account')),
-        'month_ids': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
-        'user_ids': fields.function(_analysis_all, method=True, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
+        'month_ids': fields.function(_analysis_all, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
+        'user_ids': fields.function(_analysis_all, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
     }
 
 account_analytic_account()
@@ -456,7 +456,7 @@ class account_analytic_account_summary_user(osv.osv):
 
     _columns = {
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
-        'unit_amount': fields.function(_unit_amount, method=True, type='float',
+        'unit_amount': fields.function(_unit_amount, type='float',
             string='Total Time'),
         'user': fields.many2one('res.users', 'User'),
     }
@@ -620,7 +620,7 @@ class account_analytic_account_summary_month(osv.osv):
 
     _columns = {
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
-        'unit_amount': fields.function(_unit_amount, method=True, type='float', string='Total Time'),
+        'unit_amount': fields.function(_unit_amount, type='float', string='Total Time'),
         'month': fields.char('Month', size=32, readonly=True),
     }
 
diff --git a/addons/account_analytic_default/i18n/sr@latin.po b/addons/account_analytic_default/i18n/sr@latin.po
index 7ca25d88a4f..fb334b46579 100644
--- a/addons/account_analytic_default/i18n/sr@latin.po
+++ b/addons/account_analytic_default/i18n/sr@latin.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-23 15:15+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2011-06-04 19:05+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-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-05 04:35+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -147,6 +147,15 @@ msgid ""
 "* Date\n"
 "    "
 msgstr ""
+"\n"
+"Omogućava automatsko biranje analitičkih računa bazirano na "
+"sl,kriterijumima:\n"
+"*Proizvod\n"
+"*Partner\n"
+"*Korisnik\n"
+"*Preduzeće\n"
+"*Datum\n"
+"    "
 
 #. module: account_analytic_default
 #: help:account.analytic.default,product_id:0
@@ -201,7 +210,7 @@ msgstr ""
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Redosled narudžbina"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/account_analytic_default/i18n/zh_CN.po b/addons/account_analytic_default/i18n/zh_CN.po
index 7c6b8677b1c..f6cc673966d 100644
--- a/addons/account_analytic_default/i18n/zh_CN.po
+++ b/addons/account_analytic_default/i18n/zh_CN.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-09-29 09:13+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2011-07-01 10:20+0000\n"
+"Last-Translator: digitalsatori <digisatori@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-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:06+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -49,7 +49,7 @@ msgstr ""
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
@@ -59,7 +59,7 @@ msgstr ""
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "领料/提货单"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
diff --git a/addons/account_analytic_plans/__init__.py b/addons/account_analytic_plans/__init__.py
index 067aa84d267..a5c371fa6ec 100644
--- a/addons/account_analytic_plans/__init__.py
+++ b/addons/account_analytic_plans/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,10 +15,9 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 import account_analytic_plans
 import wizard
 import report
diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py
index dab9e83c75a..1240a336500 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -69,7 +69,8 @@ of distribution models.
         'account_analytic_plans_view.xml',
         'account_analytic_plans_report.xml',
         'wizard/analytic_plan_create_model_view.xml',
-        'wizard/account_crossovered_analytic_view.xml'
+        'wizard/account_crossovered_analytic_view.xml',
+        'account_analytic_plans_installer_view.xml'
     ],
     'demo_xml'  : [],
     'test' : ['test/acount_analytic_plans_report.yml'],
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index b25f6994394..c8ab5334d8a 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -47,6 +47,26 @@ class one2many_mod2(fields.one2many):
             res[r[self._fields_id]].append( r['id'] )
         return res
 
+class account_analytic_line(osv.osv):
+    _inherit = 'account.analytic.line'
+    _description = 'Analytic Line'
+
+    def _get_amount(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for id in ids:
+            res.setdefault(id, 0.0)
+        for line in self.browse(cr, uid, ids, context=context):
+            amount = line.move_id and line.move_id.amount_currency * (line.percentage / 100) or 0.0
+            res[line.id] = amount
+        return res
+
+    _columns = {
+        'amount_currency': fields.function(_get_amount, string="Amount Currency", type="float", store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True),
+        'percentage': fields.float('Percentage')
+    }
+
+account_analytic_line()
+
 class account_analytic_plan(osv.osv):
     _name = "account.analytic.plan"
     _description = "Analytic Plan"
@@ -338,6 +358,7 @@ class account_move_line(osv.osv):
                        'move_id': line.id,
                        'journal_id': line.journal_id.analytic_journal_id.id,
                        'ref': line.ref,
+                       'percentage': line2.rate
                    }
                    analytic_line_obj.create(cr, uid, al_vals, context=context)
         return True
diff --git a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
new file mode 100644
index 00000000000..3543539debb
--- /dev/null
+++ b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+
+    <record model="ir.actions.act_window" id="account_analytic_plan_form_action_installer">
+        <field name="name">Account Analytic Plans</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">account.analytic.plan</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="account_analytic_plans.account_analytic_plan_form"/>
+    </record>
+        
+   <record id="account_analytic_plan_installer_todo" model="ir.actions.todo">
+      <field name="action_id" ref="account_analytic_plan_form_action_installer"/>
+      <field name="category_id" ref="account.category_accounting_configuration"/>
+      <field name="sequence">15</field>
+      <field name="type">normal</field>
+      <field name="state">skip</field>
+  </record>
+
+  </data>
+</openerp>
+
+
diff --git a/addons/account_anglo_saxon/i18n/fi.po b/addons/account_anglo_saxon/i18n/fi.po
new file mode 100644
index 00000000000..4806d363e98
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/fi.po
@@ -0,0 +1,111 @@
+# Finnish 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-06-29 08:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-30 04:34+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr " Kirjanpito-ominaisuus"
+
+#. module: account_anglo_saxon
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "Tilauksen viite tulee olla yksilöllinen!"
+
+#. module: account_anglo_saxon
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "Virhe ! Et voi luoda rekursiivisia luokkia."
+
+#. module: account_anglo_saxon
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Virhe: Oletus mittayksikkö ja ostojen mittayksikkö täytyy olla samassa "
+"kategoriassa."
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Laskun rivi"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr "Ostotilaus"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
+msgstr "Tuotteen malli"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr "Tuotteen kategoria"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Accounting for Anglo Saxon countries"
+msgstr "Varastokirjanpito anglosaksalaisille maille"
+
+#. 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 "Hintaerotuksen tili"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice
+msgid "Invoice"
+msgstr "Lasku"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_stock_picking
+msgid "Picking List"
+msgstr "Keräilylista"
+
+#. 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 ""
+"Tätä tiliä käytetään arvostamaan hintaeroa ostohinnan ja kustannushinnan "
+"välillä"
diff --git a/addons/account_anglo_saxon/i18n/sr@latin.po b/addons/account_anglo_saxon/i18n/sr@latin.po
index 62a74b9b1af..10b3a8cbb89 100644
--- a/addons/account_anglo_saxon/i18n/sr@latin.po
+++ b/addons/account_anglo_saxon/i18n/sr@latin.po
@@ -8,50 +8,51 @@ 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-10 15:54+0000\n"
+"PO-Revision-Date: 2011-06-04 19:30+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-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-05 04:35+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
 msgid " Accounting Property"
-msgstr ""
+msgstr " Vlasništvo naloga"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Referenca narudžbine mora biti jedinstvena !"
 
 #. module: account_anglo_saxon
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Greška! Ne možete da napravite rekurzivne kategorije."
 
 #. module: account_anglo_saxon
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Greška: Podrazumevana JM i kupljena JM moraju da budu u istoj kategoriji."
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Red računa"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_purchase_order
 msgid "Purchase Order"
-msgstr ""
+msgstr "Narudžbenica"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Šablon proizvoda"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
@@ -61,23 +62,23 @@ msgstr "Kategorija Proizvoda"
 #. module: account_anglo_saxon
 #: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
 msgid "Stock Accounting for Anglo Saxon countries"
-msgstr ""
+msgstr "Lager koji važi za anglosaksonske zemlje"
 
 #. 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 ""
+msgstr "Odnos u razlici cena"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Račun"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Lista ponuda"
 
 #. module: account_anglo_saxon
 #: model:ir.module.module,description:account_anglo_saxon.module_meta_information
@@ -105,3 +106,5 @@ msgid ""
 "This account will be used to value price difference between purchase price "
 "and cost price."
 msgstr ""
+"Ovaj nalog biće upotrebljen u svrhu određivanja vrednosti razlike između "
+"nabavne i prodajne cene."
diff --git a/addons/account_anglo_saxon/i18n/tr.po b/addons/account_anglo_saxon/i18n/tr.po
new file mode 100644
index 00000000000..396c8ab8ab6
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/tr.po
@@ -0,0 +1,112 @@
+# Turkish 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-06-02 17:13+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"Language-Team: Turkish <tr@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-06-03 04:40+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr " Muhasebe Özellikleri"
+
+#. module: account_anglo_saxon
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "Sipariş referansı eşsiz olmalı !"
+
+#. module: account_anglo_saxon
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "Hata ! İç içe çağırılan kategoriler oluşturamazsınız."
+
+#. module: account_anglo_saxon
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Hata: Varsayılan ölçü birimi ile satış ölçü birimi aynı kategoride bulunmalı."
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Fatura Kalemi"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr "Satınalma Siparişi"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
+msgstr "Ürün Şablonu"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr "Ürün Kategorisi"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Accounting for Anglo Saxon countries"
+msgstr "Anglo Saxon ülkeleri için Stok Muhasebesi"
+
+#. 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 "Fiyat Farkı Hesabı"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice
+msgid "Invoice"
+msgstr "Fatura"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_stock_picking
+msgid "Picking List"
+msgstr "Toplama Listesi"
+
+#. 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 ""
+"Bu modül, Anglo-Saxon muhasebe yöntemini stok işlemleri yoluyla muhasebe \n"
+"    mantığını değştirerek destekleyecektir."
+
+#. 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 ""
+"Bu hesap satınalma fiyatı ile maliyet fiyatı arasındaki fiyat farkını "
+"değerlendirmek için kullanılacaktır."
diff --git a/addons/account_anglo_saxon/product.py b/addons/account_anglo_saxon/product.py
index ebb9bde3d00..a2a5f7e6e95 100644
--- a/addons/account_anglo_saxon/product.py
+++ b/addons/account_anglo_saxon/product.py
@@ -28,7 +28,6 @@ class product_category(osv.osv):
             type='many2one',
             relation='account.account',
             string="Price Difference Account",
-            method=True,
             view_load=True,
             help="This account will be used to value price difference between purchase price and cost price."),
 
@@ -38,7 +37,6 @@ class product_category(osv.osv):
             type='many2one',
             relation='account.account',
             string="Income Account",
-            method=True,
             view_load=True,
             help="This account will be used to value outgoing stock for the current product category using sale price"),
         'property_account_expense_categ': fields.property(
@@ -46,7 +44,6 @@ class product_category(osv.osv):
             type='many2one',
             relation='account.account',
             string="Expense Account",
-            method=True,
             view_load=True,
             help="This account will be used to value outgoing stock for the current product category using cost price"),                
 
@@ -61,7 +58,6 @@ class product_template(osv.osv):
             type='many2one',
             relation='account.account',
             string="Price Difference Account",
-            method=True,
             view_load=True,
             help="This account will be used to value price difference between purchase price and cost price."),
             
@@ -71,7 +67,6 @@ class product_template(osv.osv):
             type='many2one',
             relation='account.account',
             string="Income Account",
-            method=True,
             view_load=True,
             help="This account will be used to value outgoing stock for the current product category using sale price"),
         'property_account_expense': fields.property(
@@ -79,7 +74,6 @@ class product_template(osv.osv):
             type='many2one',
             relation='account.account',
             string="Expense Account",
-            method=True,
             view_load=True,
             help="This account will be used to value outgoing stock for the current product category using cost price"),                
 
diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py
index 12caba17374..7d9666ae5ac 100644
--- a/addons/account_budget/account_budget.py
+++ b/addons/account_budget/account_budget.py
@@ -196,9 +196,9 @@ class crossovered_budget_lines(osv.osv):
         'date_to': fields.date('End Date', required=True),
         'paid_date': fields.date('Paid Date'),
         'planned_amount':fields.float('Planned Amount', required=True, digits_compute=dp.get_precision('Account')),
-        'practical_amount':fields.function(_prac, method=True, string='Practical Amount', type='float', digits_compute=dp.get_precision('Account')),
-        'theoritical_amount':fields.function(_theo, method=True, string='Theoretical Amount', type='float', digits_compute=dp.get_precision('Account')),
-        'percentage':fields.function(_perc, method=True, string='Percentage', type='float'),
+        'practical_amount':fields.function(_prac, string='Practical Amount', type='float', digits_compute=dp.get_precision('Account')),
+        'theoritical_amount':fields.function(_theo, string='Theoretical Amount', type='float', digits_compute=dp.get_precision('Account')),
+        'percentage':fields.function(_perc, string='Percentage', type='float'),
         'company_id': fields.related('crossovered_budget_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
     }
 
diff --git a/addons/account_cancel/i18n/sr@latin.po b/addons/account_cancel/i18n/sr@latin.po
index 04c43bebea8..e067bc9d59e 100644
--- a/addons/account_cancel/i18n/sr@latin.po
+++ b/addons/account_cancel/i18n/sr@latin.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-23 16:26+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-06-04 19:10+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-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-05 04:35+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -26,9 +26,9 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"    Modul adds omogucava polja za otkazivanje u formi pregleda dnevnika "
-"konta. Ako je postavljeno na ' da' omogucava korisniku da otkaze stavke & "
-"racune\n"
+"    Modul dodaje polje 'Omogući otkazivanje unosâ' u obliku pregleda "
+"dnevnika naloga. Ako je podešen na 'istinito', omogućava korisniku da "
+"otkazuje unose i račune.\n"
 "    "
 
 #. module: account_cancel
diff --git a/addons/account_chart/i18n/sr@latin.po b/addons/account_chart/i18n/sr@latin.po
index 5e1ab3c83de..fbd53d83c42 100644
--- a/addons/account_chart/i18n/sr@latin.po
+++ b/addons/account_chart/i18n/sr@latin.po
@@ -8,21 +8,21 @@ 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:15+0000\n"
-"Last-Translator: Dragan Životić <dragan_zivotic@yahoo.com>\n"
+"PO-Revision-Date: 2011-06-04 19:11+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-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-05 04:35+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
 msgid "Remove minimal account chart"
-msgstr "Ukloni minimalnu kontnu tabelu"
+msgstr "Ukloni minimalnu tabelu naloga"
 
 #. module: account_chart
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
-msgstr ""
+msgstr "Tabele nalogâ"
diff --git a/addons/account_coda/i18n/fi.po b/addons/account_coda/i18n/fi.po
new file mode 100644
index 00000000000..8daf08f08c8
--- /dev/null
+++ b/addons/account_coda/i18n/fi.po
@@ -0,0 +1,261 @@
+# Finnish 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-06-28 09:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-29 04:43+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: account_coda
+#: help:account.coda,journal_id:0
+#: field:account.coda.import,journal_id:0
+msgid "Bank Journal"
+msgstr "Pankkitapahtumat"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Loki"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_import
+msgid "Account Coda Import"
+msgstr "Tilien Coda tuonti"
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr "Coda tiedosto"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Group By..."
+msgstr "Ryhmittely.."
+
+#. module: account_coda
+#: field:account.coda.import,awaiting_account:0
+msgid "Default Account for Unrecognized Movement"
+msgstr "Oletustili tuntemattomille siirroille"
+
+#. module: account_coda
+#: help:account.coda,date:0
+msgid "Import Date"
+msgstr "Tuontipäivä"
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr "Tuontiloki"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Import"
+msgstr "Tuo"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda import"
+msgstr "Coda tuonti"
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:51
+#, python-format
+msgid "Coda file not found for bank statement !!"
+msgstr "Coda tiedostoa ei löytynyt tiliotteelle"
+
+#. 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 "Yritys"
+
+#. 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 "Hae coda"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr "Käyttäjä"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,date:0
+msgid "Date"
+msgstr "Päiväys"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
+msgid "Coda Import Logs"
+msgstr "Coda tuontilokit"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr "Coda tilille"
+
+#. module: account_coda
+#: field:account.coda.import,def_payable:0
+msgid "Default Payable Account"
+msgstr "Oletus maksutili"
+
+#. module: account_coda
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
+msgstr "Talleta tiliotteiden yksityiskohdat"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Cancel"
+msgstr "Peruuta"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Open Statements"
+msgstr "Avaa tiliotteet"
+
+#. 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 "Tuo Coda tiedot"
+
+#. 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 "Tuo Coda tiedot"
+
+#. 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 "Tiliotteet"
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr "Coda"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Results :"
+msgstr "Tulokset :"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Result of Imported Coda Statements"
+msgstr "Tulos tuoduista Coda tiliotteista"
+
+#. 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 ""
+"Valitse tähän oletustili jota käytetään jos saapuneen maksun kumppania ei "
+"löydetä"
+
+#. 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 "Coda tiedosto"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Pankin tiliote"
+
+#. module: account_coda
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda Logs"
+msgstr "Coda lokit"
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:311
+#, python-format
+msgid "Result"
+msgstr "Tulos"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Click on 'New' to select your file :"
+msgstr "Valitse 'uusi' valitaksesi tiedostosi :"
+
+#. module: account_coda
+#: field:account.coda.import,def_receivable:0
+msgid "Default Receivable Account"
+msgstr "Oletus saamistili"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Close"
+msgstr "Sulje"
+
+#. module: account_coda
+#: field:account.coda,statement_ids:0
+msgid "Generated Bank Statements"
+msgstr "Luodut tiliotteet"
+
+#. 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/i18n/vi.po b/addons/account_coda/i18n/vi.po
new file mode 100644
index 00000000000..c81c4dd2dfd
--- /dev/null
+++ b/addons/account_coda/i18n/vi.po
@@ -0,0 +1,269 @@
+# Vietnamese 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-06-04 22:47+0000\n"
+"Last-Translator: Nguyễn Thịnh <Nguyenhopthinh@gmail.com>\n"
+"Language-Team: Vietnamese <vi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-06 04:37+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: account_coda
+#: help:account.coda,journal_id:0
+#: field:account.coda.import,journal_id:0
+msgid "Bank Journal"
+msgstr "quy trình của ngân hàng"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Log"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_import
+msgid "Account Coda Import"
+msgstr "tài khoản nhập"
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr "mã của tập tin"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Group By..."
+msgstr "Nhóm theo..."
+
+#. module: account_coda
+#: field:account.coda.import,awaiting_account:0
+msgid "Default Account for Unrecognized Movement"
+msgstr "tài khoản mặc định cho các loại không định nghĩa"
+
+#. module: account_coda
+#: help:account.coda,date:0
+msgid "Import Date"
+msgstr "ngày nhập"
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr "nhập vào log"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Import"
+msgstr "nhập khẩu"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda import"
+msgstr "mã nhập khẩu"
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:51
+#, python-format
+msgid "Coda file not found for bank statement !!"
+msgstr "mã file không tim thấy bản tường trình của ngân hàng"
+
+#. 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 ""
+"Đặt ở đây các tài khoản mặc định sẽ được sử dụng, nếu đối tác được tìm thấy "
+"nhưng không có tài khoản ngân hàng, hoặc nếu ông là cư trú"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,company_id:0
+msgid "Company"
+msgstr "Công ty"
+
+#. 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 ""
+"Đặt ở đây các tài khoản phải nộp sẽ được sử dụng, theo mặc định, nếu đối tác "
+"không tìm thấy"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Search Coda"
+msgstr "Mã tìm kiếm"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr "Người sử dụng"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,date:0
+msgid "Date"
+msgstr "Ngày"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
+msgid "Coda Import Logs"
+msgstr "nghi nhận mã nhập"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr "mã của tài khoản"
+
+#. module: account_coda
+#: field:account.coda.import,def_payable:0
+msgid "Default Payable Account"
+msgstr "mặc định tài khoản phải trả"
+
+#. module: account_coda
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
+msgstr "lưu trữ chi tiết của giao dịch ngân hàng"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Cancel"
+msgstr "Hủy bỏ"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Open Statements"
+msgstr "mở bản chi tiết"
+
+#. 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 "tài khoản ngân hàng %s không định nghĩa cho khách hàng %s.\n"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
+msgid "Import Coda Statements"
+msgstr "nhập mã chi tiết công việc"
+
+#. 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 "nhập mã chi tiết công việc"
+
+#. 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 ""
+"\n"
+"    Module cung cấp chức năng nhập khẩu\n"
+"     ngân hàng báo cáo từ các tập tin coda.\n"
+"    "
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Statements"
+msgstr "báo cáo"
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr "đoạn cuối"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Results :"
+msgstr "kết quả"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Result of Imported Coda Statements"
+msgstr "báo cáo kết quả cuối cùng của nhập khẩu"
+
+#. 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 ""
+"Đặt ở đây các tài khoản phải thu sẽ được sử dụng, theo mặc định, nếu đối tác "
+"không tìm thấy"
+
+#. 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_followup/account_followup.py b/addons/account_followup/account_followup.py
index c798c703f37..06a53bb9548 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -33,6 +33,20 @@ class followup(osv.osv):
     _defaults = {
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'account_followup.followup', context=c),
     }
+    
+    def check_company_uniq(self, cr, uid, ids, context=None):
+        sr_id = self.search(cr,uid,[],context=context)
+        lines = self.browse(cr, uid, sr_id, context=context)
+        company = []
+        for l in lines:
+            if l.company_id.id in company:
+                return False
+            if l.company_id.id not in company:
+                company.append(l.company_id.id)
+        return True
+    _constraints = [
+        (check_company_uniq, 'Only One Folllowup by Company.',['company_id'] )
+        ]
 
 followup()
 
@@ -47,6 +61,9 @@ class followup_line(osv.osv):
         'followup_id': fields.many2one('account_followup.followup', 'Follow Ups', required=True, ondelete="cascade"),
         'description': fields.text('Printed Message', translate=True),
     }
+    _defaults = {
+        'start': 'days',
+    }
 
 followup_line()
 
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 326264ffdcd..60d414477b0 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -8,10 +8,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Follow-Up Lines">
-                    <field name="sequence"/>
                     <field name="name"/>
                     <field name="delay"/>
-                    <field name="start"/>
+                    <field name="start" groups="base.group_extended"/>
                 </tree>
             </field>
         </record>
@@ -22,12 +21,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Follow-Up Lines">
-                    <field name="sequence"/>
-                    <field name="name" />
-                    <field name="delay" />
-                    <field name="start" />
+                  <group col="6" colspan="4">
+                     <field name="name" />
+                     <field name="delay" />
+                     <field name="start" groups="base.group_extended"/>
+                  </group>
                     <newline/>
-                    <field colspan="4" name="description" />
+                    <separator string="Message" colspan="4"/>
+                    <field colspan="4" name="description" nolabel="1"/>
                     <separator string="Legend" colspan="4"/>
                     <label string="%%(partner_name)s: Partner Name" colspan="2"/>
                     <label string="%%(date)s: Current Date" colspan="2"/>
@@ -45,9 +46,7 @@
                 <form string="Follow-Up">
                     <field name="name" />
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <separator colspan="4" string="Description"/>
-                    <field colspan="4" name="description" nolabel="1" />
-                    <separator colspan="4" string="Followup Lines"/>
+                    <separator colspan="4" string="" />
                     <field colspan="4" name="followup_line" nolabel="1"/>
                 </form>
             </field>
@@ -75,6 +74,10 @@
                         <field name="name"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
+                   <newline/>
+                   <group expand="0" string="Group By...">
+                        <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                   </group>
                </search>
             </field>
         </record>
@@ -85,6 +88,7 @@
             <field name="res_model">account_followup.followup</field>
             <field name="search_view_id" ref="view_account_followup_filter"/>
             <field name="view_type">form</field>
+            <field name="help">Define follow up levels and their related messages and delay. For each step, specify the message and the day of delay. Use the legend to know the using code to adapt the email content to the good context (good name, good date) and you can manage the multi language of messages.</field>
         </record>
         <menuitem action="action_account_followup_definition_form" id="account_followup_menu"
             parent="account.menu_configuration_misc"/>
@@ -170,6 +174,28 @@
                 </field>
             </field>
         </record>
+        
+        <!--   Configure Follow-Ups  Wizard    -->
+        
+          <record id="action_view_account_followup_followup_form" model="ir.actions.act_window">
+            <field name="name">Configure Follow-Ups</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account_followup.followup</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="view_account_followup_followup_form"/>
+        </record>
+        
+         <!--      register configuration wizard -->
+        <record id="config_wizard_view_account_followup_followup_form" model="ir.actions.todo">
+            <field name="action_id" ref="action_view_account_followup_followup_form"/>
+            <field name="category_id" ref="account.category_accounting_configuration"/>
+            <field name="target">current</field>
+            <field name="type">normal</field>
+            <field name="state">skip</field>
+        </record>
+        
+        
 
     </data>
 </openerp>
diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po
index 94e74684688..4e4ce7e1db9 100644
--- a/addons/account_followup/i18n/tr.po
+++ b/addons/account_followup/i18n/tr.po
@@ -7,25 +7,25 @@ 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 15:46+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-06-02 17:04+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-03 04:39+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:295
+#: code:addons/account_followup/wizard/account_followup_print.py:298
 #, python-format
 msgid "Follwoup Summary"
-msgstr ""
+msgstr "İzleme Özeti"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Search Followup"
-msgstr ""
+msgstr "İzleme Ara"
 
 #. module: account_followup
 #: model:ir.module.module,description:account_followup.module_meta_information
@@ -51,11 +51,31 @@ msgid ""
 "Sent\n"
 "\n"
 msgstr ""
+"\n"
+"    Çok seviyeli anımsatmalı ödenmemiş faturaları otomatize etmek için "
+"kullanılan modüllerdir.\n"
+"\n"
+"    Bu menüden anımsatmaların çoklu seviyelerini tanımlayabilirsiniz :\n"
+"        Muhasebe/Yapılandırma/Çeşitli/İzlemeler\n"
+"\n"
+"    Bir kez tanımlandıktan sonra menüden basit bir tıklamayla\n"
+"    anımsatmaları hergün otomatik olarak yazdırabilirsiniz:\n"
+"        Muhasebe/Periyodik İşlemler/Faturalama/İzlemeleri Gönder\n"
+"\n"
+"    Tanımlanan çeşitli seviyelere göre bütün mektupların birer PDF\n"
+"    suretlerini oluşturur. Farklı şirketler için farklı politikalar\n"
+"    tanımlayabilirsiniz. Müşteriye posta olarak ta gönderebilirsiniz.\n"
+"\n"
+"   Eğer bir paydaş/hesap kaydı izleme seviyesini değiştirmek isterseniz, "
+"bunu aşağıda belirtilen menüden yapabilirsiniz :\n"
+"        Muhasebe/Raporlama/Genel Raporlama/Paydaş Hesapları/Gönderilen "
+"İzlemeler\n"
+"\n"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
-msgstr "Grupla..."
+msgstr "Gruplandır..."
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:290
@@ -67,12 +87,17 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"\n"
+"\n"
+"Aşağıdaki Paydaşlara  Eposta başarılı bir şekildegönderilmiştir. !\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
 msgid "Follow-Up"
-msgstr "İş Takipçisi"
+msgstr "İzleme"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -90,13 +115,14 @@ msgstr "Fatura Tarihi"
 #. module: account_followup
 #: field:account.followup.print.all,email_subject:0
 msgid "Email Subject"
-msgstr "E-Mail Konusu"
+msgstr "Eposta Konusu"
 
 #. 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 ""
+"Ödenmemiş faturalar için paydaşlarınıza gönderilen anımsatmaları izleyin."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -112,38 +138,38 @@ msgstr "Tamam"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Select Partners to Remind"
-msgstr "Hatırlatmak için İş Ortağı seç"
+msgstr "Anımsatma yapılacak Paydaşı seç"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Kapanmış bir hesap için hareket yaratamazsınız."
 
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
-msgstr "İş Takibi Gönderim Tarihi"
+msgstr "İzleme Gönderim Tarihi"
 
 #. module: account_followup
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Hesap girişindeki alacak ya da Borç değeri hatalı !"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
-msgstr ""
+msgstr "Net Gün Sayısı"
 
 #. 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 "İş Takipçisi"
+msgstr "İzlemeler"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
-msgstr ""
+msgstr "Bakiye > 0"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -153,18 +179,18 @@ msgstr "Toplam Borç"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(heading)s: Move line header"
-msgstr ""
+msgstr "%(başlık)lar: Hareket kalemi başlığı"
 
 #. module: account_followup
 #: view:res.company:0
 #: field:res.company,follow_up_msg:0
 msgid "Follow-up Message"
-msgstr "İş Takipçisi Mesajı"
+msgstr "İzleme Mesajı"
 
 #. module: account_followup
 #: field:account.followup.print,followup_id:0
 msgid "Follow-up"
-msgstr "Takip"
+msgstr "İzleme"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -176,7 +202,7 @@ msgstr "KDV :"
 #: field:account_followup.stat,partner_id:0
 #: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
-msgstr "Ortak"
+msgstr "Paydaş"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -186,18 +212,18 @@ msgstr "Tarih :"
 #. module: account_followup
 #: field:account.followup.print.all,partner_ids:0
 msgid "Partners"
-msgstr "Cari Kartlar"
+msgstr "Paydaşlar"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:138
 #, python-format
 msgid "Invoices Reminder"
-msgstr "Fatura Hatırlatıcısı"
+msgstr "Fatura Anımsatıcıs"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
-msgstr "Hesap Takibi"
+msgstr "Hesap İzleme"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
@@ -207,12 +233,12 @@ msgstr "Ay sonu"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
-msgstr ""
+msgstr "Dava açılmamış"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(user_signature)s: User name"
-msgstr ""
+msgstr "%(kullanıcı_imzası)ları: Kullanıcı Adı"
 
 #. module: account_followup
 #: field:account_followup.stat,debit:0
@@ -226,6 +252,9 @@ msgid ""
 "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 ""
+"Bu özellik paydaşlarınızın bekleyen faturaları için anımsatma göndermenizi "
+"sağlar. Ödenmeyen faturalar için varsayılan mesajı gönderebilir ya da özel "
+"bir bilgiyi onlara anımsatmak için elle bir mesaj girebilirsiniz."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -235,24 +264,24 @@ msgstr "Ref"
 #. module: account_followup
 #: help:account_followup.followup.line,sequence:0
 msgid "Gives the sequence order when displaying a list of follow-up lines."
-msgstr ""
+msgstr "İzleme satırlarını görüntülerken sıralamayı verir."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: field:account.followup.print.all,email_body:0
 msgid "Email body"
-msgstr "Email Mesaj Alanı"
+msgstr "Eposta gövdesi"
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 msgid "Follow-up Level"
-msgstr "Takip Seviyesi"
+msgstr "İzleme Seviyesi"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
 #: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
-msgstr "Son İş Takibi"
+msgstr "Son İzleme"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -277,27 +306,46 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Sayın %(paydaş_adı)ları,\n"
+"\n"
+"Size bir anımsatma göndermemize karşın ödemenizin ciddi olarak geciktiğini "
+"görmekten bizi hayal kırıklığına uğratmıştır.\n"
+"\n"
+"Acil olarak ödeme yapmanız gerekmektedir, aksi takdirde hesabınız kesilecek "
+"olup firmanıza bundan sonra (malzeme/hizmet) satışı yapılmayacaktır.\n"
+"Önümüzdeki 8 gün içerisinde, lütfen bu ödemenin yapılmasını sağlayın. \n"
+"\n"
+"Eğer bilmediğimiz bir sorun yüzünden bu ödeme yapılamıyorsa, lütfen muhasebe "
+"bölümümüzle(+32).10.68.94.39. den ilişkiye geçmekten çekinmeyin ki bu soruna "
+"hızlı bir şekilde çözüm bulalım.\n"
+"\n"
+"Geciken ödemenizle ilgili ayrıntılar aşağıda yazılmıştır.\n"
+"\n"
+"Saygılarımızla,\n"
 
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
-msgstr "E-Maili Carinin Dilinde Gönder"
+msgstr "Epostayı Paydaşın Dilinde Gönder"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Bir paydaş belirtmeden alacak/borç hesabı için hareket satırı "
+"oluşturmazsınız."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Partner Selection"
-msgstr "Cari Seçimi"
+msgstr "Paydaş Seçimi"
 
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
-msgstr ""
+msgstr "Yazılı Mesaj"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -306,18 +354,18 @@ msgstr ""
 #: 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 ""
+msgstr "İzlemeleri gönder"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Partner to Remind"
-msgstr ""
+msgstr "Anımsatma Gönderilecek Paydaş"
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
 msgid "Follow Ups"
-msgstr ""
+msgstr "İzlemeler"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line1
@@ -335,6 +383,19 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Sayın %(partner_name)lar,\n"
+"\n"
+"Aşağıda belirtilen tutar ödenmemiş görünmektedir, eğer bu bizim "
+"yanlışlığımız ise lütfen bu yazımızı dikkate almayın. İleriki 8 gün "
+"içersinde bu ödemenin yapılması için gereken hassasiyeti göstermenizi rica "
+"ederiz.\n"
+"\n"
+"Bu yazımızın gönderilmesinden sonra ödeme yaptıysanız lütfen bu yazımızı "
+"dikkate almayın. Muhasebe bölümüzle (+32).10.68.94.39. den görüşmekte lütfen "
+"tereddüt etmeyin.\n"
+"\n"
+"Saygılarımızla,\n"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
@@ -355,37 +416,52 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Sayın %(partner_name)lar,\n"
+"\n"
+"Bir kaç kez anımsatmamıza rağmen hesabınız hala düzeltilmemiştir.\n"
+"\n"
+"Eğer 8 gün içerisinde tam ödeme yapılmazsa, bir daha haber vermeksizin bu "
+"borcun ödenmesi için yasal yollara başvuracağımızı bilmenizi isteriz.\n"
+"\n"
+"Aşağıda belirtilen gecikmiş ödemenize ait bilgiler eminiz ki borcunuz "
+"hakkında size tam bilgi vermektedir.\n"
+"\n"
+"Sorularınız için muhasebe bölümümüzle (+32).10.68.94.39 den iletişime "
+"geçmekte terddüt etmeyiniz.\n"
+"\n"
+"Saygılarımızla,\n"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Send Mails"
-msgstr ""
+msgstr "Postaları Gönder"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Currency"
-msgstr ""
+msgstr "Para Birimi"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
 msgid "Followup Statistics by Partner"
-msgstr ""
+msgstr "Paydaşa göre İzleme İstatistikleri"
 
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
-msgstr ""
+msgstr "Muhasebe İzleme Yönetimi"
 
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
 msgid "Blocked"
-msgstr ""
+msgstr "Engellendi"
 
 #. 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 ""
+msgstr "Bu alan izlemelerinizin öngörü planını yapmanızı sağlar."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -396,7 +472,7 @@ msgstr "Vade"
 #: code:addons/account_followup/wizard/account_followup_print.py:56
 #, python-format
 msgid "Select Partners"
-msgstr ""
+msgstr "Paydaş Seçin"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -406,7 +482,7 @@ msgstr "E-mail Ayarları"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
-msgstr ""
+msgstr "İzlemeleri Yazdır"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
@@ -426,7 +502,7 @@ msgstr "Bakiye:"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Followup Statistics"
-msgstr ""
+msgstr "İzleme İstatistikleri"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -436,17 +512,17 @@ msgstr "Ödendi"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(user_signature)s: User Name"
-msgstr ""
+msgstr "%(kullanıcı_imza)lar: Kullanıcı Adı"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Yevmiye Kalemleri"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Firma bağlı olduğu hesap ve dönemle aynı olmalıdır."
 
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
@@ -461,11 +537,14 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Tüm E-postalar başarılı bir şeklide şu Paydaşlara gönderilmiştir:.\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Hata! Yinelemeli şirketler oluşturamazsınız."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -475,12 +554,12 @@ msgstr "%(company_name)s: Kullanıcının Firma Adı"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Firmalar"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Followup Lines"
-msgstr ""
+msgstr "İzleme Satırları"
 
 #. module: account_followup
 #: field:account_followup.stat,credit:0
@@ -490,12 +569,12 @@ msgstr "Alacak"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Maturity Date"
-msgstr ""
+msgstr "Vade Sonu Tarihi"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(partner_name)s: Partner Name"
-msgstr ""
+msgstr "%(paydaş_adı)lar: Paydaş Adı"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -505,7 +584,7 @@ msgstr "İş Takipçisi Ögeleri"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_currency)s: User's Company Currency"
-msgstr ""
+msgstr "%(firma_döviz)s: Kullanıcının Firmasının Para Birimi"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -517,29 +596,29 @@ msgstr "Bakiye"
 #. module: account_followup
 #: field:account_followup.followup.line,start:0
 msgid "Type of Term"
-msgstr ""
+msgstr "Koşul Türü"
 
 #. 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 ""
+msgstr "İzlemeleri Yazdır ve Müşterilere Postala"
 
 #. 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 ""
+msgstr "Son Hareket"
 
 #. module: account_followup
 #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
 msgid "Followup Report"
-msgstr ""
+msgstr "İzleme Raporu"
 
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Dönem"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -555,33 +634,33 @@ msgstr "İş Takipçisi Ögeleri"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
-msgstr ""
+msgstr "Hukuki Dava"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,max_followup_id:0
 msgid "Max Follow Up Level"
-msgstr ""
+msgstr "En Üst İzleme Seviyesi"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
 msgid "Payable Items"
-msgstr ""
+msgstr "Ödeme Maddeleri"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(followup_amount)s: Total Amount Due"
-msgstr ""
+msgstr "%(izleme_tutar)lar: Ödenmesi Gereken Toplam Tutar"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
 msgid "%(date)s: Current Date"
-msgstr ""
+msgstr "%(tarih)ler: Geçerli Tarih"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Followup Level"
-msgstr ""
+msgstr "İzleme Seviyesi"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -593,7 +672,7 @@ msgstr "Açıklama"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "This Fiscal year"
-msgstr ""
+msgstr "Bu Mali Yıl"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -606,18 +685,20 @@ msgid ""
 "Do not change message text, if you want to send email in partner language, "
 "or configure from company"
 msgstr ""
+"Paydaşa dili ile eposta göndermek istiyorsanız mesaj metinini değiştirmeyin, "
+"firma yapılandırmasını kullanın"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
 msgid "Receivable Items"
-msgstr ""
+msgstr "Alacak Maddeleri"
 
 #. 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 ""
+msgstr "Gönderilen İzlemeler"
 
 #. module: account_followup
 #: field:account_followup.followup,name:0
@@ -629,17 +710,17 @@ msgstr "Adı"
 #: field:account_followup.stat,date_move:0
 #: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
-msgstr ""
+msgstr "İlk Hareket"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Li."
-msgstr ""
+msgstr "Li."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Maturity"
-msgstr ""
+msgstr "Vade"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:289
@@ -649,6 +730,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Aşağıdaki Paydaşlara E-Posta gönderilmedi, Eposta yok !\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -663,7 +747,7 @@ msgstr "Gecikme Günleri"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
-msgstr ""
+msgstr "Belge: Müşteri hesap ekstresi"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -679,7 +763,7 @@ msgstr "Toplam Alacak"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(line)s: Ledger Posting lines"
-msgstr ""
+msgstr "%(satır)lar: Büyük Defter İşleme Kalemleri"
 
 #. module: account_followup
 #: field:account_followup.followup.line,sequence:0
@@ -689,32 +773,32 @@ msgstr "Sıra No"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(company_name)s: User's Company Name"
-msgstr ""
+msgstr "%(firma_adı)lar: Kullanıcının Firma Adı"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Customer Ref :"
-msgstr ""
+msgstr "Müşteri Ref :"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(partner_name)s: Partner name"
-msgstr ""
+msgstr "%(paydaş_adı)lar: Paydaş adı"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Latest Followup Date"
-msgstr ""
+msgstr "Son İzleme Tarihi"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
-msgstr ""
+msgstr "İzleme Kriteri"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "Hesap Görünümünde hareket oluşturamazsınız."
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
@@ -833,5 +917,21 @@ msgstr ""
 #~ msgstr ""
 #~ "\n"
 #~ "\n"
-#~ "E-posta aşağıdaki İş Ortaklarına başarıyla gönderildi. !\n"
+#~ "E-posta aşağıdaki Paydaşlara başarıyla gönderildi. !\n"
+#~ "\n"
+
+#, python-format
+#~ msgid ""
+#~ "All E-mails have been successfully sent to Partners:.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Bütün Epostalar Paydaşlara başarılı olarak gönderilmiştir.\n"
+#~ "\n"
+
+#, python-format
+#~ msgid ""
+#~ "E-Mail not sent to following Partners, Email not available !\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Aşağıdaki Paydaşa E-Posta gönderilemedi. E-Posta bulunamadı !\n"
 #~ "\n"
diff --git a/addons/account_followup/test/account_followup.yml b/addons/account_followup/test/account_followup.yml
index c69fdb112c6..b43ca32d200 100644
--- a/addons/account_followup/test/account_followup.yml
+++ b/addons/account_followup/test/account_followup.yml
@@ -1,8 +1,12 @@
 -
   In order to test account followup module in OpenERP I create a FollowUp structure
+-
+  !record {model: res.company, id: ymltest_company_2}:
+        name: Acme 2
 -
   !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'
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index a8608c2fdd0..18b0fc1b874 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -171,7 +171,7 @@ class account_followup_print_all(osv.osv_memory):
             "SELECT * "\
             "FROM account_followup_followup_line "\
             "WHERE followup_id=%s "\
-            "ORDER BY sequence", (fup_id,))
+            "ORDER BY delay", (fup_id,))
         for result in cr.dictfetchall():
             delay = datetime.timedelta(days=result['delay'])
             fups[old] = (current_date - delay, result['id'])
diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py
index 3337710420f..b0fb92c9abb 100644
--- a/addons/account_invoice_layout/account_invoice_layout.py
+++ b/addons/account_invoice_layout/account_invoice_layout.py
@@ -161,7 +161,7 @@ class account_invoice_line(osv.osv):
                 ('break','Page Break'),]
             ,'Type', select=True, required=True),
         'sequence': fields.integer('Sequence Number', help="Gives the sequence order when displaying a list of invoice lines."),
-        'functional_field': fields.function(_fnct, arg=None, fnct_inv=None, fnct_inv_arg=None, type='char', fnct_search=None, obj=None, method=True, store=False, string="Source Account"),
+        'functional_field': fields.function(_fnct, arg=None, fnct_inv=None, fnct_inv_arg=None, type='char', fnct_search=None, obj=None, store=False, string="Source Account"),
     }
 
     def _default_account(self, cr, uid, context=None):
diff --git a/addons/account_payment/account_invoice.py b/addons/account_payment/account_invoice.py
index 1f882b48421..fd787863c7d 100644
--- a/addons/account_payment/account_invoice.py
+++ b/addons/account_payment/account_invoice.py
@@ -42,7 +42,7 @@ class Invoice(osv.osv):
         return res
 
     _columns = {
-        'amount_to_pay': fields.function(_amount_to_pay, method=True,
+        'amount_to_pay': fields.function(_amount_to_pay,
             type='float', string='Amount to be paid',
             help='The amount which should be paid at the current date\n' \
                     'minus the amount which is already in payment order'),
diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index 68bb33ca4e5..24f9486be95 100644
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -111,7 +111,7 @@ class account_move_line(osv.osv):
         return line2bank
 
     _columns = {
-        'amount_to_pay': fields.function(amount_to_pay, method=True,
+        'amount_to_pay': fields.function(amount_to_pay,
             type='float', string='Amount to pay', fnct_search=_to_pay_search),
     }
 
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 19de746b7c9..9858d536d17 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -96,7 +96,7 @@ class payment_order(osv.osv):
             ('done', 'Done')], 'State', select=True,
             help='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\'.'),
         'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}),
-        'total': fields.function(_total, string="Total", method=True, type='float'),
+        'total': fields.function(_total, string="Total", type='float'),
         'user_id': fields.many2one('res.users', 'User', required=True, states={'done': [('readonly', True)]}),
         'date_prefered': fields.selection([
             ('now', 'Directly'),
@@ -344,14 +344,14 @@ class payment_line(osv.osv):
             ondelete='cascade', select=True),
         'partner_id': fields.many2one('res.partner', string="Partner", required=True, help='The Ordering Customer'),
         'amount': fields.function(_amount, string='Amount in Company Currency',
-            method=True, type='float',
+            type='float',
             help='Payment amount in the company currency'),
         'ml_date_created': fields.function(_get_ml_created_date, string="Effective Date",
-            method=True, type='date', help="Invoice Effective Date"),
-        'ml_maturity_date': fields.function(_get_ml_maturity_date, method=True, type='date', string='Due Date'),
-        'ml_inv_ref': fields.function(_get_ml_inv_ref, method=True, type='many2one', relation='account.invoice', string='Invoice Ref.'),
-        'info_owner': fields.function(info_owner, string="Owner Account", method=True, type="text", help='Address of the Main Partner'),
-        'info_partner': fields.function(info_partner, string="Destination Account", method=True, type="text", help='Address of the Ordering Customer.'),
+            type='date', help="Invoice Effective Date"),
+        'ml_maturity_date': fields.function(_get_ml_maturity_date, type='date', string='Due Date'),
+        'ml_inv_ref': fields.function(_get_ml_inv_ref, type='many2one', relation='account.invoice', string='Invoice Ref.'),
+        'info_owner': fields.function(info_owner, string="Owner Account", type="text", help='Address of the Main Partner'),
+        'info_partner': fields.function(info_partner, string="Destination Account", type="text", help='Address of the Ordering Customer.'),
         'date': fields.date('Payment Date', help="If no payment date is specified, the bank will treat this payment line directly"),
         'create_date': fields.datetime('Created', readonly=True),
         'state': fields.selection([('normal','Free'), ('structured','Structured')], 'Communication Type', required=True),
diff --git a/addons/account_payment/i18n/tr.po b/addons/account_payment/i18n/tr.po
index 4983e5deb73..e3f782b3d7d 100644
--- a/addons/account_payment/i18n/tr.po
+++ b/addons/account_payment/i18n/tr.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:14+0000\n"
-"PO-Revision-Date: 2011-05-16 21:36+0000\n"
+"PO-Revision-Date: 2011-05-29 17:44+0000\n"
 "Last-Translator: Ayhan KIZILTAN <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-05-17 04:40+0000\n"
+"X-Launchpad-Export-Date: 2011-05-30 04:58+0000\n"
 "X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_payment
@@ -85,7 +85,7 @@ msgstr ""
 msgid ""
 "The amount which should be paid at the current date\n"
 "minus the amount which is already in payment order"
-msgstr ""
+msgstr "Geçerli tarihte ödenecek tutar hali hazırda ödenmiş tutardan düşülür"
 
 #. module: account_payment
 #: field:payment.mode,company_id:0
@@ -137,7 +137,7 @@ msgstr "_Ödeme emrine ekle"
 #: 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 ""
+msgstr "Ödeme Doldurma cetveli"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -148,12 +148,12 @@ msgstr "Miktar"
 #. module: account_payment
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Hesap girişindeki alacak ya da borç değeri hatalı !"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Total in Company Currency"
-msgstr ""
+msgstr "Firma Para Biriminde Toplam"
 
 #. module: account_payment
 #: selection:payment.order,state:0
@@ -174,7 +174,7 @@ msgstr "Referans"
 #. module: account_payment
 #: sql_constraint:payment.line:0
 msgid "The payment line name must be unique!"
-msgstr ""
+msgstr "Ödeme satırı adı eşsiz olmalı!"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
@@ -185,7 +185,7 @@ msgstr "Ödeme Emirleri"
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Directly"
-msgstr ""
+msgstr "Doğrudan"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_line_form
@@ -193,12 +193,12 @@ msgstr ""
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Payment Line"
-msgstr ""
+msgstr "Ödeme Satırı"
 
 #. module: account_payment
 #: view:payment.line:0
 msgid "Amount Total"
-msgstr ""
+msgstr "Toplam Tutar"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -214,12 +214,12 @@ msgstr "Fatura İşlem Tarihi"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Execution Type"
-msgstr ""
+msgstr "Yürütme Türü"
 
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Structured"
-msgstr ""
+msgstr "Yapılandırılmış"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -231,7 +231,7 @@ msgstr "Durum"
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Transaction Information"
-msgstr ""
+msgstr "İşlem Bilgisi"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
@@ -245,7 +245,7 @@ msgstr "Ödeme Biçimi"
 #. module: account_payment
 #: field:payment.line,ml_date_created:0
 msgid "Effective Date"
-msgstr ""
+msgstr "Yürürlük Tarihi"
 
 #. module: account_payment
 #: field:payment.line,ml_inv_ref:0
@@ -259,12 +259,15 @@ msgid ""
 "by you.'Directly' stands for the direct execution.'Due date' stands for the "
 "scheduled date of execution."
 msgstr ""
+"Ödeme Emri için bir seçenek belirleyin: 'Sabit! sizin tarafınızdan "
+"belirlenmiş bir gün içindir. 'Doğrudan' doğrudan yürütme içindir. 'Vade "
+"Tarihi' yürütmenin planlandığı tarihtir."
 
 #. module: account_payment
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Hata!"
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -274,17 +277,17 @@ msgstr "Toplam Borç"
 #. module: account_payment
 #: field:payment.order,date_done:0
 msgid "Execution date"
-msgstr ""
+msgstr "Yürütme tarihi"
 
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Bank or Cash Journal for the Payment Mode"
-msgstr ""
+msgstr "Ödeme Biçimi için Banka ya da Kasa Yevmiyesi"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Fixed date"
-msgstr ""
+msgstr "Sabit tarih"
 
 #. module: account_payment
 #: field:payment.line,info_partner:0
@@ -300,13 +303,15 @@ msgstr "Hesap Kartı"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Search Payment Orders"
-msgstr ""
+msgstr "Ödeme Emri Ara"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Bir paydaş belirtmeden alacak/borç hesabı için hareket satırı "
+"oluşturmazsınız."
 
 #. module: account_payment
 #: field:payment.line,create_date:0
@@ -316,22 +321,22 @@ msgstr "Oluşturuldu"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Select Invoices to Pay"
-msgstr ""
+msgstr "Ödenecek Faturaları Seç"
 
 #. module: account_payment
 #: view:payment.line:0
 msgid "Currency Amount Total"
-msgstr ""
+msgstr "Para Birimi Toplam Tutarı"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Make Payments"
-msgstr ""
+msgstr "Ödeme Yap"
 
 #. module: account_payment
 #: field:payment.line,state:0
 msgid "Communication Type"
-msgstr ""
+msgstr "İletişim Türü"
 
 #. module: account_payment
 #: model:ir.module.module,shortdesc:account_payment.module_meta_information
@@ -341,32 +346,32 @@ msgstr "Ödeme Yönetimi"
 #. module: account_payment
 #: field:payment.line,bank_statement_line_id:0
 msgid "Bank statement line"
-msgstr ""
+msgstr "Banka ekstre kalemi"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Due date"
-msgstr ""
+msgstr "Vade Tarihi"
 
 #. module: account_payment
 #: field:account.invoice,amount_to_pay:0
 msgid "Amount to be paid"
-msgstr ""
+msgstr "Ödenecek tutar"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Currency"
-msgstr ""
+msgstr "Para birimi"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Yes"
-msgstr ""
+msgstr "Evet"
 
 #. module: account_payment
 #: help:payment.line,info_owner:0
 msgid "Address of the Main Partner"
-msgstr ""
+msgstr "Ana Paydaş Adresi"
 
 #. module: account_payment
 #: help:payment.line,date:0
@@ -374,21 +379,23 @@ msgid ""
 "If no payment date is specified, the bank will treat this payment line "
 "directly"
 msgstr ""
+"Eğer bir ödeme tarihi belirlenmemişse banka bu ödeme kalemini doğrudan "
+"işleme koyar"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_populate_statement
 msgid "Account Payment Populate Statement"
-msgstr ""
+msgstr "Hesap Ödeme Doldurma Cetveli"
 
 #. module: account_payment
 #: help:payment.mode,name:0
 msgid "Mode of Payment"
-msgstr ""
+msgstr "Ödeme Biçimi"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Value Date"
-msgstr ""
+msgstr "Valör Tarihi"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -398,7 +405,7 @@ msgstr "Ödeme Tipi"
 #. module: account_payment
 #: help:payment.line,amount_currency:0
 msgid "Payment amount in the partner currency"
-msgstr ""
+msgstr "Paydaş para biriminde ödeme tutarı"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -409,23 +416,23 @@ msgstr "Taslak"
 #. module: account_payment
 #: help:payment.line,communication2:0
 msgid "The successor message of Communication."
-msgstr ""
+msgstr "İletişim ardış mesajı"
 
 #. module: account_payment
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "No partner defined on entry line"
-msgstr ""
+msgstr "Bu kalemde paydaş tanımlanmamış"
 
 #. module: account_payment
 #: help:payment.line,info_partner:0
 msgid "Address of the Ordering Customer."
-msgstr ""
+msgstr "Sipariş Veren Müşteri Adresi."
 
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "Populate Statement:"
-msgstr ""
+msgstr "Doldurma Cetveli:"
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -435,7 +442,7 @@ msgstr "Toplam Alacak"
 #. module: account_payment
 #: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
-msgstr ""
+msgstr "Tercih Edilen Tarihi sabitlemeyi seçtiyseniz bir tarih belirleyin."
 
 #. module: account_payment
 #: field:payment.order,user_id:0
@@ -446,17 +453,17 @@ msgstr "Kullanıcı"
 #: 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 ""
+msgstr "Ödeme Kalemleri"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Yevmiye Kalemleri"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Firma bağlı olduğu hesap ve dönemle aynı olmalıdır."
 
 #. module: account_payment
 #: help:payment.line,move_line_id:0
@@ -464,11 +471,12 @@ msgid ""
 "This Entry Line will be referred for the information of the ordering "
 "customer."
 msgstr ""
+"Bu Giriş Kalemi sipariş veren müşteri bilgisi olarak değerlendirilecektir."
 
 #. module: account_payment
 #: view:payment.order.create:0
 msgid "Search"
-msgstr ""
+msgstr "Ara"
 
 #. module: account_payment
 #: model:ir.actions.report.xml,name:account_payment.payment_order1
@@ -484,7 +492,7 @@ msgstr "Ödeme Tarihi"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Total:"
-msgstr ""
+msgstr "Toplam:"
 
 #. module: account_payment
 #: field:payment.order,date_created:0
@@ -494,12 +502,12 @@ msgstr "Oluşturma Tarihi"
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "ADD"
-msgstr ""
+msgstr "EKLE"
 
 #. module: account_payment
 #: view:account.bank.statement:0
 msgid "Import payment lines"
-msgstr ""
+msgstr "Ödeme kalemleri içeaktar"
 
 #. module: account_payment
 #: field:account.move.line,amount_to_pay:0
@@ -509,22 +517,22 @@ msgstr "Ödeme Tutarı"
 #. module: account_payment
 #: field:payment.line,amount:0
 msgid "Amount in Company Currency"
-msgstr ""
+msgstr "Firma Para Biriminde Tutar"
 
 #. module: account_payment
 #: help:payment.line,partner_id:0
 msgid "The Ordering Customer"
-msgstr ""
+msgstr "Sipariş Veren Müşteri"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_make_payment
 msgid "Account make payment"
-msgstr ""
+msgstr "Hesap ödeme yapar"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Invoice Ref"
-msgstr ""
+msgstr "Fatura Ref."
 
 #. module: account_payment
 #: field:payment.line,name:0
@@ -556,12 +564,12 @@ msgstr "Bitti"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Fatura"
 
 #. module: account_payment
 #: field:payment.line,communication:0
 msgid "Communication"
-msgstr ""
+msgstr "İletişim"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
@@ -585,11 +593,15 @@ 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 ""
+"Bir ödeme emri, firmanızın bir tedarikçi faturasını ya da müşteri alacak "
+"dekontunu ödeme isteğidir. Burada yapılacak bütün öedeme emirlerini "
+"kaydedebilirsiniz, bütün ödeme emirlerinizi izleyebilir, fatura referansı ve "
+"hangi paydaş ödeme yapılacağını işleyebilirsiniz."
 
 #. module: account_payment
 #: help:payment.line,amount:0
 msgid "Payment amount in the company currency"
-msgstr ""
+msgstr "Firma para biriminde ödeme tutarı"
 
 #. module: account_payment
 #: view:payment.order.create:0
@@ -599,22 +611,22 @@ msgstr "Ödeme Kalemlerinde Ara"
 #. module: account_payment
 #: field:payment.line,amount_currency:0
 msgid "Amount in Partner Currency"
-msgstr ""
+msgstr "Paydaş Para Biriminde Tutar"
 
 #. module: account_payment
 #: field:payment.line,communication2:0
 msgid "Communication 2"
-msgstr ""
+msgstr "İletişim 2"
 
 #. module: account_payment
 #: field:payment.line,bank_id:0
 msgid "Destination Bank account"
-msgstr ""
+msgstr "Hedef Banka Hesabı"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Are you sure you want to make payment?"
-msgstr ""
+msgstr "Ödeme yapmak istediğinizden emin misiniz?"
 
 #. module: account_payment
 #: view:payment.mode:0
@@ -648,12 +660,12 @@ msgstr "Ödeme"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Payment Order / Payment"
-msgstr ""
+msgstr "Ödeme Emri / Ödeme"
 
 #. module: account_payment
 #: field:payment.line,move_line_id:0
 msgid "Entry line"
-msgstr ""
+msgstr "Giriş Kalemi"
 
 #. module: account_payment
 #: help:payment.line,communication:0
@@ -661,6 +673,8 @@ 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 ""
+"Sipatiş veren müşteri ile geçerli firma arasında kullanılan mesajdır. 'Bu "
+"siparile ilgili olarak alıcıya ne söyleme istersiniz?' anlamındadır."
 
 #. module: account_payment
 #: field:payment.mode,name:0
@@ -670,23 +684,23 @@ msgstr "Adı"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Banka Hesabı"
 
 #. module: account_payment
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Entry Information"
-msgstr ""
+msgstr "Giriş Bilgisi"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_payment_order_create
 msgid "payment.order.create"
-msgstr ""
+msgstr "ödeme.emir.oluştur"
 
 #. module: account_payment
 #: field:payment.line,order_id:0
 msgid "Order"
-msgstr ""
+msgstr "Emir"
 
 #. module: account_payment
 #: field:payment.order,total:0
@@ -697,7 +711,7 @@ msgstr "Toplam"
 #: view:account.payment.make.payment:0
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
 msgid "Make Payment"
-msgstr ""
+msgstr "Ödeme Yap"
 
 #. module: account_payment
 #: field:payment.line,partner_id:0
@@ -708,7 +722,7 @@ msgstr "Ortak"
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_create_payment_order
 msgid "Populate Payment"
-msgstr ""
+msgstr "Ödeme Doldur"
 
 #. module: account_payment
 #: help:payment.mode,bank_id:0
@@ -718,7 +732,7 @@ msgstr "Ödeme Yönetimi için Banka Hesabı"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "Hesap Görünümünde hareket oluşturamazsınız."
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/account_payment/i18n/vi.po b/addons/account_payment/i18n/vi.po
index 0954aadfbd0..ce9038a0c16 100644
--- a/addons/account_payment/i18n/vi.po
+++ b/addons/account_payment/i18n/vi.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-01-12 19:47+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-06-04 22:07+0000\n"
+"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-05 04:35+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -30,7 +30,7 @@ msgstr "Loại tiền của đối tác"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Set to draft"
-msgstr ""
+msgstr "Đặt thành Nháp"
 
 #. module: account_payment
 #: help:payment.order,mode:0
@@ -56,14 +56,14 @@ msgstr ""
 #. module: account_payment
 #: field:payment.order,line_ids:0
 msgid "Payment lines"
-msgstr ""
+msgstr "Các dòng thanh toán"
 
 #. module: account_payment
 #: view:payment.line:0
 #: field:payment.line,info_owner:0
 #: view:payment.order:0
 msgid "Owner Account"
-msgstr ""
+msgstr "Tài khoản Chủ sở hữu"
 
 #. module: account_payment
 #: help:payment.order,state:0
@@ -173,7 +173,7 @@ msgstr ""
 #: 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 ""
+msgstr "Các Lệnh Thanh toán"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
@@ -186,7 +186,7 @@ msgstr "Trực tiếp"
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Payment Line"
-msgstr ""
+msgstr "Dòng Thanh toán"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -262,12 +262,12 @@ msgstr "Lỗi !"
 #. module: account_payment
 #: view:account.move.line:0
 msgid "Total debit"
-msgstr ""
+msgstr "Tổng nợ"
 
 #. module: account_payment
 #: field:payment.order,date_done:0
 msgid "Execution date"
-msgstr ""
+msgstr "Ngày thực hiện"
 
 #. module: account_payment
 #: help:payment.mode,journal:0
@@ -293,7 +293,7 @@ msgstr "Tài khoản đích"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Search Payment Orders"
-msgstr ""
+msgstr "Tìm kiếm các Lệnh Thanh toán"
 
 #. module: account_payment
 #: constraint:account.move.line:0
@@ -467,7 +467,7 @@ msgstr "Tìm kiếm"
 #: model:ir.actions.report.xml,name:account_payment.payment_order1
 #: model:ir.model,name:account_payment.model_payment_order
 msgid "Payment Order"
-msgstr ""
+msgstr "Lệnh thanh toán"
 
 #. module: account_payment
 #: field:payment.line,date:0
@@ -613,7 +613,7 @@ msgstr ""
 #: view:payment.mode:0
 #: field:payment.mode,journal:0
 msgid "Journal"
-msgstr ""
+msgstr "Sổ nhật ký"
 
 #. module: account_payment
 #: field:payment.mode,bank_id:0
diff --git a/addons/account_sequence/account_sequence_installer_view.xml b/addons/account_sequence/account_sequence_installer_view.xml
index 1051b133045..b39521d3c01 100644
--- a/addons/account_sequence/account_sequence_installer_view.xml
+++ b/addons/account_sequence/account_sequence_installer_view.xml
@@ -49,8 +49,10 @@
 
     <record id="account_seq_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_account_seq_installer"/>
+      <field name="category_id" ref="account.category_accounting_configuration"/>
       <field name="sequence">3</field>
-      <field name="restart">onskip</field>
+      <field name="type">special</field>
+      <field name="state">skip</field>
     </record>
 
   </data>
diff --git a/addons/account_sequence/i18n/nb.po b/addons/account_sequence/i18n/nb.po
new file mode 100644
index 00000000000..f77793fcb3e
--- /dev/null
+++ b/addons/account_sequence/i18n/nb.po
@@ -0,0 +1,221 @@
+# Norwegian Bokmal 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-06-24 11:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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-06-25 04:59+0000\n"
+"X-Generator: Launchpad (build 13168)\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 "Internt sekvensnummer"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr "Neste nummer på denne sekvensen"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Neste nummer"
+
+#. 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/tr.po b/addons/account_sequence/i18n/tr.po
new file mode 100644
index 00000000000..2c9c5ff733d
--- /dev/null
+++ b/addons/account_sequence/i18n/tr.po
@@ -0,0 +1,232 @@
+# Turkish 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-05-29 17:45+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"Language-Team: Turkish <tr@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-05-30 04:59+0000\n"
+"X-Generator: Launchpad (build 12959)\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 "Hesap Dizisi Uygulama Yapılandırması"
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create entries on different periods/journals in the same move"
+msgstr ""
+"Aynı hareket için farklı dönemler/yevmiyeler e ait girişler oluşturamazsınız."
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr "İç Dizi Sayısı"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr "Bu dizinin sonraki sayısı"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Sonraki Sayı"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Artış Sayısı"
+
+#. 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 ""
+"\n"
+"    Bu modül hesap girişleri için iç dizi sayısını verir.\n"
+"    "
+
+#. module: account_sequence
+#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
+msgid "Entries Sequence Numbering"
+msgstr "Giriş Dizi Numaralandırılması"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr "Bu diziye ait bir sonraki sayı bu rakam arttırılarak oluşur."
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr "Hesap Dizisi Uygulamanızı yapılandırın"
+
+#. module: account_sequence
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Yapılandırma İlerleyişi"
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr "Dizi için kaydın sonek değeri"
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. 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 ""
+"Bu dizi, bu yevmiyeyle ilgili yevmiye girişlerinin iç sayısını belirler."
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr "Sayı doldurma"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr "Yevmiye Kalemleri"
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr "İç Sayı"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr "Firma bağlı olduğu hesap ve dönemle aynı olmalıdır."
+
+#. 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 ""
+"OpenERP gerekli rakam sayısını tamamlamak için 'Sonraki Sayı' nın soluna "
+"gerektiği kadar '0' ekleyecektir."
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr "Ad"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "Kapalı hesaplarda hareket satırı oluşturamazsınız."
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr ""
+"Merkezilendirilmiş yevmiyelerde bir dönem için birden fazla hareket "
+"yaratamazsınız."
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Hesap girişindeki alacak ya da borç değeri hatalı !"
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr "İç Dizi"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr "hesap.dizi.kurucu"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "Yapılandır"
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr "Dizi için önek değeri"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr "Hesap Girişi"
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr "Sonek"
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr "Resim"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr "unvan"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Yevmiye adı her firmada benzersiz olmalı."
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr "Önek"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Yevmiye kodu her firma için benzersiz olmalı."
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+"Bir paydaş belirtmeden alacak/borç hesabı için hareket satırı "
+"oluşturmazsınız."
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr "Yevmiye"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr "Hesap Dizisi Uygulamasını kurarak geliştirebilirsiniz."
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr "Hesap Görünümünde hareket oluşturamazsınız."
diff --git a/addons/account_sequence/i18n/vi.po b/addons/account_sequence/i18n/vi.po
new file mode 100644
index 00000000000..45e64e186ea
--- /dev/null
+++ b/addons/account_sequence/i18n/vi.po
@@ -0,0 +1,221 @@
+# Vietnamese 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-05-25 14:15+0000\n"
+"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
+"Language-Team: Vietnamese <vi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-05-26 04:36+0000\n"
+"X-Generator: Launchpad (build 12959)\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 "Số tiếp theo trong dãy"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Số tiếp theo"
+
+#. 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 "Công ty"
+
+#. 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 "Tên"
+
+#. 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 "account.sequence.installer"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "Cấu hình"
+
+#. 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 "Hậu tố"
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr "Hình ảnh"
+
+#. 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 "Tên của sổ nhật ký phải duy nhất cho mỗi công ty !"
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr "Tiền tố"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Mã của sổ nhật ký phải duy nhất cho mỗi công ty !"
+
+#. 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 "Sổ nhật ký"
+
+#. 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_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index b4422cd8051..dee3d81832b 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -226,7 +226,7 @@ class account_voucher(osv.osv):
         'writeoff_acc_id': fields.many2one('account.account', 'Write-Off account', readonly=True, states={'draft': [('readonly', False)]}),
         'comment': fields.char('Write-Off Comment', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'analytic_id': fields.many2one('account.analytic.account','Write-Off Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
-        'writeoff_amount': fields.function(_get_writeoff_amount, method=True, string='Write-Off Amount', type='float', readonly=True),
+        'writeoff_amount': fields.function(_get_writeoff_amount, string='Write-Off Amount', type='float', readonly=True),
     }
     _defaults = {
         'period_id': _get_period,
@@ -845,8 +845,8 @@ class account_voucher_line(osv.osv):
         'move_line_id': fields.many2one('account.move.line', 'Journal Item'),
         'date_original': fields.related('move_line_id','date', type='date', relation='account.move.line', string='Date', readonly=1),
         'date_due': fields.related('move_line_id','date_maturity', type='date', relation='account.move.line', string='Due Date', readonly=1),
-        'amount_original': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Original Amount', store=True),
-        'amount_unreconciled': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Open Balance', store=True),
+        'amount_original': fields.function(_compute_balance, multi='dc', type='float', string='Original Amount', store=True),
+        'amount_unreconciled': fields.function(_compute_balance, multi='dc', type='float', string='Open Balance', store=True),
         'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True, readonly=True),
     }
     _defaults = {
@@ -991,7 +991,7 @@ class account_bank_statement_line(osv.osv):
 
     _columns = {
         'amount_reconciled': fields.function(_amount_reconciled,
-            string='Amount reconciled', method=True, type='float'),
+            string='Amount reconciled', type='float'),
         'voucher_id': fields.many2one('account.voucher', 'Payment'),
 
     }
diff --git a/addons/account_voucher/i18n/pt_BR.po b/addons/account_voucher/i18n/pt_BR.po
index 994503f1842..28940ce2349 100644
--- a/addons/account_voucher/i18n/pt_BR.po
+++ b/addons/account_voucher/i18n/pt_BR.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: 2011-01-24 18:06+0000\n"
-"Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\n"
+"PO-Revision-Date: 2011-06-04 21:23+0000\n"
+"Last-Translator: Emerson <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-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-05 04:35+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,10 +22,10 @@ msgid "Unreconciliation transactions"
 msgstr "Transações não conciliadas"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
-msgstr ""
+msgstr "Ajuste"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr "Agrupar Por..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr "Impossível apagar Comprovante(s) ja Abertos ou Pagos !"
@@ -88,7 +88,7 @@ msgid "Bill Payment"
 msgstr "Pagamento de Conta"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: 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!"
@@ -302,7 +302,7 @@ msgstr "Valor (por extenso)"
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,nbr:0
 msgid "# of Voucher Lines"
-msgstr ""
+msgstr "# de Linhas do Comprovante"
 
 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
@@ -348,12 +348,12 @@ msgstr "Na Conta de:"
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Write-Off Amount"
-msgstr ""
+msgstr "Valor do Ajuste"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Lines"
-msgstr ""
+msgstr "Linhas das Vendas"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -387,7 +387,7 @@ msgstr "Tipo"
 #. module: account_voucher
 #: field:account.voucher.unreconcile,remove:0
 msgid "Want to remove accounting entries too ?"
-msgstr ""
+msgstr "Deseja remover os lançamentos contábeis também?"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -396,7 +396,7 @@ msgid "Voucher Entries"
 msgstr "Lançamento de Comprovantes"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Erro !"
@@ -421,10 +421,10 @@ msgstr "Comentário"
 #: 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 ""
+msgstr "Recibo de Vendas"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Ação invalida !"
@@ -432,7 +432,7 @@ msgstr "Ação invalida !"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Information"
-msgstr ""
+msgstr "Informação de Cobrança"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -442,7 +442,7 @@ msgstr "Julho"
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation"
-msgstr ""
+msgstr "Desconciliação"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -458,7 +458,7 @@ msgid "Pay Invoice"
 msgstr "Pagar Fatura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Sem conta para Base e Imposto!"
@@ -517,6 +517,7 @@ msgstr "Dezembro"
 
 #. 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 "Linhas do Comprovante"
@@ -568,7 +569,7 @@ msgstr "Provisório"
 #. module: account_voucher
 #: field:account.voucher,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr ""
+msgstr "Conta de ajuste"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -665,7 +666,7 @@ msgstr "Valor Reconciliado"
 #. module: account_voucher
 #: field:account.voucher,analytic_id:0
 msgid "Write-Off Analytic Account"
-msgstr ""
+msgstr "Conta Analítica dos Ajustes"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
@@ -705,7 +706,7 @@ msgid "Credit"
 msgstr "Crédito"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr "Favor definir a seqüencia no Livro !"
@@ -745,7 +746,7 @@ msgstr "Total sem Impostos"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Date"
-msgstr ""
+msgstr "Data de Cobrança"
 
 #. module: account_voucher
 #: help:account.voucher,state:0
@@ -869,7 +870,7 @@ msgstr "Quer Confirmar este Registro ?"
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Reconcile with Write-Off"
-msgstr ""
+msgstr "Reconciliar com Ajuste"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -959,7 +960,7 @@ msgstr "Faturas e Transações de Fornecedores Pendentes"
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Write-Off Comment"
-msgstr ""
+msgstr "Comentário do Ajuste"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index 1bb54f05090..9e1e7c0e8cb 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/i18n/tr.po
@@ -7,25 +7,25 @@ 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-01-15 22:23+0000\n"
-"Last-Translator: Arif Aydogmus <arifaydogmus@gmail.com>\n"
+"PO-Revision-Date: 2011-05-29 17:47+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-30 04:58+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation transactions"
-msgstr "Mutabakatsız hareketler"
+msgstr "Uzlaştırılmamış işlemler"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
-msgstr "Amortisman"
+msgstr "Borç Silme"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -35,29 +35,29 @@ msgstr "Ödeme Referansı"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Customer Journal Entries"
-msgstr "Açık Müşteri Yevmiye Girdileri"
+msgstr "Müşteri Yevmiye Girişlerini Aç"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Voucher Date"
-msgstr "Çek Tarihi"
+msgstr "Fiş Tarihi"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Particulars"
-msgstr ""
+msgstr "Ayrıntılar"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: view:sale.receipt.report:0
 msgid "Group By..."
-msgstr "Gruplama"
+msgstr "Gruplandır..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
-msgstr "Açık ya da ödenmiş çekler silinemez !"
+msgstr "Açık ya da ödenmiş fiş(ler) silinemez !"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -67,7 +67,7 @@ msgstr "Tedarikçi"
 #. module: account_voucher
 #: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_print
 msgid "Voucher Print"
-msgstr "Çek Yazdır"
+msgstr "Fiş Yazdır"
 
 #. module: account_voucher
 #: model:ir.module.module,description:account_voucher.module_meta_information
@@ -80,19 +80,27 @@ msgid ""
 "    * Cheque Register\n"
 "    "
 msgstr ""
+"Hesap Fişi Modülü aşağıdakilere ait tüm temel gereksinimleri içerir\n"
+"    Bankalar, Nakit, Satış, Satınalma, Gider, Karlıhesap, v.b...\n"
+"    * Fiş Girişi\n"
+"    * Tahsilat Fişi\n"
+"    * Çek Kayıtı\n"
+"    "
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
 msgid "Bill Payment"
-msgstr ""
+msgstr "Fatura Ödeme"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: 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 ""
+"'%s' Vergisi için temel hesap kodunu ve vergi hesap kodunu yapılandırmanız "
+"gerekir!"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
@@ -100,12 +108,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
 #, python-format
 msgid "Import Entries"
-msgstr "Girdileri İçe aktar"
+msgstr "Girişleri İçeaktar"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_voucher_unreconcile
 msgid "Account voucher unreconcile"
-msgstr ""
+msgstr "Hesap fişlerini uzlaştır"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -120,6 +128,9 @@ msgid ""
 "automatically and you can record the customer payment related to this sales "
 "receipt."
 msgstr ""
+"Bir müşteriye mal satarken ona satış fişi ya da fatura verebilirsiniz. Satış "
+"fişi onaylandığında yevmiye kalemleri otomatik olarak oluşturulur ve bu "
+"satış fişine ait müşteri ödemesini kayıt edebilirisiniz."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -132,27 +143,27 @@ msgstr "Fatura Öde"
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,company_id:0
 msgid "Company"
-msgstr "Şirket"
+msgstr "Firma"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Set to Draft"
-msgstr "Taslak olarak Ayarla"
+msgstr "Taslağa  Ayarla"
 
 #. module: account_voucher
 #: help:account.voucher,reference:0
 msgid "Transaction reference number."
-msgstr "Hareket referans numarası"
+msgstr "Hareket referans sayısı"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
 msgid "Unreconcile entries"
-msgstr "Mutabakatsız Girdiler"
+msgstr "Girişlerin Uzlaşmasını kaldır"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Statistics"
-msgstr "Çek İstatistikleri"
+msgstr "Fiş İstatistikleri"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -168,7 +179,7 @@ msgstr "Gün"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Search Vouchers"
-msgstr "Çek Arama"
+msgstr "Fiş Arama"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
@@ -181,7 +192,7 @@ msgstr "Satınalma"
 #: field:account.voucher.line,account_id:0
 #: field:sale.receipt.report,account_id:0
 msgid "Account"
-msgstr "Cari"
+msgstr "Hesap"
 
 #. module: account_voucher
 #: field:account.voucher,line_dr_ids:0
@@ -200,6 +211,9 @@ msgid ""
 "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 ""
+"Bu rapordan, müşterilerinize ait fatura tutarlarını ve gecikmiş ödemeleri "
+"gözden geçirebilirsiniz. Arama araçı ile de fatura raporlarını "
+"ihtiyaçlarınıza göre kişiselleştirebilirsiniz."
 
 #. module: account_voucher
 #: field:account.voucher,date_due:0
@@ -223,6 +237,10 @@ msgid ""
 "to you automatically the reconciliation of this payment with the open "
 "invoices or sales receipts."
 msgstr ""
+"Satış ödemesi müşterileriniz tarafından yapılan ödemeleri kayıt etmenizi "
+"sağlar. Bir ödemeyi kayıt etmek için müşteriyi, ödeme biçimini (=yevmiye) ve "
+"ödeme tutarını girmeniz gerekir. OpenERP size otomatik olarak bu hesabın "
+"açık faturalarıyla ve satış makbuzlarıyla uzlaştırılmasını önerir."
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
@@ -233,18 +251,18 @@ msgstr "Satış"
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
 msgid "Journal Item"
-msgstr "Yevmiye Öğesi"
+msgstr "Yevmiye Kalemi"
 
 #. module: account_voucher
 #: field:account.voucher,reference:0
 msgid "Ref #"
-msgstr "Referans #"
+msgstr "Ref No"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
 #: report:voucher.print:0
 msgid "Amount"
-msgstr "Toplam"
+msgstr "Tutar"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -276,13 +294,13 @@ msgstr "Banka Ekstresi Kalemi"
 #: 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 "Tedarikçi Çekleri"
+msgstr "Tedarikçi Fişleri"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: view:account.voucher.unreconcile:0
 msgid "Unreconcile"
-msgstr "Mutabakatı Kaldır"
+msgstr "Uzlaşmayı Kaldır"
 
 #. module: account_voucher
 #: field:account.voucher,tax_id:0
@@ -298,7 +316,7 @@ msgstr "Tutar (Yazıyla) :"
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,nbr:0
 msgid "# of Voucher Lines"
-msgstr "# Çek Kalemi"
+msgstr "Çek Satırı Sayısı"
 
 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
@@ -318,7 +336,7 @@ msgstr "Devam"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Paid Amount"
-msgstr "Ödeme Tutarı"
+msgstr "Ödenen Tutar"
 
 #. module: account_voucher
 #: view:account.bank.statement:0
@@ -328,23 +346,23 @@ msgstr "Faturaları İçe aktar"
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Account :"
-msgstr "Cari Hesap :"
+msgstr "Hesap :"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
 msgid "Receipt"
-msgstr "Alındı Makbuzu"
+msgstr "Makbuz"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "On Account of :"
-msgstr ""
+msgstr "Hesabında :"
 
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Write-Off Amount"
-msgstr "Amortisman Tutarı"
+msgstr "Borç Silme Tutarı"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -372,27 +390,27 @@ msgstr "Durum"
 #. module: account_voucher
 #: model:ir.module.module,shortdesc:account_voucher.module_meta_information
 msgid "Accounting Voucher Entries"
-msgstr "Muhasebe Fiş Kayıtları"
+msgstr "Muhasebe Fiş Girişleri"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,type:0
 msgid "Type"
-msgstr "Tip"
+msgstr "Tür"
 
 #. module: account_voucher
 #: field:account.voucher.unreconcile,remove:0
 msgid "Want to remove accounting entries too ?"
-msgstr "Hesap girdilerini de silmek ister misiniz?"
+msgstr "Hesap girişlerini de silmek ister misiniz?"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
 msgid "Voucher Entries"
-msgstr "Çek Kayıtları"
+msgstr "Fiş Girişleri"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Hata !"
@@ -400,12 +418,12 @@ msgstr "Hata !"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Voucher"
-msgstr "Tedarikçi Çeki"
+msgstr "Tedarikçi Fişi"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
 msgid "Vouchers Entries"
-msgstr "Çek Kayıtları"
+msgstr "Fiş Girişleri"
 
 #. module: account_voucher
 #: field:account.voucher,name:0
@@ -417,10 +435,10 @@ msgstr "Not"
 #: 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 ""
+msgstr "Satış Makbuzu"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Geçersiz İşlem !"
@@ -438,7 +456,7 @@ msgstr "Temmuz"
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation"
-msgstr "Mutabakatsız"
+msgstr "Uzlaşımayı Kaldırma"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -451,10 +469,10 @@ msgstr "Ort. Gecikme Vadesi"
 #: code:addons/account_voucher/invoice.py:32
 #, python-format
 msgid "Pay Invoice"
-msgstr "Fatura Ödemesi"
+msgstr "Fatura Ödeme"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Hesap kodu ve Vergi kodu yok !"
@@ -467,7 +485,7 @@ msgstr "Vergi Tutarı"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Entry"
-msgstr "Çek Kaydı"
+msgstr "Fiş Girişi"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -476,7 +494,7 @@ msgstr "Çek Kaydı"
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,partner_id:0
 msgid "Partner"
-msgstr "Cari"
+msgstr "Paydaş"
 
 #. module: account_voucher
 #: field:account.voucher,payment_option:0
@@ -488,7 +506,7 @@ msgstr "Ödeme Farkı"
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr "Çek tutarı banka ekstresi tutarı ile aynı olmalı"
+msgstr "Fiş tutarı banka ekstresi tutarı ile aynı olmalı"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -513,9 +531,10 @@ msgstr "Aralık"
 
 #. 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 "Çek Kalemleri"
+msgstr "Fiş Kalemleri"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -532,13 +551,13 @@ msgstr "Para Birimi"
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 msgid "Payable and Receivables"
-msgstr "Borçlar / Alacaklar"
+msgstr "Borçlar ve Alacaklar"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
 msgid "Pay Later or Group Funds"
-msgstr ""
+msgstr "Sonra Öde ya da Fonları Gruplandır"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -564,28 +583,28 @@ msgstr "Taslak"
 #. module: account_voucher
 #: field:account.voucher,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr "Amortisman Hesabı"
+msgstr "Borç Silme Hesabı"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Currency:"
-msgstr "Döviz Kuru:"
+msgstr "Para birimi:"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,price_total_tax:0
 msgid "Total With Tax"
-msgstr ""
+msgstr "Vergi Dahil Toplam"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PROFORMA"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Ağustos"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
@@ -595,36 +614,40 @@ msgid ""
 "the payment, OpenERP will propose to reconcile your payment with the open "
 "supplier invoices or bills."
 msgstr ""
+"Tedarikçi ödeme formu tefarikçilerinize yaptığınız ödemeleri izlemenizi "
+"sağlar. Bir tedarikçi, ödeme biçimi ve ödeme tutarı seçtiğinizde, OpenERP "
+"açık tedarikçi fatura ve fişlerinizin uzlaştırılmasını otomatik olarak "
+"önerir."
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Toplam Tutar"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Haziran"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
 msgid "Cr/Dr"
-msgstr ""
+msgstr "Cr/Dr"
 
 #. module: account_voucher
 #: field:account.voucher,audit:0
 msgid "Audit Complete ?"
-msgstr ""
+msgstr "Denetim Tamamlandı mı ?"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Terms"
-msgstr ""
+msgstr "Ödeme Koşulları"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile this record ?"
-msgstr ""
+msgstr "Bu kayıtın uzlaşmasını gerçekten kaldırmak istiyor musunuz ?"
 
 #. module: account_voucher
 #: field:account.voucher,date:0
@@ -636,60 +659,60 @@ msgstr "Tarih"
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Kasım"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: view:sale.receipt.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Genişletilmiş Süzgeçler..."
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Number:"
-msgstr ""
+msgstr "Sayı:"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,amount_reconciled:0
 msgid "Amount reconciled"
-msgstr ""
+msgstr "Uzlaşılan Tutar"
 
 #. module: account_voucher
 #: field:account.voucher,analytic_id:0
 msgid "Write-Off Analytic Account"
-msgstr ""
+msgstr "Borç Silme Analiz Hesabı"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
 msgid "Pay Directly"
-msgstr ""
+msgstr "Doğrudan Ödeme"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Ekim"
 
 #. module: account_voucher
 #: field:account.voucher,pre_line:0
 msgid "Previous Payments ?"
-msgstr ""
+msgstr "Öncek Ödemeler ?"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Ocak"
 
 #. 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 ""
+msgstr "Yevniye Fişleri"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Compute Tax"
-msgstr ""
+msgstr "Vergi Hesapla"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -697,47 +720,47 @@ msgid "Credit"
 msgstr "Alacak"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
-msgstr ""
+msgstr "Yevmiyede lütfen bir dizi tanımlayın !"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
-msgstr ""
+msgstr "Tedarikçi Yevmiye Girişlerini Aç"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Through :"
-msgstr ""
+msgstr "Yoluyla"
 
 #. 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 ""
+msgstr "Tedarikçi Ödemesi"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
-msgstr ""
+msgstr "İşle"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Invoices and outstanding transactions"
-msgstr ""
+msgstr "Faturalar ve Kapatılmamış İşlemler"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "Vergisiz Toplam"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Date"
-msgstr ""
+msgstr "Fatura Tarihi"
 
 #. module: account_voucher
 #: help:account.voucher,state:0
@@ -751,6 +774,13 @@ msgid ""
 "\n"
 "* The 'Cancelled' state is used when user cancel voucher."
 msgstr ""
+" * 'Taslak' durumu bir kullanıcı yeni ve uzlaştırılmamış bir fiş kodlarken "
+"kullanılır.                         \n"
+"* 'Proforma' durumu fiş Proforma durumundayken,henüz fişe bir fiş sayısı "
+"verilmemişken kullanılır.                         \n"
+"* 'İşlendi' durumu kullanıcı fiş oluştururken kullanılır, fiş sayısı "
+"oluşturulur ve hesapta fiş girişleri oluşturulur.\n"
+"* 'Vazgeçildi' kullanıcı fişi iptal ederken kullanılır."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -761,29 +791,29 @@ msgstr "Muhasebe Fişi"
 #. module: account_voucher
 #: field:account.voucher,number:0
 msgid "Number"
-msgstr ""
+msgstr "Sayı"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Banka Ekstresi"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Eylül"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Information"
-msgstr ""
+msgstr "Satış Bilgisi"
 
 #. 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 ""
+msgstr "Satış Makbuzları Analizi"
 
 #. module: account_voucher
 #: field:account.voucher.line,voucher_id:0
@@ -794,12 +824,12 @@ msgstr "Fiş"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Fatura"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Items"
-msgstr ""
+msgstr "Fiş Kalemleri"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -807,20 +837,20 @@ msgstr ""
 #: view:account.voucher:0
 #: view:account.voucher.unreconcile:0
 msgid "Cancel"
-msgstr "İptal"
+msgstr "Vazgeç"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
 #: view:sale.receipt.report:0
 #: selection:sale.receipt.report,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "Proforma"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,move_ids:0
 msgid "Journal Items"
-msgstr ""
+msgstr "Yevmiye Kalemleri"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -828,18 +858,18 @@ msgstr ""
 #: 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 ""
+msgstr "Müşteri Ödemesi"
 
 #. 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 ""
+msgstr "Ekstredeki Faturaları İçeaktar"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Pay"
-msgstr ""
+msgstr "Öde"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -849,17 +879,17 @@ msgstr "Borç"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to confirm this record ?"
-msgstr ""
+msgstr "Bu kayıtı onaylamak istediğinizden emin misiniz ?"
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Reconcile with Write-Off"
-msgstr ""
+msgstr "Borç Silmede Uzlaştırma"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Method"
-msgstr ""
+msgstr "Ödeme Biçimi"
 
 #. module: account_voucher
 #: field:account.voucher.line,name:0
@@ -869,12 +899,12 @@ msgstr "Açıklama"
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Canceled"
-msgstr "İptal Edildi"
+msgstr "Vazgeçildi"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayıs"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,journal_ids:0
@@ -888,23 +918,23 @@ msgstr "Yevmiye"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "İç Notlar"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,line_cr_ids:0
 msgid "Credits"
-msgstr ""
+msgstr "Alacaklar"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount_original:0
 msgid "Original Amount"
-msgstr ""
+msgstr "İlk Tutar"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "State:"
-msgstr ""
+msgstr "Durum:"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -915,7 +945,7 @@ msgstr ""
 #: field:sale.receipt.report,pay_now:0
 #: selection:sale.receipt.report,type:0
 msgid "Payment"
-msgstr ""
+msgstr "Ödeme"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -924,63 +954,63 @@ msgstr ""
 #: selection:sale.receipt.report,state:0
 #: report:voucher.print:0
 msgid "Posted"
-msgstr "Muhasebeleşti"
+msgstr "İşlendi"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Customer"
-msgstr ""
+msgstr "Müşteri"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Şubat"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Invoices and Outstanding transactions"
-msgstr ""
+msgstr "Tedarikçi Faturaları ve Kapatılmamış İşlemler"
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Write-Off Comment"
-msgstr ""
+msgstr "Borç Silme Açıklaması"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Nisan"
 
 #. module: account_voucher
 #: field:account.voucher,type:0
 msgid "Default Type"
-msgstr ""
+msgstr "Varsayılan Tür"
 
 #. 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 ""
+msgstr "Faturalardaki Kalemlere göre Girişler"
 
 #. module: account_voucher
 #: field:account.voucher,move_id:0
 msgid "Account Entry"
-msgstr ""
+msgstr "Hesap Girişi"
 
 #. module: account_voucher
 #: field:sale.receipt.report,state:0
 msgid "Voucher State"
-msgstr ""
+msgstr "Fiş Durumu"
 
 #. module: account_voucher
 #: help:account.voucher,date:0
 msgid "Effective date for accounting entries"
-msgstr ""
+msgstr "Hesap Girişleri için Yürürlük Tarihi"
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Keep Open"
-msgstr ""
+msgstr "Açık Tut"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -988,34 +1018,37 @@ 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 ""
+"Bu işlemlerin uzlaştırmasını kaldırırsanız, aynı zamanda bu işlemlere bağlı "
+"diğer hareketleri de doğrulamalısınız, aksi takdirde bu işlemler devre dışı "
+"bırakılamaz."
 
 #. module: account_voucher
 #: field:account.voucher.line,untax_amount:0
 msgid "Untax Amount"
-msgstr ""
+msgstr "Vergisi Tutar"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_sale_receipt_report
 msgid "Sales Receipt Statistics"
-msgstr ""
+msgstr "Satış Makbuzları İstatistikleri"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Yıl"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,amount_unreconciled:0
 msgid "Open Balance"
-msgstr ""
+msgstr "Bilanço Aç"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,amount:0
 msgid "Total"
-msgstr ""
+msgstr "Toplam"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 6672f49f319..45d22bf542e 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -295,7 +295,7 @@
             </field>
         </record>
         <record id="action_purchase_receipt" model="ir.actions.act_window">
-            <field name="name">Supplier Vouchers</field>
+            <field name="name">Purchase Receipt</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="domain">[('journal_id.type','in',['purchase','purchase_refund']), ('type','=','purchase')]</field>
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 6dfaac21e70..a155352adf8 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -149,18 +149,18 @@ class account_analytic_account(osv.osv):
 
     _columns = {
         'name': fields.char('Account Name', size=128, required=True),
-        'complete_name': fields.function(_complete_name_calc, method=True, type='char', string='Full Account Name'),
+        'complete_name': fields.function(_complete_name_calc, type='char', string='Full Account Name'),
         'code': fields.char('Account Code', size=24, select=True),
         'type': fields.selection([('view','View'), ('normal','Normal')], 'Account Type', help='If you select the View Type, it means you won\'t allow to create journal entries using that account.'),
         'description': fields.text('Description'),
         'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2),
         'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts'),
-        'child_complete_ids': fields.function(_child_compute, relation='account.analytic.account', method=True, string="Account Hierarchy", type='many2many'),
+        'child_complete_ids': fields.function(_child_compute, relation='account.analytic.account', string="Account Hierarchy", type='many2many'),
         'line_ids': fields.one2many('account.analytic.line', 'account_id', 'Analytic Entries'),
-        'balance': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Balance', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
-        'debit': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
-        'credit': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
-        'quantity': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
+        'balance': fields.function(_debit_credit_bal_qtty, type='float', string='Balance', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
+        'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
+        'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
+        'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
         'quantity_max': fields.float('Maximum Quantity', help='Sets the higher limit of quantity of hours.'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'contact_id': fields.many2one('res.partner.address', 'Contact'),
@@ -175,7 +175,7 @@ class account_analytic_account(osv.osv):
                                   \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\'.'),
-        'currency_id': fields.function(_currency, fnct_inv=_set_company_currency, method=True,
+        'currency_id': fields.function(_currency, fnct_inv=_set_company_currency,
             store = {
                 'res.company': (_get_analytic_account, ['currency_id'], 10),
             }, string='Currency', type='many2one', relation='res.currency'),
@@ -202,8 +202,8 @@ class account_analytic_account(osv.osv):
         'currency_id': _get_default_currency,
     }
 
-    def check_recursion(self, cr, uid, ids, parent=None):
-        return super(account_analytic_account, self)._check_recursion(cr, uid, ids, parent=parent)
+    def check_recursion(self, cr, uid, ids, context=None, parent=None):
+        return super(account_analytic_account, self)._check_recursion(cr, uid, ids, context=context, parent=parent)
 
     _order = 'name asc'
     _constraints = [
diff --git a/addons/analytic/i18n/fi.po b/addons/analytic/i18n/fi.po
new file mode 100644
index 00000000000..5822cb824d2
--- /dev/null
+++ b/addons/analytic/i18n/fi.po
@@ -0,0 +1,261 @@
+# Finnish 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-06-29 06:16+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-30 04:34+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "Alatason tilit"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account Name"
+msgstr "Tilin nimi"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr "Määrittelee laskettavan määrän"
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+"    "
+msgstr ""
+"Moduuli analyyttisten tilien määrittelyyn.\n"
+"    "
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr "Tila"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr "Asiakas päällikkö"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "Luonnos"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "Suljettu"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Debet"
+
+#. 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 "Tilityyppi"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr "Mallipohja"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr "Odottava"
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Analyyttinen rivi"
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr "Kuvaus"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "Tavallinen"
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr "Yritys"
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr "Maksimimäärä"
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr "Käyttäjä"
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Ylempi analyyttinen tili"
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr "Päiväys"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+msgid "Account currency"
+msgstr "Tilin valuutta"
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "Määrä"
+
+#. 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 ""
+"Laskettu kertomalla määrä ja tuotteen kustannushinta. Yrityksen "
+"päävaluutassa."
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr "Asettaa tuntien määrän ylärajan"
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr "Kredit"
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Määrä"
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr "Yhteyshenkilö"
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr "Virhe! Valuutan tulee olla sama kun valitun yrityksen valutta."
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "Peruttu"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "Saldo"
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Virhe! Et voi luoda sisäkkäisiä analyyttisiä tilejä."
+
+#. 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 ""
+"Jos valitset näkymätyypin, se tarkoittaa että et voi luoda "
+"päiväkirjamerkintöjä käyttäen sitä tiliä."
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr "Loppupäiväys"
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr "Tilikoodi"
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr "Tilin kokonimi"
+
+#. 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 "Analyyttinen tili"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr "Näkymä"
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Partner"
+msgstr "Kumppani"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr "Aloituspäivämäärä"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr "Avoin"
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr "Analyyttiset viennit"
diff --git a/addons/analytic/i18n/tr.po b/addons/analytic/i18n/tr.po
index 62064088008..2b31cc9428a 100644
--- a/addons/analytic/i18n/tr.po
+++ b/addons/analytic/i18n/tr.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: 2011-04-26 21:49+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-05-29 17:52+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <tr@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-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-30 04:59+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
-msgstr "Muavin Hesaplar"
+msgstr "Alt Hesaplar"
 
 #. module: analytic
 #: field:account.analytic.account,name:0
@@ -30,7 +30,7 @@ msgstr "Hesap Adı"
 #. module: analytic
 #: help:account.analytic.line,unit_amount:0
 msgid "Specifies the amount of quantity to count."
-msgstr ""
+msgstr "Sayılacak miktarı belirtir."
 
 #. module: analytic
 #: model:ir.module.module,description:analytic.module_meta_information
@@ -38,6 +38,8 @@ msgid ""
 "Module for defining analytic accounting object.\n"
 "    "
 msgstr ""
+"Analiz hesabı nesnesini tanımlama modülü.\n"
+"    "
 
 #. module: analytic
 #: field:account.analytic.account,state:0
@@ -82,74 +84,87 @@ msgid ""
 " If it is to be reviewed then the state is 'Pending'.\n"
 " When the project is completed the state is set to 'Done'."
 msgstr ""
+"* Bir hesap 'Taslak' durumunda oluşturulduğunda.                             "
+"     \n"
+"* Herhangi bir bağlı ortak varsa, 'Açık' durumda olabilir.                   "
+"               \n"
+"* Beklemede herhangi bir bakiye varsa 'Beklemede' olabilir.                  "
+"                 \n"
+"* Ve son olarak tüm işlemler sona erdiğinde, 'Kapalı' durumunda olabilir.    "
+"                               \n"
+"* Durumlar 'Şablon' ve 'Çalışıyor' ise proje ikisi de olabilir.\n"
+" Şablonsa, o zaman şablon projeler bazında projeler yapabiliriz. 'Çalışıyor' "
+"durumundaysa normal bir projedir.                                 \n"
+" İncelenecekse, durum 'Beklemede'dir.\n"
+" Proje tamamlandığında durum 'Bitti' olarak belirlenir."
 
 #. module: analytic
 #: field:account.analytic.account,type:0
 msgid "Account Type"
-msgstr ""
+msgstr "Hesap Tipi"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Template"
-msgstr ""
+msgstr "Şablon"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Beklemede"
 
 #. module: analytic
 #: model:ir.model,name:analytic.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Analiz Satırı"
 
 #. module: analytic
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
 msgid "Description"
-msgstr ""
+msgstr "Açıklama"
 
 #. module: analytic
 #: selection:account.analytic.account,type:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: analytic
 #: field:account.analytic.account,company_id:0
 #: field:account.analytic.line,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Şirket"
 
 #. module: analytic
 #: field:account.analytic.account,quantity_max:0
 msgid "Maximum Quantity"
-msgstr ""
+msgstr "Maksimum Miktar"
 
 #. module: analytic
 #: field:account.analytic.line,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Kullanıcı"
 
 #. module: analytic
 #: field:account.analytic.account,parent_id:0
 msgid "Parent Analytic Account"
-msgstr ""
+msgstr "Üst Hesap Analizi"
 
 #. module: analytic
 #: field:account.analytic.line,date:0
 msgid "Date"
-msgstr ""
+msgstr "Tarih"
 
 #. module: analytic
 #: field:account.analytic.account,currency_id:0
 msgid "Account currency"
-msgstr ""
+msgstr "Hesap para birimi"
 
 #. module: analytic
 #: field:account.analytic.account,quantity:0
 #: field:account.analytic.line,unit_amount:0
 msgid "Quantity"
-msgstr ""
+msgstr "Miktar"
 
 #. module: analytic
 #: help:account.analytic.line,amount:0
@@ -157,48 +172,50 @@ msgid ""
 "Calculated by multiplying the quantity and the price given in the Product's "
 "cost price. Always expressed in the company main currency."
 msgstr ""
+"Ürünün maliyet bedeli olarak verilen fiyatın miktarla çarpılmasıyla "
+"hesaplanır. Her zaman şirketin ana para birimi cinsinden ifade edilmelidir."
 
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid "Sets the higher limit of quantity of hours."
-msgstr ""
+msgstr "Saat miktarının üst limitini belirler."
 
 #. module: analytic
 #: field:account.analytic.account,credit:0
 msgid "Credit"
-msgstr ""
+msgstr "Kredi"
 
 #. module: analytic
 #: field:account.analytic.line,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Tutar"
 
 #. module: analytic
 #: field:account.analytic.account,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "İletişim"
 
 #. module: analytic
 #: constraint:account.analytic.account:0
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "Hata! Para birimi, seçilen şirketin para birimiyle aynı olmalıdır"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "İptal edildi"
 
 #. module: analytic
 #: field:account.analytic.account,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Bakiye"
 
 #. module: analytic
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Hata! Geriye dönük analitik hesap oluşturamazsınız."
 
 #. module: analytic
 #: help:account.analytic.account,type:0
@@ -206,50 +223,52 @@ msgid ""
 "If you select the View Type, it means you won't allow to create journal "
 "entries using that account."
 msgstr ""
+"Görünüm Tipi'ni seçerseniz, bu hesabı kullanarak defter kaydı oluşturmaya "
+"izin vermeyeceğiniz anlamına gelir."
 
 #. module: analytic
 #: field:account.analytic.account,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Bitiş Tarihi"
 
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Account Code"
-msgstr ""
+msgstr "Hesap Kodu"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
 msgid "Full Account Name"
-msgstr ""
+msgstr "Tam Hesap Adı"
 
 #. 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 ""
+msgstr "Analitik Hesap"
 
 #. module: analytic
 #: selection:account.analytic.account,type:0
 msgid "View"
-msgstr ""
+msgstr "Görüntüle"
 
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Ortak"
 
 #. module: analytic
 #: field:account.analytic.account,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Başlangıç Tarihi"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Open"
-msgstr ""
+msgstr "Açık"
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
-msgstr ""
+msgstr "Analitik Girişler"
diff --git a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
index b99c536198a..f2a366558ec 100644
--- a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
+++ b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
@@ -20,7 +20,7 @@
             <field name="model">analytic_journal_rate_grid</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Billing Rate per Journal for this Analytic Account" editable="bottom">
+                <form string="Billing Rate per Journal for this Analytic Account">
                     <field name="journal_id" required="1"/>
                     <field name="rate_id" />
                 </form>
diff --git a/addons/analytic_user_function/i18n/fi.po b/addons/analytic_user_function/i18n/fi.po
new file mode 100644
index 00000000000..78387b7f6bd
--- /dev/null
+++ b/addons/analytic_user_function/i18n/fi.po
@@ -0,0 +1,103 @@
+# Finnish 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-06-29 05:53+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-30 04:34+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Tuote"
+
+#. 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 "Virhe !"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Tuntilistan rivi"
+
+#. 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 "Analyyttinen tili"
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
+msgstr "Käyttäjän/Tuotteen suhde"
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,user_id:0
+msgid "User"
+msgstr "Käyttäjä"
+
+#. 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 "Virhe! Valuutan tulee olla sama kun valitun yrityksen valutta."
+
+#. 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 "Tuotteelle ei ole määritelty kulutiliä: \"%s\" (id:%d)"
+
+#. 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 "Viitetaulu käyttäjien ja tuotteiden välillä analyyttisellä tilillä"
+
+#. 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 "Analyyttinen käyttäjätoiminto"
+
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Virhe! Et voi luoda sisäkkäisiä analyyttisiä tilejä."
+
+#. module: analytic_user_function
+#: view:analytic_user_funct_grid:0
+msgid "User's Product for this Analytic Account"
+msgstr "Käyttäjän tuote tälle analyyttiselle tilille"
diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py
index 2814227015a..c4a2d9f0488 100644
--- a/addons/anonymization/anonymization.py
+++ b/addons/anonymization/anonymization.py
@@ -240,10 +240,10 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
 
     _columns = {
         'name': fields.char(size='64', string='File Name'),
-        'summary': fields.function(_get_summary, method=True, type='text', string='Summary'),
+        'summary': fields.function(_get_summary, type='text', string='Summary'),
         'file_export': fields.binary(string='Export'),
         'file_import': fields.binary(string='Import'),
-        'state': fields.function(_get_state, method=True, string='State', type='selection', selection=ANONYMIZATION_STATES, readonly=False),
+        'state': fields.function(_get_state, string='State', type='selection', selection=ANONYMIZATION_STATES, readonly=False),
         'msg': fields.text(string='Message'),
     }
 
diff --git a/addons/anonymization/i18n/fi.po b/addons/anonymization/i18n/fi.po
new file mode 100644
index 00000000000..9526b2a0f71
--- /dev/null
+++ b/addons/anonymization/i18n/fi.po
@@ -0,0 +1,227 @@
+# Finnish 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-06-30 09:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-07-01 04:54+0000\n"
+"X-Generator: Launchpad (build 13168)\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 "Kentän nimi"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr "Kenttä"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr "Tila"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr "Tuo"
+
+#. 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 "Tietokannan anonymisointi moduuli"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr "suunta"
+
+#. 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 "Anonymisoidut kentät"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr "Tietokannan anonymisointi"
+
+#. 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 ""
+"Sinulla ei voi olla kahta tietuetta joilla on sama malli ja sama kenttä"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr "Anonymisoitu"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr "Tuntematon"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objekti"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr "Tiedoston polku"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr "Päiväys"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr "Vie"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr "Poista tietokannan anonymisointi"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr "Tietokannan anonymisointi"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr "Anonymisoi tietokanta"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr "Kentät"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr "Tyhjennä"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr "näkyvä -> anonymisoitu"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr "Yhteenveto"
+
+#. 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 "Epävakaa"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr "Poikkeus tapahtui"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr "Ei ole olemassa"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr "Objektin nimi"
+
+#. 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 "Anonymisoinnin historia"
+
+#. 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 "Anonymisoi tietokanta"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr "Tiedostonimi"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr "Anonymisoitu -> näkyvä"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr "Käynnistetty"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr "Valmis"
+
+#. 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 "Viesti"
diff --git a/addons/anonymization/i18n/pt_BR.po b/addons/anonymization/i18n/pt_BR.po
index b710579d4d2..00f32c21c99 100644
--- a/addons/anonymization/i18n/pt_BR.po
+++ b/addons/anonymization/i18n/pt_BR.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-20 02:08+0000\n"
+"PO-Revision-Date: 2011-07-02 18:49+0000\n"
 "Last-Translator: Gustavo T <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-21 05:02+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-07-03 04:47+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
@@ -25,7 +25,7 @@ msgstr "ir.model.fields.anonymize.wizard"
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
-msgstr "Nome do Campo"
+msgstr "Nome do campo"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_id:0
@@ -138,7 +138,7 @@ msgstr "Limpar"
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,direction:0
 msgid "clear -> anonymized"
-msgstr ""
+msgstr "em branco -> anonimizado"
 
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
@@ -149,7 +149,7 @@ msgstr "Resumo"
 #. module: anonymization
 #: view:ir.model.fields.anonymization:0
 msgid "Anonymized Field"
-msgstr ""
+msgstr "Campo Anonimizado"
 
 #. module: anonymization
 #: model:ir.module.module,description:anonymization.module_meta_information
@@ -158,6 +158,9 @@ msgid ""
 "This module allows you to anonymize a database.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo permite que você anonimize um banco de dados\n"
+"    "
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
@@ -196,7 +199,7 @@ msgstr "ir.model.fields.anonymization.history"
 #: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Anonymize Database"
-msgstr ""
+msgstr "Anonimizar Banco de Dados"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,name:0
@@ -206,21 +209,21 @@ msgstr "Nome do Arquivo"
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,direction:0
 msgid "anonymized -> clear"
-msgstr ""
+msgstr "anonimizado -> em branco"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Started"
-msgstr ""
+msgstr "Iniciada"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
-msgstr ""
+msgstr "Concluído"
 
 #. 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 ""
+msgstr "Mensagem"
diff --git a/addons/anonymization/i18n/tr.po b/addons/anonymization/i18n/tr.po
new file mode 100644
index 00000000000..c793e949cc8
--- /dev/null
+++ b/addons/anonymization/i18n/tr.po
@@ -0,0 +1,229 @@
+# Turkish 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-05-28 19:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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-05-29 04:36+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr "ir.model.fields.anonymize.wizard"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr "Alan Adı"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr "Alan"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr "Durum"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr "İçeaktar"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr "ir.model.fields.anonymization"
+
+#. module: anonymization
+#: model:ir.module.module,shortdesc:anonymization.module_meta_information
+msgid "Database anonymization module"
+msgstr "Veritabanı anonimleştirme modülü"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr "Yön"
+
+#. 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 "Anonim Alanlar"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr "Veritabanı anonimleştirme"
+
+#. 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 "Aynı alan ve aynı modele sahip iki kayıt olamaz"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr "Anonim"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr "bilinmeyen"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Nesne"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr "Dosya yolu"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr "Tarih"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr "Dışaaktar"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr "Veritabanı Anonimleştirmeyi Tersine Çevir"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr "Veritabanı Anonimleştirme"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr "Anonim Veritabanı"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr "Alanlar"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr "Temizle"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr "temizle -> anonim"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr "Özet"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr "Anonim Alan"
+
+#. module: anonymization
+#: model:ir.module.module,description:anonymization.module_meta_information
+msgid ""
+"\n"
+"This module allows you to anonymize a database.\n"
+"    "
+msgstr ""
+"\n"
+"Bu modül bir veritabanını anonimleştirmenizi sağlar.\n"
+"    "
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr "Kararsız"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr "Kuraldışılık oluştu"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr "Yok"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr "Nesne Adı"
+
+#. 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 "Anonimleştirme Geçmişi"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr "ir.model.fields.anonymization.history"
+
+#. 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 "Anonim Veritabanı"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr "Dosyası Adı"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr "anonim -> temizle"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr "Başlamış"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr "Bitti"
+
+#. 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 "Mesaj"
diff --git a/addons/association/i18n/fi.po b/addons/association/i18n/fi.po
new file mode 100644
index 00000000000..9a1eae464cb
--- /dev/null
+++ b/addons/association/i18n/fi.po
@@ -0,0 +1,141 @@
+# Finnish 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-06-27 10:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 13168)\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 "Tapahtumienhallinta"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Saada asiat tehtyä"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr "Tämä moduuli mahdollistaa yhdistysjäsenprofiilien luonnin"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr "Konfiguraation eteneminen"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid ""
+"Here are specific applications related to the Association Profile you "
+"selected."
+msgstr ""
+"Tässä on määritellyt ohjelmat jotka liittyvät valitsemaasi "
+"yhdistysprofiiliin."
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr "otsikko"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr "Auttaa sinua hallitsemaan ja organisoimaan tapahtumia"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr "Kuva"
+
+#. 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 ""
+"Seuraa ja hallitsee työntekijäkuluja ja voi automaattisesti laskuttaa "
+"asiakasta, jos kulut liittyvät projektiin."
+
+#. 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 "Resurssienhallinta"
+
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr "Yhdistysprofiili"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,hr_expense:0
+msgid "Expenses Tracking"
+msgstr "Kulujenseuranta"
+
+#. 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 "Jäsenhakemuksen konfiguraatio"
+
+#. 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 ""
+"Auttaa sinua hallitsemaan projektejasi ja tehtäviäsi seuraamalla niitä, "
+"luomalla suunnitelmia yms."
+
+#. 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 "Tapahtumat"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr "Projektinhallinta"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Configure"
+msgstr "Konfiguroi"
diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py
index 2b73dd69885..8a528177a30 100644
--- a/addons/association/profile_association.py
+++ b/addons/association/profile_association.py
@@ -22,17 +22,13 @@
 from osv import fields, osv
 
 class profile_association_config_install_modules_wizard(osv.osv_memory):
-    _name='profile.association.config.install_modules_wizard'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
-        'hr_expense':fields.boolean('Expenses Tracking',  help="Tracks and manages employee expenses, and can "
+        'hr_expense':fields.boolean('Resources Management: Expenses Tracking',  help="Tracks and manages employee expenses, and can "
                  "automatically re-invoice clients if the expenses are "
                  "project-related."),
-        'project':fields.boolean('Project Management', 
-                              help="Helps you manage your projects and tasks by tracking them, "
-                 "generating plannings, etc..."),
-        'event_project':fields.boolean('Events', help="Helps you to manage and organize your events."),
+        'event_project':fields.boolean('Event Management: Events', help="Helps you to manage and organize your events."),
         'project_gtd':fields.boolean('Getting Things Done',
             help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
         'wiki': fields.boolean('Wiki', help="Lets you create wiki pages and page groups in order "
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 95e46457cca..12222ecbd90 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -3,56 +3,22 @@
     <data>
         <record id="view_confirm_install_module_form" model="ir.ui.view">
             <field name="name">Association Application Configuration</field>
-            <field name="model">profile.association.config.install_modules_wizard</field>
+            <field name="model">base.setup.installer</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_installer"/>
+            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
             <field name="arch" type="xml">
               <data>
-                <form position="attributes">
-                  <attribute name="string">Association Application Configuration</attribute>
-                </form>
-                <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='string'></attribute>
-                  </xpath>
-                <xpath expr="//label[@string='description']"
-                       position="attributes">
-                  <attribute name="string">Here are specific applications related to the Association Profile you selected.</attribute>
+                <xpath expr="//group[@name='association']" position="replace">
+                    <newline/>
+                    <separator  string="Associations Features" colspan="4" />
+                    <field name="project_gtd" />
+                    <field name="wiki" />
+                    <field name="event_project" />
+                    <field name="hr_expense" />
                 </xpath>
-                <xpath expr="//button[@string='Install Modules']" position="attributes">
-                    <attribute name="string">Configure</attribute>
-                </xpath>
-                <separator string="title" position="replace"/>
-                <group colspan="8">
-                  <separator string="Project Management" colspan="4"/>
-                  <field name="project"/>
-                  <field name="project_gtd"/>
-                  <field name="wiki"/>
-                  <separator string="Event Management" colspan="4"/>
-                  <field name="event_project"/>
-                  <separator string="Resources Management" colspan="4"/>
-                  <field name="hr_expense"/>
-                </group>
               </data>
             </field>
         </record>
-
-        <record id="action_config_install_module" model="ir.actions.act_window">
-            <field name="name">Association Application Configuration</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">profile.association.config.install_modules_wizard</field>
-            <field name="view_id" ref="view_confirm_install_module_form"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-      <record model="ir.actions.todo"
-            id="config_install_module">
-            <field name="action_id" ref="action_config_install_module"/>
-            <field name="sequence">3</field>
-            <field name="restart">always</field>
-      </record>
-
         <menuitem
             name="Association"
             id="base.menu_association"
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 0b2fc467f88..685b6ee3368 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -95,12 +95,12 @@ class auction_dates(osv.osv):
         'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs', help="Account tax for seller"),
         'acc_income': fields.many2one('account.account', 'Income Account', required=True),
         'acc_expense': fields.many2one('account.account', 'Expense Account', required=True),
-        'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication', store=True),
+        'adj_total': fields.function(_adjudication_get, string='Total Adjudication', store=True),
         'state': fields.selection((('draft', 'Draft'), ('closed', 'Closed')), 'State', select=1, readonly=True,
                                   help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'),
         'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=False),
-        'buyer_invoice_history': fields.function(_get_invoice, relation='account.invoice', method=True, string="Buyer Invoice", type='many2many', multi=True),
-        'seller_invoice_history': fields.function(_get_invoice, relation='account.invoice', method=True, string="Seller Invoice", type='many2many', multi=True),
+        'buyer_invoice_history': fields.function(_get_invoice, relation='account.invoice', string="Buyer Invoice", type='many2many', multi=True),
+        'seller_invoice_history': fields.function(_get_invoice, relation='account.invoice', string="Seller Invoice", type='many2many', multi=True),
     }
 
     _defaults = {
@@ -382,8 +382,8 @@ class auction_lots(osv.osv):
         'vnd_lim': fields.float('Seller limit'),
         'vnd_lim_net': fields.boolean('Net limit ?', readonly=True),
         'image': fields.binary('Image', help="Object Image"),
-        'paid_vnd':fields.function(_getprice, string='Seller Paid', method=True, type='boolean', store=True, multi="paid_vnd", help="When state of Seller Invoice is 'Paid', this field is selected as True."),
-        'paid_ach':fields.function(_getprice, string='Buyer Invoice Reconciled', method=True, type='boolean', store=True, multi="paid_ach", help="When state of Buyer Invoice is 'Paid', this field is selected as True."),
+        'paid_vnd':fields.function(_getprice, string='Seller Paid', type='boolean', store=True, multi="paid_vnd", help="When state of Seller Invoice is 'Paid', this field is selected as True."),
+        'paid_ach':fields.function(_getprice, string='Buyer Invoice Reconciled', type='boolean', store=True, multi="paid_ach", help="When state of Buyer Invoice is 'Paid', this field is selected as True."),
         'state': fields.selection((
             ('draft', 'Draft'),
             ('unsold', 'Unsold'),
@@ -394,14 +394,14 @@ class auction_lots(osv.osv):
                 \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.'),
-        'buyer_price': fields.function(_getprice, method=True, string='Buyer price', store=True, multi="buyer_price", help="Buyer Price"),
-        'seller_price': fields.function(_getprice, method=True, string='Seller price', store=True, multi="seller_price", help="Seller Price"),
-        'gross_revenue':fields.function(_getprice, method=True, string='Gross revenue', store=True, multi="gross_revenue", help="Buyer Price - Seller Price"),
-        'gross_margin':fields.function(_getprice, method=True, string='Gross Margin (%)', store=True, multi="gross_margin", help="(Gross Revenue*100.0)/ Object Price"),
-        'costs':fields.function(_getprice, method=True, string='Indirect costs', store=True, multi="costs", help="Deposit cost"),
+        'buyer_price': fields.function(_getprice, string='Buyer price', store=True, multi="buyer_price", help="Buyer Price"),
+        'seller_price': fields.function(_getprice, string='Seller price', store=True, multi="seller_price", help="Seller Price"),
+        'gross_revenue':fields.function(_getprice, string='Gross revenue', store=True, multi="gross_revenue", help="Buyer Price - Seller Price"),
+        'gross_margin':fields.function(_getprice, string='Gross Margin (%)', store=True, multi="gross_margin", help="(Gross Revenue*100.0)/ Object Price"),
+        'costs':fields.function(_getprice, string='Indirect costs', store=True, multi="costs", help="Deposit cost"),
         'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment', help="Bank statement line for given buyer"),
-        'net_revenue':fields.function(_getprice, method=True, string='Net revenue', store=True, multi="net_revenue", help="Buyer Price - Seller Price - Indirect Cost"),
-        'net_margin':fields.function(_getprice, method=True, string='Net Margin (%)', store=True, multi="net_margin", help="(Net Revenue * 100)/ Object Price"),
+        'net_revenue':fields.function(_getprice, string='Net revenue', store=True, multi="net_revenue", help="Buyer Price - Seller Price - Indirect Cost"),
+        'net_margin':fields.function(_getprice, string='Net Margin (%)', store=True, multi="net_margin", help="(Net Revenue * 100)/ Object Price"),
     }
     _defaults = {
         'state':lambda *a: 'draft',
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 4fa44fafc61..66cc9b3f743 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -375,7 +375,7 @@
                       </group>
                    </page>
                    <page string="Bids">
-                       <field name="bid_lines" colspan="4" nolabel="1" editable="top">
+                       <field name="bid_lines" colspan="4" nolabel="1">
                             <tree string="Bids Details"  editable="top">
                                 <field name="bid_id"/>
                                 <field name="price"/>
@@ -709,7 +709,7 @@
                         <field name="price"/>
                         <field name="call"/>
                     </tree>
-                    <form string="Bids Lines" editable="top">
+                    <form string="Bids Lines">
                         <field name="lot_id" domain="[('auction_id','=',parent.auction_id)]"/>
                         <field name="price"/>
                         <field name="call"/>
diff --git a/addons/auction/i18n/lt.po b/addons/auction/i18n/lt.po
index 1ba0ad7e9b5..a500b401b92 100644
--- a/addons/auction/i18n/lt.po
+++ b/addons/auction/i18n/lt.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-09-09 07:09+0000\n"
+"PO-Revision-Date: 2011-07-07 11:06+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-08 04:43+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
 msgid "Reporting"
-msgstr ""
+msgstr "Ataskaitos"
 
 #. 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 ""
+msgstr "Nustatyti kaip juodraštį"
 
 #. module: auction
 #: view:auction.deposit:0
@@ -38,7 +38,7 @@ msgstr ""
 #: view:report.auction:0
 #: field:report.auction,seller:0
 msgid "Seller"
-msgstr ""
+msgstr "Pardavėjas"
 
 #. module: auction
 #: field:auction.lots,name:0
@@ -48,7 +48,7 @@ msgstr ""
 #. module: auction
 #: field:auction.lots.sms.send,text:0
 msgid "SMS Message"
-msgstr ""
+msgstr "Trumpoji žinutė (SMS)"
 
 #. module: auction
 #: view:auction.catalog.flagey:0
@@ -71,7 +71,7 @@ msgstr ""
 #: field:auction.bid_line,lot_id:0
 #: field:auction.lot.history,lot_id:0
 msgid "Object"
-msgstr ""
+msgstr "Objektas"
 
 #. module: auction
 #: field:report.auction.object.date,obj_num:0
@@ -96,7 +96,7 @@ msgstr ""
 #: field:report.auction,buyer:0
 #: report:report.auction.buyer.result:0
 msgid "Buyer"
-msgstr ""
+msgstr "Pirkėjas"
 
 #. module: auction
 #: field:report.auction,object:0
@@ -123,7 +123,7 @@ msgstr ""
 #: field:auction.lots.make.invoice,amount:0
 #: field:auction.lots.make.invoice.buyer,amount:0
 msgid "Invoiced Amount"
-msgstr ""
+msgstr "Suma, kuriai išrašyta sąskaita-faktūra"
 
 #. module: auction
 #: help:auction.lots,name:0
@@ -141,7 +141,7 @@ msgstr ""
 #: field:auction.pay.buy,amount2:0
 #: field:auction.pay.buy,amount3:0
 msgid "Amount"
-msgstr ""
+msgstr "Suma"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_deposit_border
@@ -164,7 +164,7 @@ msgstr ""
 #. module: auction
 #: field:auction.dates,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitinė sąskaita"
 
 #. module: auction
 #: help:auction.pay.buy,amount3:0
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index ffda564cb8e..bfa6bca8f34 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
-from osv.osv import osv_pool, object_proxy
+from osv.osv import object_proxy
 from tools.translate import _
 import pooler
 import time
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 2a4e2c0e4e1..80c1ab464f1 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -487,21 +487,24 @@ base_action_rule()
 
 
 class ir_cron(osv.osv):
-    _inherit = 'ir.cron' 
-    
+    _inherit = 'ir.cron'
+    _init_done = False
+
     def _poolJobs(self, db_name, check=False):
-        try:
-            db = pooler.get_db(db_name)
-        except:
-            return False
-        cr = db.cursor()
-        try:
-            next = datetime.now().strftime('%Y-%m-%d %H:00:00')
-            # Putting nextcall always less than current time in order to call it every time
-            cr.execute('UPDATE ir_cron set nextcall = \'%s\' where numbercall<>0 and active and model=\'base.action.rule\' ' % (next))
-        finally:
-            cr.commit()
-            cr.close()
+        if not self._init_done:
+            self._init_done = True
+            try:
+                db = pooler.get_db(db_name)
+            except:
+                return False
+            cr = db.cursor()
+            try:
+                next = datetime.now().strftime('%Y-%m-%d %H:00:00')
+                # Putting nextcall always less than current time in order to call it every time
+                cr.execute('UPDATE ir_cron set nextcall = \'%s\' where numbercall<>0 and active and model=\'base.action.rule\' ' % (next))
+            finally:
+                cr.commit()
+                cr.close()
 
         super(ir_cron, self)._poolJobs(db_name, check=check)
 
diff --git a/addons/base_action_rule/i18n/tr.po b/addons/base_action_rule/i18n/tr.po
new file mode 100644
index 00000000000..c7120a9b549
--- /dev/null
+++ b/addons/base_action_rule/i18n/tr.po
@@ -0,0 +1,535 @@
+# Turkish 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-05-31 13:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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-06-01 04:38+0000\n"
+"X-Generator: Launchpad (build 12959)\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 ""
+"Sorumlu kişiye eposta gönderme kuralını kullanmak istiyorsanız bunu "
+"işaretleyin."
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_partner:0
+msgid "Remind Partner"
+msgstr "Paydaşa Anımsat"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_categ_id:0
+msgid "Partner Category"
+msgstr "Paydaş Kategorisi"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
+msgstr "İzleyicilere Postala (CC)"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_to:0
+msgid "Button Pressed"
+msgstr "Düğmeye Basıldı"
+
+#. module: base_action_rule
+#: field:base.action.rule,model_id:0
+msgid "Object"
+msgstr "Nesne"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_email:0
+msgid "Mail to these Emails"
+msgstr "Bu Epostalara yolla"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_state:0
+msgid "Set State to"
+msgstr "Durumu şuna Ayarla"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr "Gelen Eposta"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Body"
+msgstr "Eposta Gövdesi"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Days"
+msgstr "Günler"
+
+#. module: base_action_rule
+#: field:base.action.rule,last_run:0
+msgid "Last Run"
+msgstr "Son Çalıştırma"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:313
+#, python-format
+msgid "Error!"
+msgstr "Hata!"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_reply_to:0
+msgid "Reply-To"
+msgstr "Yanıtla"
+
+#. 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 ""
+"Bu kişiler paydaşla kullanıcılar arasındaki yapılacak iletişimin bir "
+"kopyasını eposta yoluyla alacaklardır."
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Minutes"
+msgstr "Dakikalar"
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Kural Adı"
+
+#. 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 ""
+"Kuralın ortağa hatırlatma E-Postası göndermesini istiyorsanız bunu seçiniz."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Partner"
+msgstr "Model Paydaş için Koşullar"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Deadline"
+msgstr "Bitiş tarihi"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_id:0
+msgid "Partner"
+msgstr "Paydaş"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_subject)s = Object subject"
+msgstr "%(nesne_konu)lar = Nesne konu"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr "Eposta Anımsatıcıları"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Special Keywords to Be Used in The Body"
+msgstr "Gövdede Kullanılacak Özel Anahtar Kelimeler"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_from:0
+msgid "State"
+msgstr "Durum"
+
+#. 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 ""
+"Değişik ekranlar için kullanılacak otomatik tetikleme eylemleri için "
+"otomatize eylemleri kullan. Örnek: belirli bir kullanıcı tarafından "
+"oluşturulan paydaş otomatik olarak bir satış takımına atanabilir ya da halen "
+"14 günlük bekleme durumunda olan bir fırsat otomatik anımsatma epostası ile "
+"tetiklenebilir."
+
+#. 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 "Eposta gönderilecek kişinin Eposta kimliği"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+#: model:ir.module.module,shortdesc:base_action_rule.module_meta_information
+msgid "Action Rule"
+msgstr "Eylem Kuralı"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Fields to Change"
+msgstr "Değiştirilecek Alanlar"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Creation Date"
+msgstr "Oluşturulma Tarihi"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Last Action Date"
+msgstr "Son Eylem Tarihi"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Hours"
+msgstr "Saatler"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_id)s = Object ID"
+msgstr "%(nesne_no)s = Nesne NO"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Delay After Trigger Date"
+msgstr "Tetikleme Tarihi sonrası Gecikme"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_attach:0
+msgid "Remind with Attachment"
+msgstr "Ek ile Anımsat"
+
+#. module: base_action_rule
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Geçersiz parametreler"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible to"
+msgstr "Sorumluyu şuna Ayarla"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "None"
+msgstr "Hiçbiri"
+
+#. 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 ""
+"Başlıkta 'Kime' için kullanılacak  doğru alanı belirlemek için bir python "
+"ifadesi kullanın"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_phone)s = Responsible phone"
+msgstr "%(nesne_kullanıcı_telefon)lar = Sorumlu telefonu"
+
+#. 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 ""
+"Bu kural VE operatörünü kullanır. Model tüm boş olmayan alanlara uymalıdır "
+"ki; kural 'Eylemler' sekmesinde belirtilen eylemi uygulasın."
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
+msgstr "Gecikme türü"
+
+#. 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 ""
+"Kaynak adına uygun kural ifadesi\n"
+"ör.: 'acil.*' 'acil' dizesi ile başlayan bütün kayıtları arıyacaktır\n"
+"Not: Harf durumu duyarlı bir aramadır."
+
+#. module: base_action_rule
+#: field:base.action.rule,act_method:0
+msgid "Call Object Method"
+msgstr "Nesne Arama Yöntemi"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr "Şuna Eposta Gönder"
+
+#. 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 ""
+"Kuralın CC yi işaretlemesini isterseniz bunu işaretleyin (eylemlerde "
+"tanımlanan herhangi bir kişiye postalama)"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner)s = Partner name"
+msgstr "%(paydaş)lar = Paydaş Adı"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Note"
+msgstr "Not"
+
+#. 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 ""
+"Başlıkta 'Kime' için kullanılacak doğru alanı belirlemek için bir python "
+"ifadesi kullanın"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
+msgstr "Tetikleme Tarihi sonrası Gecikme"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions"
+msgstr "Koşullar"
+
+#. 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 ""
+"Tetikleme Sonrası Gecikme, burada negatif sayı kullanabilirsiniz. Eğer "
+"tetikleme tarihinden önce, örneğin toplantıdan 15 dakika önce anımsatma "
+"gönder gibi, bir gecikmeye gerek duyarsanız."
+
+#. module: base_action_rule
+#: field:base.action.rule,active:0
+msgid "Active"
+msgstr "Etkin"
+
+#. 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 "Firma adresinizde bir Eposta Kimliği yok!"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_user:0
+msgid "Remind Responsible"
+msgstr "Sorumluya Hatırlat"
+
+#. 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 ""
+"Bu modül herhangi bir nesne için eylem kurallaru uygulamanızı sağlar."
+
+#. module: base_action_rule
+#: help:base.action.rule,sequence:0
+msgid "Gives the sequence order when displaying a list of rules."
+msgstr "Kural listesini görüntülerken diziliş sırasını verir."
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Aylar"
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_id:0
+msgid "Filter"
+msgstr "Süzgeç"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Date"
+msgstr "Tarih"
+
+#. 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 ""
+"Eylem adını belirtir.\n"
+"ör:koşula uygun olarak hangi nesne için hangi eylem ele alınır"
+
+#. 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 "%(nesne_tanım)lar = Nesne açıklama"
+
+#. module: base_action_rule
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr "Hata: Mail düzgün bir formatta değil"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Actions"
+msgstr "Epsota Eylemleri"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Information"
+msgstr "Eposta Bilgisi"
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule
+msgid "Action Rules"
+msgstr "Eylem Kuralları"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_body:0
+msgid "Content of mail"
+msgstr "Posta içeriği"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_user_id:0
+msgid "Responsible"
+msgstr "Sorumlu"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner_email)s = Partner Email"
+msgstr "%(paydas_eposta)lar = Paydaş Eposta"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr "%(nesne_tarih)ler = Oluşturma tarihi"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_email)s = Responsible Email"
+msgstr "%(nesne_kullanıcı_eposta)lar = Sorumlu Eposta"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_body:0
+msgid "Mail body"
+msgstr "Posta gövdesi"
+
+#. 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 ""
+"Kullanıcıya eposta ile anımsatma gönderme kuralını kullanmak için bunu "
+"işaretleyin."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Server Action to be Triggered"
+msgstr "Tetiklenecek Sunucu Eylemi"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_user:0
+msgid "Mail to Responsible"
+msgstr "Sorumluya Posta"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_cc:0
+msgid "Add Watchers (Cc)"
+msgstr "İzleyici Ekle (Cc)"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Fields"
+msgstr "Model Alanları Koşulları"
+
+#. 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 "Otomatik Eylemler"
+
+#. module: base_action_rule
+#: field:base.action.rule,server_action_id:0
+msgid "Server Action"
+msgstr "Sunucu Eylemi"
+
+#. module: base_action_rule
+#: field:base.action.rule,regex_name:0
+msgid "Regex on Resource Name"
+msgstr "Kaynak Adı için Kurallı İfade"
+
+#. 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 ""
+"Nesneye iliştirilmiş bütün belgelerin gönderilen anımsatma epostasına "
+"eklenmesini isterseniz bunu işaretleyin."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Timing"
+msgstr "Zamanlama Koşulları"
+
+#. module: base_action_rule
+#: field:base.action.rule,sequence:0
+msgid "Sequence"
+msgstr "Diziliş"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Actions"
+msgstr "Eylemler"
+
+#. 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 ""
+"Eğer etkin alanı Yanlış olarak işaretli ise, kuralı silmeden gizlemenizi "
+"sağlar."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user)s = Responsible name"
+msgstr "%(nesne_kullanıcı)lar = Sorumlu adı"
+
+#. module: base_action_rule
+#: field:base.action.rule,create_date:0
+msgid "Create Date"
+msgstr "Tarih Oluştur"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on States"
+msgstr "Durum Koşulları"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_type:0
+msgid "Trigger Date"
+msgstr "Tetikleme Tarihi"
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 5688c0e05b5..a01cf0df8cf 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -1,11 +1,55 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 {
-    "name": "Base calendar",
-    "version": "2.0",
-    "depends": ['base'],
-    "js": [
-        'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.js',
-        'static/src/js/calendar.js'
+    "name" : "Basic Calendar Functionality",
+    "version" : "1.0",
+    "depends" : ["base"],
+    'description': """
+This is a full-featured calendar system.
+========================================
+
+It supports:
+    - Calendar of events
+    - Alerts (create requests)
+    - Recurring events
+    - Invitations to people""",
+    "author" : "OpenERP SA",
+    'category': 'Tools',
+    'website': 'http://www.openerp.com',
+    "init_xml" : [
+        'base_calendar_data.xml'
     ],
-    "css": ['static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.css'],
-    'active': True
+    "demo_xml" : [],
+    "update_xml" : [
+        'security/calendar_security.xml',
+        'security/ir.model.access.csv',
+        'wizard/base_calendar_invite_attendee_view.xml',
+        'base_calendar_view.xml'
+    ],
+    "test" : ['test/base_calendar_test.yml'],
+    "installable" : True,
+    "active" : False,
+    "certificate" : "00694071962960352821",
+    'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg',],
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index bfcccb3dfe0..5f24b08884a 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -22,6 +22,7 @@
 from datetime import datetime, timedelta, date
 from dateutil import parser
 from dateutil import rrule
+from dateutil.relativedelta import relativedelta
 from osv import fields, osv
 from service import web_services
 from tools.translate import _
@@ -47,20 +48,22 @@ def get_recurrent_dates(rrulestring, exdate, startdate=None, exrule=None):
     def todate(date):
         val = parser.parse(''.join((re.compile('\d')).findall(date)))
         return val
-
+    
     if not startdate:
         startdate = datetime.now()
+        
     if not exdate:
         exdate = []
+        
     rset1 = rrule.rrulestr(str(rrulestring), dtstart=startdate, forceset=True)
-
     for date in exdate:
         datetime_obj = todate(date)
         rset1._exdate.append(datetime_obj)
+    
     if exrule:
         rset1.exrule(rrule.rrulestr(str(exrule), dtstart=startdate))
 
-    return list(rset1._iter())
+    return list(rset1)
 
 def base_calendar_id2real_id(base_calendar_id=None, with_date=False):
     """
@@ -338,26 +341,26 @@ class calendar_attendee(osv.osv):
                         help="Status of the attendee's participation"),
         'rsvp':  fields.boolean('Required Reply?',
                     help="Indicats whether the favor of a reply is requested"),
-        'delegated_to': fields.function(_compute_data, method=True, \
+        'delegated_to': fields.function(_compute_data, \
                 string='Delegated To', type="char", size=124, store=True, \
                 multi='delegated_to', help="The users that the original \
 request was delegated to"),
-        'delegated_from': fields.function(_compute_data, method=True, string=\
+        'delegated_from': fields.function(_compute_data, string=\
             'Delegated From', type="char", store=True, size=124, multi='delegated_from'),
         'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', \
                                     'attendee_id', 'parent_id', 'Delegrated From'),
         'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', \
                                       'attendee_id', 'child_id', 'Delegrated To'),
-        'sent_by': fields.function(_compute_data, method=True, string='Sent By', \
+        'sent_by': fields.function(_compute_data, string='Sent By', \
                         type="char", multi='sent_by', store=True, size=124, \
                         help="Specify the user that is acting on behalf of the calendar user"),
-        'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User', \
+        'sent_by_uid': fields.function(_compute_data, string='Sent By User', \
                             type="many2one", relation="res.users", multi='sent_by_uid'),
-        'cn': fields.function(_compute_data, method=True, string='Common name', \
+        'cn': fields.function(_compute_data, string='Common name', \
                             type="char", size=124, multi='cn', store=True),
         'dir': fields.char('URI Reference', size=124, help="Reference to the URI\
 that points to the directory information corresponding to the attendee."),
-        'language': fields.function(_compute_data, method=True, string='Language', \
+        'language': fields.function(_compute_data, string='Language', \
                     type="selection", selection=_lang_get, multi='language', \
                     store=True, help="To specify the language for text values in a\
 property or property parameter."),
@@ -366,14 +369,15 @@ property or property parameter."),
         'partner_id': fields.related('partner_address_id', 'partner_id', type='many2one', \
                         relation='res.partner', string='Partner', help="Partner related to contact"),
         'email': fields.char('Email', size=124, help="Email of Invited Person"),
-        'event_date': fields.function(_compute_data, method=True, string='Event Date', \
+        'event_date': fields.function(_compute_data, string='Event Date', \
                             type="datetime", multi='event_date'),
-        'event_end_date': fields.function(_compute_data, method=True, \
+        'event_end_date': fields.function(_compute_data, \
                             string='Event End Date', type="datetime", \
                             multi='event_end_date'),
         'ref': fields.reference('Event Ref', selection=_links_get, size=128),
         'availability': fields.selection([('free', 'Free'), ('busy', 'Busy')], 'Free/Busy', readonly="True"),
-     }
+    }
+
     _defaults = {
         'state': 'needs-action',
         'role': 'req-participant',
@@ -411,7 +415,7 @@ property or property parameter."),
         cal = vobject.iCalendar()
         event = cal.add('vevent')
         if not event_obj.date_deadline or not event_obj.date:
-              raise osv.except_osv(_('Warning !'),_("Couldn't Invite because date is not specified!"))     
+            raise osv.except_osv(_('Warning !'),_("Couldn't Invite because date is not specified!"))
         event.add('created').value = ics_datetime(time.strftime('%Y-%m-%d %H:%M:%S'))
         event.add('dtstart').value = ics_datetime(event_obj.date)
         event.add('dtend').value = ics_datetime(event_obj.date_deadline)
@@ -456,7 +460,7 @@ property or property parameter."),
             trigger.value = delta
             # Compute other details
             valarm.add('DESCRIPTION').value = alarm_data['name'] or 'OpenERP'
-                
+
         for attendee in event_obj.attendee_ids:
             attendee_add = event.add('attendee')
             attendee_add.params['CUTYPE'] = [str(attendee.cutype)]
@@ -674,7 +678,7 @@ true, it will allow you to hide the event alarm information without removing it.
                     new_res_alarm = alarm_ids[0]
                 cr.execute('UPDATE %s ' % model_obj._table + \
                             ' SET base_calendar_alarm_id=%s, alarm_id=%s ' \
-                            ' WHERE id=%s', 
+                            ' WHERE id=%s',
                             (cal_alarm.id, new_res_alarm, data.id))
 
             self.do_alarm_unlink(cr, uid, [data.id], model)
@@ -806,7 +810,6 @@ class calendar_alarm(osv.osv):
         @param use_new_cursor: False or the dbname
         @param context: A standard dictionary for contextual values
         """
-        return True # XXX FIXME REMOVE THIS AFTER FIXING get_recurrent_dates!!
         if context is None:
             context = {}
         current_datetime = datetime.now()
@@ -914,22 +917,6 @@ class calendar_event(osv.osv):
     def _tz_get(self, cr, uid, context=None):
         return [(x.lower(), x) for x in pytz.all_timezones]
 
-    def onchange_allday(self, cr, uid, ids, allday, context=None):
-        """Sets duration as 24 Hours if event is selected for all day
-        @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 calendar event’s IDs.
-        @param allday: Value of allday boolean
-        @param context: A standard dictionary for contextual values
-        """
-        if not allday or not ids:
-            return {}
-        value = {
-                 'duration': 24
-                 }
-        return {'value': value}
-
     def onchange_dates(self, cr, uid, ids, start_date, duration=False, end_date=False, allday=False, context=None):
         """Returns duration and/or end date based on values passed
         @param self: The object pointer
@@ -952,8 +939,13 @@ class calendar_event(osv.osv):
             value['duration'] = duration
 
         if allday: # For all day event
-            value = {'duration': 24}
+            value = {'duration': 24.0}
             duration = 24.0
+            if start_date:
+                start = datetime.strptime(start_date, "%Y-%m-%d %H:%M:%S")
+                start_date = datetime.strftime(datetime(start.year, start.month, start.day, 0,0,0), "%Y-%m-%d %H:%M:%S")
+                value['date'] = start_date
+
 
         start = datetime.strptime(start_date, "%Y-%m-%d %H:%M:%S")
         if end_date and not duration:
@@ -966,7 +958,7 @@ class calendar_event(osv.osv):
             value['date_deadline'] = end.strftime("%Y-%m-%d %H:%M:%S")
         elif end_date and duration and not allday:
             # we have both, keep them synchronized:
-            # set duration based on end_date (arbitrary decision: this avoid 
+            # set duration based on end_date (arbitrary decision: this avoid
             # getting dates like 06:31:48 instead of 06:32:00)
             end = datetime.strptime(end_date, "%Y-%m-%d %H:%M:%S")
             diff = end - start
@@ -982,88 +974,10 @@ class calendar_event(osv.osv):
         """
         if context is None:
             context = {}
-        cr.execute('select id from '+self._table+' where recurrent_uid in %s', (tuple(ids),))
-        r_ids = map(lambda x: x[0], cr.fetchall())
-        self.unlink(cr, uid, r_ids, context=context)
-        return True
-
-    def _set_rrulestring(self, cr, uid, id, name, value, arg, context=None):
-        """
-        Sets values of fields that defines event recurrence from the value of rrule string
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param id: List of calendar event's ids.
-        @param context: A standard dictionary for contextual values
-        @return: dictionary of rrule value.
-        """
-        if context is None:
-            context = {}
-        cr.execute("UPDATE %s set freq='None',interval=0,count=0,end_date=Null,\
-                    mo=False,tu=False,we=False,th=False,fr=False,sa=False,su=False,\
-                    day=0,select1='date',month_list=Null ,byday=Null where id=%%s" % (self._table), (id,))
-
-        if not value:
-            cr.execute("UPDATE %s set rrule_type='none' where id=%%s" % self._table,(id,))
-            return True
-        val = {}
-        for part in value.split(';'):
-            if part.lower().__contains__('freq') and len(value.split(';')) <=2:
-                rrule_type = part.lower()[5:]
-                break
-            else:
-                rrule_type = 'custom'
-                break
-        ans = value.split(';')
-        for i in ans:
-            val[i.split('=')[0].lower()] = i.split('=')[1].lower()
-        if not val.get('interval'):
-            rrule_type = 'custom'
-        elif int(val.get('interval')) > 1: #If interval is other than 1 rule is custom
-            rrule_type = 'custom'
-
-        qry = "UPDATE \"%s\" set rrule_type=%%s " % self._table
-        qry_args = [ rrule_type, ]
-        new_val = val.copy()
-        for k, v in val.items():
-            if  val['freq'] == 'weekly' and val.get('byday'):
-                for day in val['byday'].split(','):
-                    new_val[day] = True
-                val.pop('byday')
-
-            if val.get('until'):
-                until = parser.parse(''.join((re.compile('\d')).findall(val.get('until'))))
-                new_val['end_date'] = until.strftime('%Y-%m-%d')
-                val.pop('until')
-                new_val.pop('until')
-
-            if val.get('bymonthday'):
-                new_val['day'] = val.get('bymonthday')
-                val.pop('bymonthday')
-                new_val['select1'] = 'date'
-                new_val.pop('bymonthday')
-
-            if val.get('byday'):
-                d = val.get('byday')
-                if '-' in d:
-                    new_val['byday'] = d[:2]
-                    new_val['week_list'] = d[2:4].upper()
-                else:
-                    new_val['byday'] = d[:1]
-                    new_val['week_list'] = d[1:3].upper()
-                new_val['select1'] = 'day'
-
-            if val.get('bymonth'):
-                new_val['month_list'] = val.get('bymonth')
-                val.pop('bymonth')
-                new_val.pop('bymonth')
-
-        for k, v in new_val.items():
-            qry += ", %s=%%s" % k
-            qry_args.append(v)
-
-        qry = qry + " where id=%s"
-        qry_args.append(id)
-        cr.execute(qry, qry_args)
+        for event_id in ids:
+            cr.execute("select id from %s where recurrent_uid=%%s" % (self._table), (event_id,))
+            r_ids = map(lambda x: x[0], cr.fetchall())
+            self.unlink(cr, uid, r_ids, context=context)
         return True
 
     def _get_rulestring(self, cr, uid, ids, name, arg, context=None):
@@ -1075,28 +989,15 @@ class calendar_event(osv.osv):
         @param context: A standard dictionary for contextual values
         @return: dictionary of rrule value.
         """
+        
         result = {}
-        for datas in self.read(cr, uid, ids, context=context):
+        for datas in self.read(cr, uid, ids, ['id','byday','recurrency', 'month_list','end_date', 'rrule_type', 'select1', 'interval', 'count', 'end_type', 'mo', 'tu', 'we', 'th', 'fr', 'sa', 'su', 'exrule', 'day', 'week_list' ], context=context):
             event = datas['id']
-            if datas.get('rrule_type'):
-                if datas.get('rrule_type') == 'none':
-                    result[event] = False
-                    cr.execute("UPDATE %s set exrule=Null where id=%%s" % self._table,( event,))
-                if datas.get('rrule_type') :
-                    if datas.get('interval', 0) < 0:
-                        raise osv.except_osv(_('Warning!'), _('Interval can not be Negative'))
-                    if datas.get('count', 0) < 0:
-                        raise osv.except_osv(_('Warning!'), _('Count can not be Negative'))
-                    rrule_custom = self.compute_rule_string(cr, uid, datas, \
-                                                         context=context)
-                    result[event] = rrule_custom
-                else:
-                    result[event] = self.compute_rule_string(cr, uid, {'freq': datas.get('rrule_type').upper(), 'interval': 1}, context=context)
-
-        for id, myrule in result.items():
-            #Remove the events generated from recurrent event
-            if not myrule:
-                self.unlink_events(cr, uid, [id], context=context)
+            if datas.get('interval', 0) < 0:
+                raise osv.except_osv(_('Warning!'), _('Interval can not be Negative'))
+            if datas.get('count', 0) < 0:
+                raise osv.except_osv(_('Warning!'), _('Count can not be Negative'))
+            result[event] = self.compute_rule_string(datas)
         return result
 
     _columns = {
@@ -1121,15 +1022,11 @@ class calendar_event(osv.osv):
 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, method=True, \
-                                    string='Recurrent Rule', store=True, \
-                                    fnct_inv=_set_rrulestring, help='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'),
+        'rrule': fields.function(_get_rulestring, type='char', size=124, \
+                                    store=True, string='Recurrent Rule'),
         'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \
                             ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
-                            ('yearly', 'Yearly'),], 
+                            ('yearly', 'Yearly'),],
                             'Recurrency', states={'done': [('readonly', True)]},
                             help="Let the event automatically repeat at that interval"),
         'alarm_id': fields.many2one('res.alarm', 'Alarm', states={'done': [('readonly', True)]},
@@ -1141,14 +1038,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
         'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
         'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with Organizer Attribure of VEvent.
         'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}),
-        'freq': fields.selection([('None', 'No Repeat'),
-                                ('hourly', 'Hours'),
-                                ('daily', 'Days'),
-                                ('weekly', 'Weeks'),
-                                ('monthly', 'Months'),
-                                ('yearly', 'Years'), ], 'Frequency'),
-          
-        'end_type' : fields.selection([('forever', 'Forever'), ('count', 'Fix amout of times'), ('end_date','End date')], 'Way to end reccurency'),
+        'end_type' : fields.selection([('count', 'Fix amout of times'), ('end_date','End date')], 'Way to end reccurency'),
         'interval': fields.integer('Repeat every', help="Repeat every (Days/Week/Month/Year)"),
         'count': fields.integer('Repeat', help="Repeat x times"),
         'mo': fields.boolean('Mon'),
@@ -1158,7 +1048,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
         'fr': fields.boolean('Fri'),
         'sa': fields.boolean('Sat'),
         'su': fields.boolean('Sun'),
-        'select1': fields.selection([('date', 'Date of month'), 
+        'select1': fields.selection([('date', 'Date of month'),
                                     ('day', 'Day of month')], 'Option'),
         'day': fields.integer('Date of month'),
         'week_list': fields.selection([('MO', 'Monday'), ('TU', 'Tuesday'), \
@@ -1175,8 +1065,8 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
         'allday': fields.boolean('All Day', states={'done': [('readonly', True)]}),
         '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."),        
+        '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):
         user_pool = self.pool.get('res.users')
@@ -1187,11 +1077,12 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
         return res
 
     _defaults = {
-            'end_type' : 'forever',
+            'end_type' : 'count',
+            'count' : 1,
+            'rrule_type' : 'none',
             'state': 'tentative',
             'class': 'public',
             'show_as': 'busy',
-            'freq': 'None',
             'select1': 'date',
             'interval': 1,
             'active': 1,
@@ -1200,43 +1091,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
             'edit_all' : False,
     }
 
-    def onchange_edit_all(self, cr, uid, ids, rrule_type,edit_all, context=None):
-        if not context:
-            context = {}
-    
-        value = {}
-        if edit_all and rrule_type:
-            for id in ids:
-                base_calendar_id2real_id(id)
-        return value              
-
-    def modify_all(self, cr, uid, event_ids, defaults, context=None, *args):
-        """
-        Modifies the recurring event
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param event_ids: List of crm meeting’s IDs.
-        @param context: A standard dictionary for contextual values
-        @return: True
-        """
-        for event_id in event_ids:
-            event_id = base_calendar_id2real_id(event_id)
-
-            defaults.pop('id')
-            defaults.update({'table': self._table})
-
-            qry = "UPDATE %(table)s set name = '%(name)s', \
-                            date = '%(date)s', date_deadline = '%(date_deadline)s'"
-            if defaults.get('alarm_id'):
-                qry += ", alarm_id = %(alarm_id)s"
-            if defaults.get('location'):
-                qry += ", location = '%(location)s'"
-            qry += "WHERE id = %s" % (event_id)
-            cr.execute(qry, defaults)
-
-        return True
-
-    def get_recurrent_ids(self, cr, uid, select, base_start_date, base_until_date, limit=100):
+    def get_recurrent_ids(self, cr, uid, select, base_start_date, base_until_date, 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
@@ -1245,46 +1100,32 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
         @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 not limit:
-            limit = 100
         if isinstance(select, (str, int, long)):
             ids = [select]
         else:
             ids = select
         result = []
-        recur_dict = []
-        if ids and (base_start_date or base_until_date):
-            cr.execute("select m.id, m.rrule, m.date, m.date_deadline, m.duration, \
-                            m.exdate, m.exrule, m.recurrent_id, m.recurrent_uid from " + self._table + \
-                            " m where m.id = ANY(%s)", (ids,) )
-
-            count = 0
-            for data in cr.dictfetchall():
+        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
-                if count > limit:
-                    break
                 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
-                start_date = event_date
+                
                 if not data['rrule']:
                     if start_date and (event_date < start_date):
                         continue
                     if until_date and (event_date > until_date):
                         continue
-                    idval = real_id2base_calendar_id(data['id'], data['date'])
-                    if not data['recurrent_id']:
-                        result.append(idval)
-                        count += 1
-                    else:
-                        ex_id = real_id2base_calendar_id(data['recurrent_uid'], data['recurrent_id'])
-                        ls = base_calendar_id2real_id(ex_id, with_date=data and data.get('duration', 0) or 0)
-                        if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
-                            if ls[1] == data['recurrent_id']:
-                                result.append(idval)
-                        recur_dict.append(ex_id)
+                    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 = []
@@ -1300,6 +1141,8 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
                                 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:
@@ -1309,6 +1152,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
                         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
@@ -1316,77 +1160,75 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
                             continue
                         idval = real_id2base_calendar_id(data['id'], r_date.strftime("%Y-%m-%d %H:%M:%S"))
                         result.append(idval)
-                        count += 1
+
         if result:
-            ids = list(set(result)-set(recur_dict))
+            ids = list(set(result))
         if isinstance(select, (str, int, long)):
             return ids and ids[0] or False
         return ids
 
-    def compute_rule_string(self, cr, uid, datas, context=None, *args):
+    def compute_rule_string(self, datas):
         """
         Compute rule string according to value type RECUR of iCalendar from the values given.
         @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 datas: dictionary of freq and interval value.
-        @param context: A standard dictionary for contextual values
-        @return: String value of the format RECUR of iCalendar
         """
-
-        weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su']
-        weekstring = ''
-        monthstring = ''
-        yearstring = ''
-        freq=datas.get('rrule_type')
-        if  freq == 'none':
+        
+        def get_week_string(freq, datas):
+            weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su']
+            if freq == 'weekly':
+                byday = map(lambda x: x.upper(), filter(lambda x: datas.get(x) and x in weekdays, datas))
+                if byday:
+                    return ';BYDAY=' + ','.join(byday)
+            return ''  
+        
+        def get_month_string(freq, datas):
+            if freq == 'monthly':
+                if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31):
+                    raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
+                
+                if datas.get('select1')=='day':
+                    return ';BYDAY=' + datas.get('byday') + datas.get('week_list')
+                elif datas.get('select1')=='date':
+                    return ';BYMONTHDAY=' + str(datas.get('day'))
             return ''
+        
+        def get_end_date(datas):
+            if datas.get('end_date'):
+                datas['end_date_new'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + 'T235959Z'
             
-        interval_srting = datas.get('interval') and (';INTERVAL=' + str(datas.get('interval'))) or ''
-
-        if freq == 'weekly':
-            byday = map(lambda x: x.upper(), filter(lambda x: datas.get(x) and x in weekdays, datas))
-            if byday:
-                weekstring = ';BYDAY=' + ','.join(byday)
-
-        elif freq == 'monthly':
-            if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31):
-                raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
-            if datas.get('select1')=='day':
-                monthstring = ';BYDAY=' + datas.get('byday') + datas.get('week_list')
-            elif datas.get('select1')=='date':
-                monthstring = ';BYMONTHDAY=' + str(datas.get('day'))
-
+            return (datas.get('end_type') == 'count' and (';COUNT=' + str(datas.get('count'))) or '') +\
+                             ((datas.get('end_date_new') and datas.get('end_type') == 'end_date' and (';UNTIL=' + datas.get('end_date_new'))) or '')
        
-        if datas.get('end_date'):
-            datas['end_date'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + 'T235959Z'
-        enddate = (datas.get('count') and (';COUNT=' + str(datas.get('count'))) or '') +\
-                             ((datas.get('end_date') and (';UNTIL=' + datas.get('end_date'))) or '')
+        freq=datas.get('rrule_type')
+        if freq == 'none':
+            return ''
+        interval_srting = datas.get('interval') and (';INTERVAL=' + str(datas.get('interval'))) or ''
+        return 'FREQ=' + freq.upper() + get_week_string(freq, datas) + interval_srting + get_end_date(datas) + get_month_string(freq, datas)
 
-        rrule_string = 'FREQ=' + freq.upper() + weekstring + interval_srting \
-                            + enddate + monthstring + yearstring
 
-        return rrule_string
-
-    def search(self, cr, uid, args, offset=0, limit=100, order=None,
+    def remove_virtual_id(self, ids):
+        if isinstance(ids, (str, int)):
+            return base_calendar_id2real_id(ids)
+            
+        if isinstance(ids, (list, tuple)):
+            res = []
+            for id in ids:
+                res.append(base_calendar_id2real_id(id))
+            return res
+                
+    def search(self, cr, uid, args, offset=0, limit=0, order=None,
             context=None, count=False):
-        """
-        Overrides orm search method.
-        @param cr: the current row, from the database cursor,
-        @param user: the current user’s ID for security checks,
-        @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
-        @param offset: The Number of Results to Pass
-        @param limit: The Number of Results to Return
-        @param context: A standard dictionary for contextual values
-        @param count: If its True the method returns number of records instead of ids
-        @return: List of id
-        """
         args_without_date = []
         start_date = False
         until_date = False
 
         for arg in args:
-            if arg[0] not in ('date', unicode('date'), 'date_deadline', unicode('date_deadline')):
+            if arg[0] == "id":
+                new_id = self.remove_virtual_id(arg[2])
+                new_arg = (arg[0], arg[1], new_id)
+                args_without_date.append(new_arg)
+            elif arg[0] not in ('date', unicode('date'), 'date_deadline', unicode('date_deadline')):
                 args_without_date.append(arg)
             else:
                 if arg[1] in ('>', '>='):
@@ -1397,12 +1239,17 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
                     if until_date:
                         continue
                     until_date = arg[2]
+        
         res = super(calendar_event, self).search(cr, uid, args_without_date, \
-                                 offset, limit, order, context, count)
+                                 0, 0, order, context, count=False)
+        res = self.get_recurrent_ids(cr, uid, res, start_date, until_date, limit, context=context)
+        if count:
+            return len(res)
+        elif limit:
+            return res[offset:offset+limit]
+        else:
+            return res
 
-        res = self.get_recurrent_ids(cr, uid, res, start_date, until_date, limit)
-        return res
-    
 
     def get_edit_all(self, cr, uid, id, vals=None):
         """
@@ -1413,22 +1260,25 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
         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'] 
+            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]
 
-        
-
+    def need_to_update(self, event_id, vals):
+        split_id = str(event_id).split("-")
+        if len(split_id) < 2:
+            return False 
+        else:
+            date_start = vals.get('date', '')
+            try:
+                date_start = datetime.strptime(date_start, '%Y-%m-%d %H:%M:%S').strftime("%Y%m%d%H%M%S")
+                return date_start == split_id[1]
+            except Exception:
+                return True
+  
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
-        """
-        Overrides orm write method.
-        @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 crm meeting's ids
-        @param vals: Dictionary of field value.
-        @param context: A standard dictionary for contextual values
-        @return: True
-        """
         if context is None:
             context = {}
         if isinstance(ids, (str, int, long)):
@@ -1440,12 +1290,15 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
         for event_id in select:
             real_event_id = base_calendar_id2real_id(event_id)
             
-
-            if(self.get_edit_all(cr, uid, event_id, vals=vals)):
+            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 len(str(event_id).split('-')) > 1:
+
+            #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'):
@@ -1458,15 +1311,15 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
                         'edit_all': False,
                         'recurrency' : False,
                         })
-                    
+
                     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})
-                    
+
                     context.update({'active_id': new_id, 'active_ids': [new_id]})
                     continue
             if not real_event_id in new_ids:
@@ -1482,10 +1335,6 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
             vals.get('allday', False),
             context=context)
         vals.update(updated_vals.get('value', {}))
-
-        if not 'edit_all' in vals:
-            vals['edit_all'] = False
-
         if new_ids:
             res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context)
 
@@ -1494,18 +1343,9 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
             # change alarm details
             alarm_obj = self.pool.get('res.alarm')
             alarm_obj.do_alarm_create(cr, uid, new_ids, self._name, 'date', context=context)
-        return res
+        return res or True and False
 
     def browse(self, cr, uid, ids, context=None, list_class=None, fields_process=None):
-        """
-        Overrides orm browse method.
-        @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 crm meeting's ids
-        @param context: A standard dictionary for contextual values
-        @return: the object list.
-        """
         if isinstance(ids, (str, int, long)):
             select = [ids]
         else:
@@ -1518,19 +1358,29 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
 
         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)
+        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:
+            #remove the count, since the value is not consistent with the result of the search when expand the group
+            for groupname in groupby:
+                if re.get(groupname + "_count"):
+                    del re[groupname + "_count"]
+            re.get('__context').update({'virtual_id' : virtual_id})
+        return res
+
     def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
-        """
-        Overrides orm Read method.Read List of fields for calendar event.
-        @param cr: the current row, from the database cursor,
-        @param user: the current user’s ID for security checks,
-        @param ids: List of calendar event's id.
-        @param fields: List of fields.
-        @param context: A standard dictionary for contextual values
-        @return: List of Dictionary of form [{‘name_of_the_field’: value, ...}, ...]
-        """
         # FIXME This whole id mangling has to go!
         if context is None:
             context = {}
+        
+
 
         if isinstance(ids, (str, int, long)):
             select = [ids]
@@ -1544,9 +1394,10 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
             fields.append('duration')
 
 
-        for base_calendar_id, real_id in select:
+        for base_calendar_id, real_id in select:                
             #REVET: Revision ID: olt@tinyerp.com-20100924131709-cqsd1ut234ni6txn
             res = super(calendar_event, self).read(cr, uid, real_id, fields=fields, context=context, load=load)
+           
             if not res :
                 continue
             ls = base_calendar_id2real_id(base_calendar_id, with_date=res and res.get('duration', 0) or 0)
@@ -1558,41 +1409,34 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
             result.append(res)
         if isinstance(ids, (str, int, long)):
             return result and result[0] or False
+        
         return result
 
     def copy(self, cr, uid, id, default=None, context=None):
-        """
-        Duplicate record on specified id.
-        @param self: the object pointer.
-        @param cr: the current row, from the database cursor,
-        @param id: id of record from which we duplicated.
-        @param context: A standard dictionary for contextual values
-        @return: Duplicate record id.
-        """
         if context is None:
             context = {}
+            
         res = super(calendar_event, self).copy(cr, uid, base_calendar_id2real_id(id), default, context)
         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):
-        """
-        Deletes records specified in ids.
-        @param self: the object pointer.
-        @param cr: the current row, from the database cursor,
-        @param id: List of calendar event's id.
-        @param context: A standard dictionary for contextual values
-        @return: True
-        """
-        res = False
-        for event_datas in self.read(cr, uid, ids, ['date', 'rrule', 'exdate'], context=context):
-            event_id = event_datas['id']
+        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:
+                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)
-            
+
             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)
@@ -1600,11 +1444,11 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
             else:
                 str_event, date_new = event_id.split('-')
                 event_id = int(str_event)
-                if event_datas['rrule']:
+                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_datas['exdate'] and (event_datas['exdate'] + ',')  or '') + date_new
+                    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)
@@ -1613,15 +1457,6 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
         return res
 
     def create(self, cr, uid, vals, context=None):
-        """
-        Create new record.
-        @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 vals: dictionary of every field value.
-        @param context: A standard dictionary for contextual values
-        @return: new created record id.
-        """
         if context is None:
             context = {}
 
@@ -1635,11 +1470,13 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
             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
@@ -1710,12 +1547,12 @@ class calendar_todo(osv.osv):
         @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
         @param context: A standard dictionary for contextual values
         """
-        
+
         assert name == 'date'
         return self.write(cr, uid, id, { 'date_start': value }, context=context)
 
     _columns = {
-        'date': fields.function(_get_date, method=True, fnct_inv=_set_date, \
+        'date': fields.function(_get_date, fnct_inv=_set_date, \
                             string='Duration', store=True, type='datetime'),
         'duration': fields.integer('Duration'),
     }
@@ -1742,9 +1579,9 @@ class ir_attachment(osv.osv):
         for arg in args:
             args1.append(map(lambda x:str(x).split('-')[0], arg))
         return super(ir_attachment, self).search_count(cr, user, args1, context)
-        
-        
-    
+
+
+
     def create(self, cr, uid, vals, context=None):
         if context:
             id = context.get('default_res_id', False)
@@ -1913,7 +1750,7 @@ class res_users(osv.osv):
     _columns = {
             'availability': fields.function(_get_user_avail_fun, type='selection', \
                     selection=[('free', 'Free'), ('busy', 'Busy')], \
-                    string='Free/Busy', method=True),
+                    string='Free/Busy'),
     }
 
 res_users()
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index d5525e48e74..451152b2b58 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -242,8 +242,7 @@
                             widget="selection" />
                         <group colspan="2" col="4" attrs="{'readonly': [('state','=','done')]}">
                            <field name="recurrency"/>      
-                           <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}"
-                                on_change="onchange_edit_all(rrule_type,edit_all)"/>                                    
+                           <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}" />                                    
                         </group>
                     </group>
                     <notebook colspan="4">
diff --git a/addons/base_calendar/i18n/ln.po b/addons/base_calendar/i18n/ln.po
new file mode 100644
index 00000000000..5be9e36cbeb
--- /dev/null
+++ b/addons/base_calendar/i18n/ln.po
@@ -0,0 +1,1658 @@
+# Lingala 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-05-30 11:47+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lingala <ln@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-05-31 04:47+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Hourly"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,exdate:0
+#: help:calendar.todo,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+
+#. module: base_calendar
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event.edit.all,name:0
+msgid "Title"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invited User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,recurrency:0
+#: help:calendar.todo,recurrency:0
+msgid "Recurrent Meeting"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
+#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
+msgid "Alarms"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Sunday"
+msgstr "Lomíngo"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,role:0
+msgid "Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation details"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,day:0
+#: selection:base.calendar.set.exrule,select1:0
+#: field:calendar.event,day:0
+#: selection:calendar.event,select1:0
+#: field:calendar.todo,day:0
+#: selection:calendar.todo,select1:0
+msgid "Date of month"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid " "
+msgstr " "
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "March"
+msgstr "mársi"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Friday"
+msgstr "Misálá mítáno"
+
+#. module: base_calendar
+#: field:calendar.event,allday:0
+#: field:calendar.todo,allday:0
+msgid "All Day"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,select1:0
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+msgid "Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Free"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,rsvp:0
+msgid "Indicats whether the favor of a reply is requested"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
+#. module: base_calendar
+#: help:calendar.attendee,delegated_to:0
+msgid "The users that the original request was delegated to"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,ref:0
+msgid "Event Ref"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,we:0
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr "Mís"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show time as"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,tu:0
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr "Míb"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr "Mikɔlɔ"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1355
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Chair Person"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Minutes"
+msgstr "Minúti"
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Display"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "Edit all Occurrences"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Secondly"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Group By..."
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,email:0
+msgid "Provide external email address who will receive this invitation."
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.module.module,description:base_calendar.module_meta_information
+msgid ""
+"Full featured calendar system that supports:\n"
+"    - Calendar of events\n"
+"    - Alerts (create requests)\n"
+"    - Recurring events\n"
+"    - Invitations to people"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Years"
+msgstr "Mibú"
+
+#. module: base_calendar
+#: field:calendar.alarm,event_end_date:0
+#: field:calendar.attendee,event_end_date:0
+msgid "Event End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Optional Participation"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,date_deadline:0
+#: field:calendar.todo,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,active:0
+#: help:calendar.todo,active:0
+msgid ""
+"If the active field is set to          true, it will allow you to hide the "
+"event alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
+msgid "Basic Calendar Functionality"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,organizer:0
+#: field:calendar.event,organizer_id:0
+#: field:calendar.todo,organizer:0
+#: field:calendar.todo,organizer_id:0
+msgid "Organizer"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+#: field:calendar.event,user_id:0
+#: field:calendar.todo,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:res.request.link,name:base_calendar.request_link_meeting
+msgid "Event"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,edit_all:0
+#: help:calendar.todo,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "Before"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
+msgid "Edit all events"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attendee_ids:0
+#: field:calendar.event,attendee_ids:0
+#: field:calendar.todo,attendee_ids:0
+msgid "Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirm"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_todo
+msgid "Calendar Task"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,su:0
+#: field:calendar.event,su:0
+#: field:calendar.todo,su:0
+msgid "Sun"
+msgstr "Lom"
+
+#. module: base_calendar
+#: field:calendar.attendee,cutype:0
+msgid "Invite Type"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder details"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,parent_ids:0
+msgid "Delegrated From"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,select1:0
+#: selection:calendar.event,select1:0
+#: selection:calendar.todo,select1:0
+msgid "Day of month"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,location:0
+#: field:calendar.event.edit.all,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,send_mail:0
+msgid "Send mail?"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,email:0
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr "Nkandá"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Event Detail"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Confidential"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,end_date:0
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid ""
+"Create specific calendar alarms that may be assigned to calendar events or "
+"meetings."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "Select range to Exclude"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr "yúli"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,th:0
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+msgid "Thu"
+msgstr "Mín"
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required Reply"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Forever"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#, python-format
+msgid "Can not Duplicate"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+msgid "Mark as"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_address_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule_type:0
+#: help:calendar.todo,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Delegate"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Ok"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "First"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Privacy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Subject"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr "sɛtɛ́mbɛ"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "December"
+msgstr "dɛsɛ́mbɛ"
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,send_mail:0
+msgid "Check this if you want to send an Email to Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Availability"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "_Save"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Individual"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,count:0
+#: help:calendar.todo,count:0
+msgid "Repeat x times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegation Info"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date:0
+msgid "Start Date"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cn:0
+msgid "Common name"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Declined"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "My Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "My Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Decline"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Weeks"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,edit_all:0
+#: field:calendar.todo,edit_all:0
+msgid "Edit All"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,contact_ids:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_alarm
+msgid "Basic Alarm Information"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,fr:0
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr "Mít"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr "Ngonga"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule:0
+#: field:calendar.todo,rrule:0
+msgid "Recurrent Rule"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attach:0
+msgid "Attachment"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation From"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "End of recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,alarm_id:0
+msgid "Reminder"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
+msgid "Set Exrule"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:ir.actions.act_window,name:base_calendar.action_view_event
+#: model:ir.ui.menu,name:base_calendar.menu_events
+msgid "Events"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
+#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
+msgid "Invite Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,email:0
+msgid "Email of Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,repeat:0
+#: field:calendar.event,count:0
+#: field:calendar.todo,count:0
+#: field:res.alarm,repeat:0
+msgid "Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,dir:0
+msgid ""
+"Reference to the URIthat points to the directory information corresponding "
+"to the attendee."
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr "augústo"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr "Mosálá mɔ̌kɔ́"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr "yúni"
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: view:calendar.event:0
+msgid "The"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_from:0
+msgid "Delegated From"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
+msgstr "Dáte"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "November"
+msgstr "novɛ́mbɛ"
+
+#. module: base_calendar
+#: help:calendar.attendee,member:0
+msgid "Indicate the groups that the attendee belongs to"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Data"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,mo:0
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr "Mɔ́k"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,count:0
+msgid "Count"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "October"
+msgstr "ɔkɔtɔ́bɛ"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Uncertain"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr "Lokótá"
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_occurs:0
+#: field:res.alarm,trigger_occurs:0
+msgid "Triggers"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr "yanwáli"
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,interval:0
+#: field:calendar.alarm,trigger_interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr "Misálá mísáto"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1088
+#, python-format
+msgid "Interval can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,name:0
+#: view:calendar.event:0
+msgid "Summary"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,active:0
+#: field:calendar.event,active:0
+#: field:calendar.todo,active:0
+#: field:res.alarm,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,action:0
+msgid "Action"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,type:0
+msgid "Select whom you want to Invite"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,duration:0
+#: help:res.alarm,duration:0
+msgid ""
+"Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
+"other"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
+msgid "Calendar Edit all event"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,role:0
+msgid "Participation role for the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_to:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,action:0
+msgid "Defines the action to be invoked when an alarm is triggered"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "End date"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Search Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Weekly"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,active:0
+#: help:res.alarm,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the event "
+"alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr ""
+
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,state:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,state:0
+#: view:calendar.event:0
+#: field:calendar.event,state:0
+#: field:calendar.todo,state:0
+msgid "State"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder Details"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "To Review"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,freq:0
+#: field:calendar.event,freq:0
+#: field:calendar.todo,freq:0
+msgid "Frequency"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Done"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,interval:0
+#: help:calendar.todo,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: field:base_calendar.invite.attendee,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "of"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+#: view:calendar.event.edit.all:0
+msgid "Cancel"
+msgstr "Tika"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Tuesday"
+msgstr "Misálá míbalé"
+
+#. module: base_calendar
+#: help:calendar.alarm,description:0
+msgid ""
+"Provides a more complete                             description of the "
+"calendar component, than that                             provided by the "
+"\"SUMMARY\" property"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Busy"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event
+msgid "Calendar Event"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Tentative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,interval:0
+#: field:calendar.todo,interval:0
+msgid "Repeat every"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Fix amout of times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
+#: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
+msgid "Event Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Thursday"
+msgstr "Misálá mínei"
+
+#. module: base_calendar
+#: field:calendar.event,exrule:0
+#: field:calendar.todo,exrule:0
+msgid "Exception Rule"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,language:0
+msgid ""
+"To specify the language for text values in aproperty or property parameter."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Details"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,exrule:0
+#: help:calendar.todo,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,month_list:0
+#: field:calendar.event,month_list:0
+#: field:calendar.todo,month_list:0
+msgid "Month"
+msgstr "Sánzá"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule:0
+#: help:calendar.todo,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: base_calendar
+#: field:calendar.attendee,dir:0
+msgid "URI Reference"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,description:0
+#: view:calendar.event:0
+#: field:calendar.event,description:0
+#: field:calendar.event,name:0
+#: field:calendar.todo,description:0
+#: field:calendar.todo,name:0
+msgid "Description"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "May"
+msgstr "máyí"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,type:0
+#: view:calendar.attendee:0
+msgid "Type"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Search Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "After"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Stop"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_values
+msgid "ir.values"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_model
+msgid "Objects"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,sa:0
+#: field:calendar.event,sa:0
+#: field:calendar.todo,sa:0
+msgid "Sat"
+msgstr "Mpɔ́"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Minutely"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,sent_by:0
+msgid "Specify the user that is acting on behalf of the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date_deadline:0
+msgid "End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr "febwáli"
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Months"
+msgstr "Sánzá"
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Resource"
+msgstr ""
+
+#. module: base_calendar
+#: field:res.alarm,name:0
+msgid "Name"
+msgstr "Nkómbó"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,name:0
+msgid ""
+"Contains the text to be                      used as the message subject for "
+"email                      or contains the text to be used for display"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,alarm_id:0
+#: field:calendar.event,base_calendar_alarm_id:0
+#: field:calendar.todo,alarm_id:0
+#: field:calendar.todo,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Please Apply Recurrency before applying Exception Rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr "apríli"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,week_list:0
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,byday:0
+#: field:calendar.event,byday:0
+#: field:calendar.todo,byday:0
+msgid "By day"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Audio"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,id:0
+#: field:calendar.todo,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "For information Purpose"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Invite"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by:0
+msgid "Sent By"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,sequence:0
+#: field:calendar.todo,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,alarm_id:0
+#: help:calendar.todo,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Internal User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Accept"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr "Mpɔ́sɔ"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation To"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Second"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,availability:0
+#: field:res.users,availability:0
+msgid "Free/Busy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,end_type:0
+#: field:calendar.todo,end_type:0
+msgid "Way to end reccurency"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,duration:0
+#: field:calendar.alarm,trigger_duration:0
+#: field:calendar.event,duration:0
+#: field:calendar.todo,date:0
+#: field:calendar.todo,duration:0
+#: field:res.alarm,duration:0
+#: field:res.alarm,trigger_duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_date:0
+msgid "Trigger Date"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,attach:0
+msgid ""
+"* Points to a sound resource,                     which is rendered when the "
+"alarm is triggered for audio,\n"
+"                    * File which is intended to be sent as message "
+"attachments for email,\n"
+"                    * Points to a procedure resource, which is invoked when  "
+"                    the alarm is triggered for procedure."
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/base_calendar/i18n/tr.po b/addons/base_calendar/i18n/tr.po
index 2237e4ba73f..ba228085c56 100644
--- a/addons/base_calendar/i18n/tr.po
+++ b/addons/base_calendar/i18n/tr.po
@@ -8,20 +8,20 @@ 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-23 18:46+0000\n"
+"PO-Revision-Date: 2011-06-23 19:26+0000\n"
 "Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <tr@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-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-24 05:00+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event starts"
-msgstr "Olay Başlar"
+msgstr "Etkinlik Başlar"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
@@ -31,7 +31,7 @@ msgstr "Saatlik"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required to Join"
-msgstr "Katılmak gerekir"
+msgstr "Katılım Gerekir"
 
 #. module: base_calendar
 #: help:calendar.event,exdate:0
@@ -46,19 +46,19 @@ msgstr ""
 #. module: base_calendar
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Seçilen firma bu kullanıcı için izin verilen şirketler arasında yok"
 
 #. module: base_calendar
 #: field:calendar.event.edit.all,name:0
 msgid "Title"
-msgstr "Başlık"
+msgstr "Unvan"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Monthly"
-msgstr ""
+msgstr "Aylık"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -68,7 +68,7 @@ msgstr "Davetli Kullanıcı"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation"
-msgstr ""
+msgstr "Davet"
 
 #. module: base_calendar
 #: help:calendar.event,recurrency:0
@@ -80,20 +80,20 @@ msgstr "Yinelenen Toplantı"
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
 msgid "Alarms"
-msgstr ""
+msgstr "Alarmlar"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Sunday"
-msgstr ""
+msgstr "Pazar"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,role:0
 msgid "Role"
-msgstr ""
+msgstr "Rol"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -106,13 +106,13 @@ msgstr "Davet Detayları"
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Fourth"
-msgstr ""
+msgstr "Dördüncü"
 
 #. module: base_calendar
 #: field:calendar.event,show_as:0
 #: field:calendar.todo,show_as:0
 msgid "Show as"
-msgstr "Farklı Göster"
+msgstr "Göster"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,day:0
@@ -122,13 +122,13 @@ msgstr "Farklı Göster"
 #: field:calendar.todo,day:0
 #: selection:calendar.todo,select1:0
 msgid "Date of month"
-msgstr ""
+msgstr "Ayın Günü"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 msgid "Public"
-msgstr "Herkese açık"
+msgstr "Genel"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -140,33 +140,34 @@ msgstr " "
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "March"
-msgstr ""
+msgstr "Mart"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Uyarı !"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Friday"
-msgstr ""
+msgstr "Cuma"
 
 #. module: base_calendar
 #: field:calendar.event,allday:0
 #: field:calendar.todo,allday:0
 msgid "All Day"
-msgstr ""
+msgstr "Tüm Gün"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,select1:0
 #: field:calendar.event,select1:0
 #: field:calendar.todo,select1:0
 msgid "Option"
-msgstr ""
+msgstr "Seçenek"
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
@@ -174,76 +175,76 @@ msgstr ""
 #: selection:calendar.todo,show_as:0
 #: selection:res.users,availability:0
 msgid "Free"
-msgstr ""
+msgstr "Serbest"
 
 #. module: base_calendar
 #: help:calendar.attendee,rsvp:0
 msgid "Indicats whether the favor of a reply is requested"
-msgstr ""
+msgstr "Bir yanıtın onaylanmasının gerekip gerekmediğini belirtir."
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.ek"
 
 #. module: base_calendar
 #: help:calendar.attendee,delegated_to:0
 msgid "The users that the original request was delegated to"
-msgstr ""
+msgstr "Kullanıcıların yetkilendirildiği asıl istek"
 
 #. module: base_calendar
 #: field:calendar.attendee,ref:0
 msgid "Event Ref"
-msgstr ""
+msgstr "Etkinlik Ref"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,we:0
 #: field:calendar.event,we:0
 #: field:calendar.todo,we:0
 msgid "Wed"
-msgstr ""
+msgstr "Çar"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Show time as"
-msgstr ""
+msgstr "Saati şöyle göster"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,tu:0
 #: field:calendar.event,tu:0
 #: field:calendar.todo,tu:0
 msgid "Tue"
-msgstr ""
+msgstr "Sa"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Yearly"
-msgstr ""
+msgstr "Yıllık"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event ends"
-msgstr ""
+msgstr "Etkinlik biter"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Last"
-msgstr ""
+msgstr "Sonuncu"
 
 #. module: base_calendar
 #: help:calendar.attendee,state:0
 msgid "Status of the attendee's participation"
-msgstr ""
+msgstr "Katılımcının iştirak durumu"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Room"
-msgstr ""
+msgstr "Oda"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
@@ -251,83 +252,83 @@ msgstr ""
 #: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Days"
-msgstr ""
+msgstr "Günler"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "Davet Ayrıntısı"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Hata!"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Chair Person"
-msgstr ""
+msgstr "Başkan"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Procedure"
-msgstr ""
+msgstr "Yöntem"
 
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Vazgeçildi"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Minutes"
-msgstr ""
+msgstr "Dakikalar"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Display"
-msgstr ""
+msgstr "Göster"
 
 #. module: base_calendar
 #: view:calendar.event.edit.all:0
 msgid "Edit all Occurrences"
-msgstr ""
+msgstr "Bütün olayları düzenle"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation type"
-msgstr ""
+msgstr "Davet türü"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 msgid "Secondly"
-msgstr ""
+msgstr "İkinci olarak"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_date:0
 #: field:calendar.attendee,event_date:0
 #: view:calendar.event:0
 msgid "Event Date"
-msgstr ""
+msgstr "Etkinlik Tarihi"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruplandır..."
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,email:0
 msgid "Provide external email address who will receive this invitation."
-msgstr ""
+msgstr "Bu daveti alacak olanın dış eposta adresini verin."
 
 #. module: base_calendar
 #: model:ir.module.module,description:base_calendar.module_meta_information
@@ -338,42 +339,47 @@ msgid ""
 "    - Recurring events\n"
 "    - Invitations to people"
 msgstr ""
+"Çok özellikli takvim sistemi şunları destekler:\n"
+"    - Takvim etkinlikleri\n"
+"    - Uyarılar (istekler oluşturun)\n"
+"    - Yinelenen etkinlikler\n"
+"    - Kişilerin davet edilmesi"
 
 #. module: base_calendar
 #: help:calendar.attendee,cutype:0
 msgid "Specify the type of Invitation"
-msgstr ""
+msgstr "Davet türünü belirle"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Years"
-msgstr ""
+msgstr "Yıl"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_end_date:0
 #: field:calendar.attendee,event_end_date:0
 msgid "Event End Date"
-msgstr ""
+msgstr "Etkinlik Bitiş Tarihi"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Optional Participation"
-msgstr ""
+msgstr "Seçime bağlı Katılım"
 
 #. module: base_calendar
 #: field:calendar.event,date_deadline:0
 #: field:calendar.todo,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Bitiş tarihi"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Uyarı!"
 
 #. module: base_calendar
 #: help:calendar.event,active:0
@@ -382,11 +388,13 @@ msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
 msgstr ""
+"Eğer etkin alan doğru olarak ayarlıysa, etkinlik alarmını silmeden "
+"gizleyebilirsiniz."
 
 #. module: base_calendar
 #: model:ir.module.module,shortdesc:base_calendar.module_meta_information
 msgid "Basic Calendar Functionality"
-msgstr ""
+msgstr "Temel Takvim İşlevselliği"
 
 #. module: base_calendar
 #: field:calendar.event,organizer:0
@@ -394,7 +402,7 @@ msgstr ""
 #: field:calendar.todo,organizer:0
 #: field:calendar.todo,organizer_id:0
 msgid "Organizer"
-msgstr ""
+msgstr "Düzenleyen"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -402,88 +410,88 @@ msgstr ""
 #: field:calendar.event,user_id:0
 #: field:calendar.todo,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Sorumlu"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: model:res.request.link,name:base_calendar.request_link_meeting
 msgid "Event"
-msgstr ""
+msgstr "Etkinlik"
 
 #. module: base_calendar
 #: help:calendar.event,edit_all:0
 #: help:calendar.todo,edit_all:0
 msgid "Edit all Occurrences  of recurrent Meeting."
-msgstr ""
+msgstr "Yinelenen Toplantıya ait bütün Olayları Düzenle."
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "Before"
-msgstr ""
+msgstr "Önce"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Onaylandı"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
 msgid "Edit all events"
-msgstr ""
+msgstr "Bütün etkinlikleri düzenle"
 
 #. module: base_calendar
 #: field:calendar.alarm,attendee_ids:0
 #: field:calendar.event,attendee_ids:0
 #: field:calendar.todo,attendee_ids:0
 msgid "Attendees"
-msgstr ""
+msgstr "Katılımcılar"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirm"
-msgstr ""
+msgstr "Onayla"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_todo
 msgid "Calendar Task"
-msgstr ""
+msgstr "Takvim Görevleri"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,su:0
 #: field:calendar.event,su:0
 #: field:calendar.todo,su:0
 msgid "Sun"
-msgstr ""
+msgstr "Paz"
 
 #. module: base_calendar
 #: field:calendar.attendee,cutype:0
 msgid "Invite Type"
-msgstr ""
+msgstr "Davet Türü"
 
 #. module: base_calendar
 #: help:calendar.attendee,partner_id:0
 msgid "Partner related to contact"
-msgstr ""
+msgstr "İlgiliye ait paydaş"
 
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder details"
-msgstr ""
+msgstr "Anımsatma Ayrıntıları"
 
 #. module: base_calendar
 #: field:calendar.attendee,parent_ids:0
 msgid "Delegrated From"
-msgstr ""
+msgstr "Tarafından Yetkilendirldi"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,select1:0
 #: selection:calendar.event,select1:0
 #: selection:calendar.todo,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "Ayın günü"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -491,48 +499,48 @@ msgstr ""
 #: field:calendar.event.edit.all,location:0
 #: field:calendar.todo,location:0
 msgid "Location"
-msgstr ""
+msgstr "Konum"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,send_mail:0
 msgid "Send mail?"
-msgstr ""
+msgstr "Posta gönderilsin mi?"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,email:0
 #: selection:calendar.alarm,action:0
 #: field:calendar.attendee,email:0
 msgid "Email"
-msgstr ""
+msgstr "Eposta"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Event Detail"
-msgstr ""
+msgstr "Etkinlik Ayrıntısı"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Run"
-msgstr ""
+msgstr "Çalıştır"
 
 #. module: base_calendar
 #: field:calendar.event,exdate:0
 #: field:calendar.todo,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "İtiraz Tarihi/Süresi"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 msgid "Confidential"
-msgstr ""
+msgstr "Gizli"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,end_date:0
 #: field:calendar.event,end_date:0
 #: field:calendar.todo,end_date:0
 msgid "Repeat Until"
-msgstr ""
+msgstr "kadar tekrarla"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
@@ -540,286 +548,288 @@ msgid ""
 "Create specific calendar alarms that may be assigned to calendar events or "
 "meetings."
 msgstr ""
+"Takvim etkinliklerine ve toplantılarına atanabilecek özel takvim alarmları "
+"oluştur."
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Visibility"
-msgstr ""
+msgstr "Görünürlük"
 
 #. module: base_calendar
 #: field:calendar.attendee,rsvp:0
 msgid "Required Reply?"
-msgstr ""
+msgstr "Yanıt isteniyor mu?"
 
 #. module: base_calendar
 #: field:calendar.event,base_calendar_url:0
 #: field:calendar.todo,base_calendar_url:0
 msgid "Caldav URL"
-msgstr ""
+msgstr "Caldav URL si"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "Select range to Exclude"
-msgstr ""
+msgstr "Hariç tutulacak alanı seç"
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_uid:0
 #: field:calendar.todo,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "Tekrarlayan ID"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "July"
-msgstr ""
+msgstr "Temmuz"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Accepted"
-msgstr ""
+msgstr "Kabul edildi"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,th:0
 #: field:calendar.event,th:0
 #: field:calendar.todo,th:0
 msgid "Thu"
-msgstr ""
+msgstr "Per"
 
 #. module: base_calendar
 #: field:calendar.attendee,child_ids:0
 msgid "Delegrated To"
-msgstr ""
+msgstr "Şuna Yetkilendirildi"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required Reply"
-msgstr ""
+msgstr "Yanıt İsteniyor"
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "Forever"
-msgstr ""
+msgstr "Sonsuz"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
-msgstr ""
+msgstr "Katılım gerekli"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Vazgeç"
 
 #. module: base_calendar
 #: field:calendar.event,create_date:0
 #: field:calendar.todo,create_date:0
 msgid "Created"
-msgstr ""
+msgstr "Oluşturuldu"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 msgid "Private"
-msgstr ""
+msgstr "Özel"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Daily"
-msgstr ""
+msgstr "Günlük"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
 #, python-format
 msgid "Can not Duplicate"
-msgstr ""
+msgstr "Çoğaltılamaz"
 
 #. module: base_calendar
 #: field:calendar.event,class:0
 #: field:calendar.todo,class:0
 msgid "Mark as"
-msgstr ""
+msgstr "olarak İşaretle"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,partner_address_id:0
 msgid "Contact"
-msgstr ""
+msgstr "İlgili"
 
 #. module: base_calendar
 #: help:calendar.event,rrule_type:0
 #: help:calendar.todo,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr ""
+msgstr "Belirli aralıklarla olayın otomatik olarak tekrarlamasına izin ver"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Delegate"
-msgstr ""
+msgstr "Yetkili"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,partner_id:0
 #: view:calendar.attendee:0
 #: field:calendar.attendee,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Paydaş"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Partner Contacts"
-msgstr ""
+msgstr "Paydaş İlgilileri"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "_Ok"
-msgstr ""
+msgstr "_Tamam"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "First"
-msgstr ""
+msgstr "İlk"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Privacy"
-msgstr ""
+msgstr "Gizlilik"
 
 #. module: base_calendar
 #: field:calendar.event,vtimezone:0
 #: field:calendar.todo,vtimezone:0
 msgid "Timezone"
-msgstr ""
+msgstr "Saat dilimi"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Subject"
-msgstr ""
+msgstr "Konu"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "September"
-msgstr ""
+msgstr "Eylül"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "December"
-msgstr ""
+msgstr "Aralık"
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,send_mail:0
 msgid "Check this if you want to send an Email to Invited Person"
-msgstr ""
+msgstr "Davet edile kişiye Eposta göndermek isterseniz bunu işaretleyin"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Availability"
-msgstr ""
+msgstr "Elverişlilik"
 
 #. module: base_calendar
 #: view:calendar.event.edit.all:0
 msgid "_Save"
-msgstr ""
+msgstr "_Sakla"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Individual"
-msgstr ""
+msgstr "Bireysel"
 
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
 msgid "Repeat x times"
-msgstr ""
+msgstr "x Kere tekrarla"
 
 #. module: base_calendar
 #: field:calendar.alarm,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Sahibi"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Delegation Info"
-msgstr ""
+msgstr "Temsilci Bilgisi"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,date:0
 msgid "Start Date"
-msgstr ""
+msgstr "Başlangıç Tarihi"
 
 #. module: base_calendar
 #: field:calendar.attendee,cn:0
 msgid "Common name"
-msgstr ""
+msgstr "Genel ad"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Declined"
-msgstr ""
+msgstr "Reddedildi"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "My Role"
-msgstr ""
+msgstr "Rolüm"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "My Events"
-msgstr ""
+msgstr "Etkinliklerim"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Decline"
-msgstr ""
+msgstr "Reddet"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Weeks"
-msgstr ""
+msgstr "Haftalar"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Group"
-msgstr ""
+msgstr "Grup"
 
 #. module: base_calendar
 #: field:calendar.event,edit_all:0
 #: field:calendar.todo,edit_all:0
 msgid "Edit All"
-msgstr ""
+msgstr "Hepsini Düzenle"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,contact_ids:0
 msgid "Contacts"
-msgstr ""
+msgstr "İlgililer"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_alarm
 msgid "Basic Alarm Information"
-msgstr ""
+msgstr "Temel Alarm Bilgisi"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,fr:0
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "Cum"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
@@ -827,81 +837,80 @@ msgstr ""
 #: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Hours"
-msgstr ""
+msgstr "Saatler"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
-msgstr ""
+msgstr "Olumsuz olamayacakları say"
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
 msgid "Member"
-msgstr ""
+msgstr "Üye"
 
 #. module: base_calendar
 #: help:calendar.event,location:0
 #: help:calendar.todo,location:0
 msgid "Location of Event"
-msgstr ""
+msgstr "Olay Konumu"
 
 #. module: base_calendar
 #: field:calendar.event,rrule:0
 #: field:calendar.todo,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "Yinelenen Kural"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Taslak"
 
 #. module: base_calendar
 #: field:calendar.alarm,attach:0
 msgid "Attachment"
-msgstr ""
+msgstr "Ek"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation From"
-msgstr ""
+msgstr "Davet Eden"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "End of recurrency"
-msgstr ""
+msgstr "Yineleme sonu"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,alarm_id:0
 msgid "Reminder"
-msgstr ""
+msgstr "Anımsatıcı"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
-msgstr ""
+msgstr "İstisna Kuralını Ayarla"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: model:ir.actions.act_window,name:base_calendar.action_view_event
 #: model:ir.ui.menu,name:base_calendar.menu_events
 msgid "Events"
-msgstr ""
+msgstr "Olaylar"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
 #: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
 msgid "Invite Attendees"
-msgstr ""
+msgstr "Katılımcıları Davet"
 
 #. module: base_calendar
 #: help:calendar.attendee,email:0
 msgid "Email of Invited Person"
-msgstr ""
+msgstr "Davetli Kişinin Epostası"
 
 #. module: base_calendar
 #: field:calendar.alarm,repeat:0
@@ -909,169 +918,169 @@ msgstr ""
 #: field:calendar.todo,count:0
 #: field:res.alarm,repeat:0
 msgid "Repeat"
-msgstr ""
+msgstr "Yinele"
 
 #. module: base_calendar
 #: help:calendar.attendee,dir:0
 msgid ""
 "Reference to the URIthat points to the directory information corresponding "
 "to the attendee."
-msgstr ""
+msgstr "Katılımcıyla ilgili dizin bilgisine yönlendiren URL ile ilişkilidir."
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "August"
-msgstr ""
+msgstr "Ağustos"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "Pazartesi"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Third"
-msgstr ""
+msgstr "Üçüncü"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "June"
-msgstr ""
+msgstr "Haziran"
 
 #. module: base_calendar
 #: field:calendar.alarm,alarm_id:0
 msgid "Basic Alarm"
-msgstr ""
+msgstr "Temel Alarm"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 #: view:calendar.event:0
 msgid "The"
-msgstr ""
+msgstr "Bu"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_from:0
 msgid "Delegated From"
-msgstr ""
+msgstr "Temsil Edilen"
 
 #. module: base_calendar
 #: field:calendar.attendee,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Kullanıcı"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event,date:0
 msgid "Date"
-msgstr ""
+msgstr "Tarih"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "November"
-msgstr ""
+msgstr "Kasım"
 
 #. module: base_calendar
 #: help:calendar.attendee,member:0
 msgid "Indicate the groups that the attendee belongs to"
-msgstr ""
+msgstr "Katılanın bağlı olduğu grubu belirt"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 msgid "Data"
-msgstr ""
+msgstr "Veri"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,mo:0
 #: field:calendar.event,mo:0
 #: field:calendar.todo,mo:0
 msgid "Mon"
-msgstr ""
+msgstr "Pzt"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,count:0
 msgid "Count"
-msgstr ""
+msgstr "Say"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "No Repeat"
-msgstr ""
+msgstr "Yineleme Yok"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "October"
-msgstr ""
+msgstr "Ekim"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Uncertain"
-msgstr ""
+msgstr "Belirsiz"
 
 #. module: base_calendar
 #: field:calendar.attendee,language:0
 msgid "Language"
-msgstr ""
+msgstr "Dil"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_occurs:0
 #: field:res.alarm,trigger_occurs:0
 msgid "Triggers"
-msgstr ""
+msgstr "Tetikleyiciler"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "January"
-msgstr ""
+msgstr "Ocak"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_related:0
 #: field:res.alarm,trigger_related:0
 msgid "Related to"
-msgstr ""
+msgstr "Bağlı olduğu"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,interval:0
 #: field:calendar.alarm,trigger_interval:0
 #: field:res.alarm,trigger_interval:0
 msgid "Interval"
-msgstr ""
+msgstr "Aralık"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Çarşamba"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
-msgstr ""
+msgstr "Aralık Eksi olamaz"
 
 #. module: base_calendar
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
 msgid "Summary"
-msgstr ""
+msgstr "Özet"
 
 #. module: base_calendar
 #: field:calendar.alarm,active:0
@@ -1079,22 +1088,22 @@ msgstr ""
 #: field:calendar.todo,active:0
 #: field:res.alarm,active:0
 msgid "Active"
-msgstr ""
+msgstr "Etkin"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr ""
+msgstr "Ay içinde görüşmenin tekrarlanacağı günü seç"
 
 #. module: base_calendar
 #: field:calendar.alarm,action:0
 msgid "Action"
-msgstr ""
+msgstr "Eylem"
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,type:0
 msgid "Select whom you want to Invite"
-msgstr ""
+msgstr "Davet edeceğinizi kimseyi seçin"
 
 #. module: base_calendar
 #: help:calendar.alarm,duration:0
@@ -1103,50 +1112,52 @@ msgid ""
 "Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
 "other"
 msgstr ""
+"'Süre' ve 'Yineleme' nin her ikisi de seçme bağlıdır, ama biri seçlirse "
+"diğeri de seçilmelidir"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event_edit_all
 msgid "Calendar Edit all event"
-msgstr ""
+msgstr "Bütün etkinlikleri Takvimini Düzenle"
 
 #. module: base_calendar
 #: help:calendar.attendee,role:0
 msgid "Participation role for the calendar user"
-msgstr ""
+msgstr "Takvim Kullanıcısının katılım rolü"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_to:0
 msgid "Delegated To"
-msgstr ""
+msgstr "Temsil edilen"
 
 #. module: base_calendar
 #: help:calendar.alarm,action:0
 msgid "Defines the action to be invoked when an alarm is triggered"
-msgstr ""
+msgstr "Alarm tetiklendiğinde başlatılacak eylemi tanımlar"
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "End date"
-msgstr ""
+msgstr "Bitiş tarihi"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Search Events"
-msgstr ""
+msgstr "Etkinlikleri Ara"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Recurrency Option"
-msgstr ""
+msgstr "Yineleme Seçeneği"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Weekly"
-msgstr ""
+msgstr "Haftalık"
 
 #. module: base_calendar
 #: help:calendar.alarm,active:0
@@ -1155,17 +1166,19 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the event "
 "alarm information without removing it."
 msgstr ""
+"Etkin alan yanlış olarak ayarlıysa, etkinlik alarmını kaldırmadan "
+"gizlemenizi sağlar."
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_id:0
 #: field:calendar.todo,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "Yinelenen Kimlik tarihi"
 
 #. module: base_calendar
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Aynı kullanıcı adı ile iki kullanıcı oluşturamazsınız !"
 
 #. module: base_calendar
 #: field:calendar.alarm,state:0
@@ -1175,65 +1188,65 @@ msgstr ""
 #: field:calendar.event,state:0
 #: field:calendar.todo,state:0
 msgid "State"
-msgstr ""
+msgstr "Durum"
 
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder Details"
-msgstr ""
+msgstr "Anımsatma Ayrıntıları"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "To Review"
-msgstr ""
+msgstr "İncelenecek"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,freq:0
 #: field:calendar.event,freq:0
 #: field:calendar.todo,freq:0
 msgid "Frequency"
-msgstr ""
+msgstr "Sıklık"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Done"
-msgstr ""
+msgstr "Bitti"
 
 #. module: base_calendar
 #: help:calendar.event,interval:0
 #: help:calendar.todo,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "Her (Gün/Hafta/Ay/Yıl) Tekrarla"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: field:base_calendar.invite.attendee,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "Kullanıcılar"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "of"
-msgstr ""
+msgstr "ın"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 #: view:calendar.event.edit.all:0
 msgid "Cancel"
-msgstr ""
+msgstr "Vazgeç"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Salı"
 
 #. module: base_calendar
 #: help:calendar.alarm,description:0
@@ -1242,11 +1255,13 @@ msgid ""
 "calendar component, than that                             provided by the "
 "\"SUMMARY\" property"
 msgstr ""
+"Takvim bileşeninin tanımını \"ÖZET\" özelliğinden eldeedilenden daha tam "
+"olarak belirtir."
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Sorumlu Kullanıcı"
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
@@ -1254,73 +1269,75 @@ msgstr ""
 #: selection:calendar.todo,show_as:0
 #: selection:res.users,availability:0
 msgid "Busy"
-msgstr ""
+msgstr "Meşgul"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event
 msgid "Calendar Event"
-msgstr ""
+msgstr "Takvim Etkinliği"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Tentative"
-msgstr ""
+msgstr "Belirsiz"
 
 #. module: base_calendar
 #: field:calendar.event,interval:0
 #: field:calendar.todo,interval:0
 msgid "Repeat every"
-msgstr ""
+msgstr "Yineler"
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "Fix amout of times"
-msgstr ""
+msgstr "Süre Miktarını Düzelt"
 
 #. module: base_calendar
 #: field:calendar.event,recurrency:0
 #: field:calendar.todo,recurrency:0
 msgid "Recurrent"
-msgstr ""
+msgstr "Yinelenen"
 
 #. module: base_calendar
 #: field:calendar.event,rrule_type:0
 #: field:calendar.todo,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Yineleme"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
 #: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
 msgid "Event Invitations"
-msgstr ""
+msgstr "Etkinlik Davetleri"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "Perşembe"
 
 #. module: base_calendar
 #: field:calendar.event,exrule:0
 #: field:calendar.todo,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Muafşyet Kuralı"
 
 #. module: base_calendar
 #: help:calendar.attendee,language:0
 msgid ""
 "To specify the language for text values in aproperty or property parameter."
 msgstr ""
+"Bir özellikteki ya da özellik parametresine ait metin değerlerinin dilini "
+"belirler."
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Details"
-msgstr ""
+msgstr "Ayrıntılar"
 
 #. module: base_calendar
 #: help:calendar.event,exrule:0
@@ -1329,19 +1346,20 @@ msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
 msgstr ""
+"Yineleme kuralı dışında tutulan bir zaman tekrarlama modelini tanımlar."
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,month_list:0
 #: field:calendar.event,month_list:0
 #: field:calendar.todo,month_list:0
 msgid "Month"
-msgstr ""
+msgstr "Ay"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 msgid "Invite People"
-msgstr ""
+msgstr "Kişi Davet Et"
 
 #. module: base_calendar
 #: help:calendar.event,rrule:0
@@ -1351,11 +1369,14 @@ msgid ""
 "e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
 "      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 msgstr ""
+"Yinelenen olaylar için tekrarlama modeli kuralı tanımlar\n"
+"Örneğin: İki ayda bir ayın pazar günü için 10 oluşum: "
+"SIKLIK=AYLIK;ARALIK=2;SAYI=10;GÜNLÜK=-1PAZ"
 
 #. module: base_calendar
 #: field:calendar.attendee,dir:0
 msgid "URI Reference"
-msgstr ""
+msgstr "URI Referansı"
 
 #. module: base_calendar
 #: field:calendar.alarm,description:0
@@ -1365,108 +1386,108 @@ msgstr ""
 #: field:calendar.todo,description:0
 #: field:calendar.todo,name:0
 msgid "Description"
-msgstr ""
+msgstr "Açıklama"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "May"
-msgstr ""
+msgstr "Mayıs"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,type:0
 #: view:calendar.attendee:0
 msgid "Type"
-msgstr ""
+msgstr "Tür"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Search Invitations"
-msgstr ""
+msgstr "Davetiye Ara"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "After"
-msgstr ""
+msgstr "Sonra"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Stop"
-msgstr ""
+msgstr "Dur"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_values
 msgid "ir.values"
-msgstr ""
+msgstr "ir.values"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
 msgid "Objects"
-msgstr ""
+msgstr "Nesneler"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Delegated"
-msgstr ""
+msgstr "Temsil Edildi"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,sa:0
 #: field:calendar.event,sa:0
 #: field:calendar.todo,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "Cts"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Choose day where repeat the meeting"
-msgstr ""
+msgstr "Görüşmenin tekrarlanacağı günü seç"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 msgid "Minutely"
-msgstr ""
+msgstr "Dakikalık"
 
 #. module: base_calendar
 #: help:calendar.attendee,sent_by:0
 msgid "Specify the user that is acting on behalf of the calendar user"
-msgstr ""
+msgstr "Takvim kullanıcısı adına hareket eden kullanıcıyı tanımla"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,date_deadline:0
 msgid "End Date"
-msgstr ""
+msgstr "Bitiş Tarihi"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "February"
-msgstr ""
+msgstr "Şubat"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Months"
-msgstr ""
+msgstr "Aylar"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Resource"
-msgstr ""
+msgstr "Kaynak"
 
 #. module: base_calendar
 #: field:res.alarm,name:0
 msgid "Name"
-msgstr ""
+msgstr "Ad"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_alarm
 msgid "Event alarm information"
-msgstr ""
+msgstr "Etkinlik alarm bilgisi"
 
 #. module: base_calendar
 #: help:calendar.alarm,name:0
@@ -1474,6 +1495,8 @@ msgid ""
 "Contains the text to be                      used as the message subject for "
 "email                      or contains the text to be used for display"
 msgstr ""
+"Eposta konusu olarak kullanılacak ya da görüntülenecek metin olarak "
+"kullanılacak metni içerir."
 
 #. module: base_calendar
 #: field:calendar.event,alarm_id:0
@@ -1481,144 +1504,144 @@ msgstr ""
 #: field:calendar.todo,alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Alarm"
 
 #. module: base_calendar
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Please Apply Recurrency before applying Exception Rule."
-msgstr ""
+msgstr "İstisna Kuralını uygulamadan önce lütfen Yineleme Uygulayın."
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by_uid:0
 msgid "Sent By User"
-msgstr ""
+msgstr "Şu Kullanıcı tarafından gönderildi"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "April"
-msgstr ""
+msgstr "Nisan"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Recurrency period"
-msgstr ""
+msgstr "Yineleme Dönemi"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,week_list:0
 #: field:calendar.event,week_list:0
 #: field:calendar.todo,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "Hafta İçi"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,byday:0
 #: field:calendar.event,byday:0
 #: field:calendar.todo,byday:0
 msgid "By day"
-msgstr ""
+msgstr "Gündüz"
 
 #. module: base_calendar
 #: field:calendar.alarm,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "Model"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Audio"
-msgstr ""
+msgstr "Ses"
 
 #. module: base_calendar
 #: field:calendar.event,id:0
 #: field:calendar.todo,id:0
 msgid "ID"
-msgstr ""
+msgstr "Kimlik"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "For information Purpose"
-msgstr ""
+msgstr "Bilgi Amaçlı"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 msgid "Invite"
-msgstr ""
+msgstr "Davet et"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Katılımcı Bilgisi"
 
 #. module: base_calendar
 #: field:calendar.alarm,res_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "Kaynak Kimliği"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 msgid "Needs Action"
-msgstr ""
+msgstr "Eylem Gerekir"
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by:0
 msgid "Sent By"
-msgstr ""
+msgstr "Gönderen"
 
 #. module: base_calendar
 #: field:calendar.event,sequence:0
 #: field:calendar.todo,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Diziliş"
 
 #. module: base_calendar
 #: help:calendar.event,alarm_id:0
 #: help:calendar.todo,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr ""
+msgstr "Bu sefer etkinlik başlamadan önce alarm ayarla"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Internal User"
-msgstr ""
+msgstr "İç Kullanıcı"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Accept"
-msgstr ""
+msgstr "Kabul et"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "Cumartesi"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation To"
-msgstr ""
+msgstr "Davetiye Gönder"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Second"
-msgstr ""
+msgstr "İkinci"
 
 #. module: base_calendar
 #: field:calendar.attendee,availability:0
 #: field:res.users,availability:0
 msgid "Free/Busy"
-msgstr ""
+msgstr "Uygun/Meşgul"
 
 #. module: base_calendar
 #: field:calendar.event,end_type:0
 #: field:calendar.todo,end_type:0
 msgid "Way to end reccurency"
-msgstr ""
+msgstr "Yineleme sonlandırma yolu"
 
 #. module: base_calendar
 #: field:calendar.alarm,duration:0
@@ -1629,17 +1652,17 @@ msgstr ""
 #: field:res.alarm,duration:0
 #: field:res.alarm,trigger_duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Süre"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
 msgid "External Email"
-msgstr ""
+msgstr "Dış Eposta"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_date:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Tetikleme Tarihi"
 
 #. module: base_calendar
 #: help:calendar.alarm,attach:0
@@ -1651,10 +1674,19 @@ msgid ""
 "                    * Points to a procedure resource, which is invoked when  "
 "                    the alarm is triggered for procedure."
 msgstr ""
+"* Alarmın ses çalması için tetiklendiği durumuna benzeterek, Bir ses "
+"kaynağını işaret eder.\n"
+"                    * Bir epostaya mesal eki olarak gönderilmek istenen "
+"dosya,\n"
+"                    * Alarm işlem için tetiklendiğinde işlem kaynağını "
+"işaret eder."
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "Beşinci"
+
+#~ msgid "Set Exclude range"
+#~ msgstr "Hariç tutulacak alanı ayarla"
diff --git a/addons/base_calendar/test/base_calendar_test.yml b/addons/base_calendar/test/base_calendar_test.yml
index 4c0f3fc126f..5512839e635 100644
--- a/addons/base_calendar/test/base_calendar_test.yml
+++ b/addons/base_calendar/test/base_calendar_test.yml
@@ -15,7 +15,8 @@
     Now I will set recurrence for this event to occur monday and friday of week
 -
     !python {model: calendar.event}: |
-     self.write(cr, uid, [ref("calendar_event_technicalpresentation0")], {'fr': 1, 'mo': 1, 'interval': 1, 'rrule_type': 'weekly'})
+     data = {'fr': 1, 'mo': 1, 'interval': 1, 'rrule_type': 'weekly', 'end_type': 'end_date', 'end_date': '2011-05-31 00:00:00'}
+     self.write(cr, uid, [ref("calendar_event_technicalpresentation0")], data)
 -   |
     In order to check that recurrent events are views successfully in calendar view,
     I will open calendar view of events
@@ -27,7 +28,7 @@
     I will search for one of the recurrent event and count the number of events
 -
     !python {model: calendar.event}: |
-     ids = self.search(cr, uid, [('date', '>=', '2011-04-30 16:00:00'), ('date', '<=', '2011-05-31 00:00:00')] )
+     ids = self.search(cr, uid, [('date', '>=', '2011-04-30 16:00:00'), ('date', '<=', '2011-05-31 00:00:00')], context={'virtual_id': True} )
      assert len(ids) == 9
 -   |
     Now I will make All day event and test it
diff --git a/addons/base_calendar/wizard/__init__.py b/addons/base_calendar/wizard/__init__.py
index 8b45dc18a17..cd0690b1dc0 100644
--- a/addons/base_calendar/wizard/__init__.py
+++ b/addons/base_calendar/wizard/__init__.py
@@ -19,9 +19,7 @@
 #
 ##############################################################################
 
-import calendar_event_edit_all
 import base_calendar_invite_attendee
-import base_calendar_set_exrule
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_calendar/wizard/base_calendar_set_exrule.py b/addons/base_calendar/wizard/base_calendar_set_exrule.py
deleted file mode 100644
index 80fe1e44720..00000000000
--- a/addons/base_calendar/wizard/base_calendar_set_exrule.py
+++ /dev/null
@@ -1,163 +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 base_calendar import base_calendar
-from osv import fields, osv
-from tools.translate import _
-import tools
-import re
-
-
-months = {
-    1: "January", 2: "February", 3: "March", 4: "April", \
-    5: "May", 6: "June", 7: "July", 8: "August", 9: "September", \
-    10: "October", 11: "November", 12: "December"
-}
-
-class base_calendar_set_exrule(osv.osv_memory):
-    """
-    Set Exrule.
-    """
-
-    _name = "base.calendar.set.exrule"
-    _description = "Set Exrule"
-
-    _columns = {
-      'freq': fields.selection([('None', 'No Repeat'), \
-                                ('secondly', 'Secondly'), \
-                                ('minutely', 'Minutely'), \
-                                ('hourly', 'Hourly'), \
-                                ('daily', 'Daily'), \
-                                ('weekly', 'Weekly'), \
-                                ('monthly', 'Monthly'), \
-                                ('yearly', 'Yearly')], 'Frequency',required=True),
-        'interval': fields.integer('Interval'),
-        'count': fields.integer('Count'),
-        'mo': fields.boolean('Mon'),
-        'tu': fields.boolean('Tue'),
-        'we': fields.boolean('Wed'),
-        'th': fields.boolean('Thu'),
-        'fr': fields.boolean('Fri'),
-        'sa': fields.boolean('Sat'),
-        'su': fields.boolean('Sun'),
-        'select1': fields.selection([('date', 'Date of month'), \
-                                    ('day', 'Day of month')], 'Option'),
-        'day': fields.integer('Date of month'),
-        'week_list': fields.selection([('MO', 'Monday'), ('TU', 'Tuesday'), \
-                                   ('WE', 'Wednesday'), ('TH', 'Thursday'), \
-                                   ('FR', 'Friday'), ('SA', 'Saturday'), \
-                                   ('SU', 'Sunday')], 'Weekday'),
-        'byday': fields.selection([('1', 'First'), ('2', 'Second'), \
-                                   ('3', 'Third'), ('4', 'Fourth'), \
-                                   ('5', 'Fifth'), ('-1', 'Last')], 'By day'),
-        'month_list': fields.selection(months.items(),'Month'),
-        'end_date': fields.date('Repeat Until'),
-
-    }
-
-    def view_init(self, cr, uid, fields, context=None):
-        """
-        This function checks for precondition before wizard executes
-        @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 fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
-        """
-        if context is None: 
-            context = {}
-        event_obj = self.pool.get(context.get('active_model'))
-        for event in event_obj.browse(cr, uid, context.get('active_ids', []), context=context):
-            if not event.rrule:
-                raise osv.except_osv(_("Warning !"), _("Please Apply Recurrency before applying Exception Rule."))
-        return False
-
-    def compute_exrule_string(self, cr, uid, ids, context=None):
-        """
-        Compute rule string.
-        @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 datas: dictionary of freq and interval value.
-        @return: string value which compute FREQILY;INTERVAL
-        """
-
-        weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su']
-        weekstring = ''
-        monthstring = ''
-        yearstring = ''
-        if context is None: 
-            context = {}
-        ex_id = base_calendar.base_calendar_id2real_id(context.get('active_id', False))
-        model = context.get('model', False)
-        model_obj = self.pool.get(model)
-        for datas in self.read(cr, uid, ids, context=context):
-            freq = datas.get('freq')
-            if freq == 'None':
-                model_obj.write(cr, uid, ex_id,{'exrule': ''})
-                return{}
-
-            interval_srting = datas.get('interval') and (';INTERVAL=' + str(datas.get('interval'))) or ''
-
-            if freq == 'weekly':
-
-                byday = map(lambda x: x.upper(), filter(lambda x: datas.get(x) and x in weekdays, datas))
-                if byday:
-                    weekstring = ';BYDAY=' + ','.join(byday)
-
-            elif freq == 'monthly':
-                if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31):
-                    raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
-                if datas.get('select1')=='day':
-                    monthstring = ';BYDAY=' + datas.get('byday') + datas.get('week_list')
-                elif datas.get('select1')=='date':
-                    monthstring = ';BYMONTHDAY=' + str(datas.get('day'))
-
-            elif freq == 'yearly':
-                if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31):
-                    raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
-                bymonth = ';BYMONTH=' + str(datas.get('month_list'))
-                if datas.get('select1')=='day':
-                    bystring = ';BYDAY=' + datas.get('byday') + datas.get('week_list')
-                elif datas.get('select1')=='date':
-                    bystring = ';BYMONTHDAY=' + str(datas.get('day'))
-                yearstring = bymonth + bystring
-
-            if datas.get('end_date'):
-                datas['end_date'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + '235959Z'
-            enddate = (datas.get('count') and (';COUNT=' + str(datas.get('count'))) or '') +\
-                                 ((datas.get('end_date') and (';UNTIL=' + datas.get('end_date'))) or '')
-
-            exrule_string = 'FREQ=' + freq.upper() + weekstring + interval_srting \
-                                + enddate + monthstring + yearstring
-
-            model_obj.write(cr, uid, ex_id,{'exrule': exrule_string})
-            return {'type': 'ir.actions.act_window_close'}
-
-        _defaults = {
-         'freq': lambda *x: 'None',
-         'select1': lambda *x: 'date',
-         'interval': lambda *x: 1,
-    }
-
-base_calendar_set_exrule()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_calendar/wizard/base_calendar_set_exrule_view.xml b/addons/base_calendar/wizard/base_calendar_set_exrule_view.xml
deleted file mode 100644
index 2a2d6412d4b..00000000000
--- a/addons/base_calendar/wizard/base_calendar_set_exrule_view.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_base_calendar_set_exrule" model="ir.ui.view">
-            <field name="name">base.calendar.set.exrule.form</field>
-            <field name="model">base.calendar.set.exrule</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            <form string="Set Exrule">
-                    <separator string="Select range to Exclude" colspan="8"/>
-                    <group col="8" colspan="6">
-                        <field name="interval" />
-                        <field name="freq" />
-                        <field name="count" />
-                        <field name="end_date" />
-                    </group>
-                    <group col="8" colspan="8" name="Select weekdays"
-                        attrs="{'invisible' : [('freq','!=','weekly')]}">
-                        <field name="mo" colspan="1" />
-                        <field name="tu" colspan="1" />
-                        <field name="we" colspan="1" />
-                        <field name="th" colspan="1" />
-                        <field name="fr" colspan="1" />
-                        <field name="sa" colspan="1" />
-                        <field name="su" colspan="1" />
-                        <newline />
-                    </group>
-                   <group col="8" colspan="6"
-                        attrs="{'invisible' : [('freq','!=','monthly'), ('freq','!=','yearly')]}">
-                        <group col="2" colspan="1">
-                            <field name="select1" />
-                        </group>
-                        <group col="2" colspan="1"
-                            attrs="{'invisible' : [('select1','=','day')]}">
-                            <field name="day"
-                                attrs="{'required' : [('select1','=','date')]}"/>
-                        </group>
-                      <group col="3" colspan="1"
-                            attrs="{'invisible' : [('select1','=','date')]}">
-                            <field name="byday" string="The"
-                                attrs="{'required' : [('select1','=','day')]}"/>
-                            <field name="week_list" nolabel="1"
-                                attrs="{'required' : [('select1','=','day')]}"/>
-                        </group>
-                       <group col="1" colspan="1"
-                            attrs="{'invisible' : [('freq','!=','yearly')]}">
-                            <field name="month_list" string="of"
-                                colspan="1"
-                                attrs="{'required' : [('freq','=','yearly')]}"/>
-                        </group>
-                    </group>
-                    <group colspan="4" col="6">
-                        <separator string="" colspan="8"/>
-                        <label string="" colspan="2"/>
-                        <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                        <button  icon="gtk-ok" string="_Ok" name="compute_exrule_string" type="object"/>
-                    </group>
-                </form>
-         </field>
-	</record>
-
-        <record id="action_base_calendar_set_exrule" model="ir.actions.act_window">
-            <field name="name">Set Exclude range</field>
-            <field name="res_model">base.calendar.set.exrule</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-           <field name="target">new</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all.py b/addons/base_calendar/wizard/calendar_event_edit_all.py
deleted file mode 100644
index 23f67f579f2..00000000000
--- a/addons/base_calendar/wizard/calendar_event_edit_all.py
+++ /dev/null
@@ -1,98 +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 osv
-from osv import fields
-
-class calendar_event_edit_all(osv.osv_memory):
-
-    def _default_values(self, cr, uid, context=None):
-        """ Get Default value for Start Date
-        @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 context: A standard dictionary for contextual values
-        @Return: Get Default value for Start Date
-        """
-        context_id = context and context.get('active_id', False) or False
-        if context_id:
-            if context.get('date'):
-                return context.get('date')
-            else:
-                model = context.get('model', False)
-                model_obj = self.pool.get(model)
-                event = model_obj.read(cr, uid, context_id, ['name', 'location', 'alarm_id'])
-                return event['date']
-
-    def _default_deadline(self, cr, uid, context=None):
-        """ Get Default value for End Date
-        @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 context: A standard dictionary for contextual values
-        @return: Get Default value for End Date
-        """
-
-        context_id = context and context.get('active_id', False) or False
-        if context_id:
-            if context.get('date_deadline'):
-                return context.get('date_deadline')
-            else:
-                model = context.get('model', False)
-                model_obj = self.pool.get(model)
-                event = model_obj.read(cr, uid, context_id, ['name', 'location', 'alarm_id'])
-                return event['date_deadline']
-
-    def modify_this(self, cr, uid, ids, context=None):
-        """
-        Modify All event for Crm Meeting.
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of calendar event edit all’s IDs
-        @return: dictionary {}
-        """
-        if context is None:
-            context = {}
-
-        context_id = context and context.get('active_id', False) or False
-        if context_id:
-            for datas in self.read(cr, uid, ids):
-                model = context.get('model', False)
-                model_obj = self.pool.get(model)
-                model_obj.modify_all(cr, uid, [context_id], datas, context=context)
-                return {'type': 'ir.actions.act_window_close'}
-
-    _name = "calendar.event.edit.all"
-    _description = "Calendar Edit all event"
-    _columns = {
-        'name': fields.char('Title', size=64, required=True),
-        'date': fields.datetime('Start Date', required=True),
-        'date_deadline': fields.datetime('End Date', required=True),
-        'location': fields.char('Location', size=124),
-        'alarm_id': fields.many2one('res.alarm', 'Reminder'),
-    }
-    _defaults = {
-        'date': _default_values,
-        'date_deadline': _default_deadline
-    }
-calendar_event_edit_all()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all_view.xml b/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
deleted file mode 100644
index 82f403e9254..00000000000
--- a/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-		<record id="view_calendar_event_edit_all" model="ir.ui.view">
-            <field name="name">calendar.event.edit.all.form</field>
-            <field name="model">calendar.event.edit.all</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Edit all Occurrences">
-                	<group colspan="4" >
-                		 <separator string="" colspan="4" />
-              			 <newline/>
-              			 <field name='name' colspan="4" />
-              			 <newline />
-              			 <field name='location' colspan="4" />
-              			 <newline />
-              			 <field name='date' />
-              			 <field name='date_deadline' />
-              			 <newline />
-              			 <field name='alarm_id'/>
-                    </group>
-                       	 <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                    	 <button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	 <button  icon="gtk-save" string="_Save" name="modify_this" type="object"/>
-                   </group>
-               </form>
-            </field>
-		</record>
-
-        <record id="action_calendar_event_edit_all" model="ir.actions.act_window">
-            <field name="name">Edit all events</field>
-            <field name="res_model">calendar.event.edit.all</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_calendar_event_edit_all"/>
-           <field name="target">new</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 8a003ec7cf1..cf0bc610be8 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -64,7 +64,7 @@ class res_partner_contact(osv.osv):
                          relation='res.partner', string='Main Employer'),
         'function': fields.related('job_ids', 'function', type='char', \
                                  string='Main Function'),
-        'job_id': fields.function(_main_job, method=True, type='many2one',\
+        '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),
diff --git a/addons/base_contact/base_contact_installer_view.xml b/addons/base_contact/base_contact_installer_view.xml
index 672c43745fb..981af67c60d 100644
--- a/addons/base_contact/base_contact_installer_view.xml
+++ b/addons/base_contact/base_contact_installer_view.xml
@@ -51,8 +51,10 @@
 
         <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="state">skip</field>
+            <field name="type">special</field>
         </record>
 
     </data>
diff --git a/addons/base_contact/i18n/tr.po b/addons/base_contact/i18n/tr.po
index a6c4079d7ee..81936f78a47 100644
--- a/addons/base_contact/i18n/tr.po
+++ b/addons/base_contact/i18n/tr.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-09-09 07:11+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-05-28 13:39+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-29 04:36+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
 msgid "Title"
-msgstr "Başlık"
+msgstr "Unvan"
 
 #. module: base_contact
 #: view:res.partner.address:0
@@ -34,12 +34,12 @@ msgstr "Faks"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "title"
-msgstr "Başlık:"
+msgstr "unvan"
 
 #. module: base_contact
 #: help:res.partner.job,date_start:0
 msgid "Start date of job(Joining Date)"
-msgstr "Sipariş Tarihi"
+msgstr "İşin Başlangıç Tarihi (katılım Tarihi)"
 
 #. module: base_contact
 #: view:base.contact.installer:0
@@ -49,7 +49,7 @@ msgstr "Adreslerin taşınması için ilgili seçeneği seçiniz"
 #. module: base_contact
 #: help:res.partner.job,function:0
 msgid "Function of this contact with this partner"
-msgstr "Bu kişinin iş ortağındaki görevi"
+msgstr "Bu kişininbu paydaşdaki görevi"
 
 #. module: base_contact
 #: help:res.partner.job,state:0
@@ -62,7 +62,7 @@ msgid ""
 "You may                     enter Address first,Partner will be linked "
 "automatically if any."
 msgstr ""
-"Önce adresi girin, eğer varsa iş ortağı otomatik olarak ilişkilendirilecek"
+"Önce adresi girin, eğer varsaPaydaş otomatik olarak ilişkilendirilecek"
 
 #. module: base_contact
 #: help:res.partner.job,fax:0
@@ -88,7 +88,7 @@ msgstr "Birlikte Çalıştığınız Kişiler"
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_functiontoaddress0
 msgid "Define functions and address."
-msgstr "Pozisyon ve Adres Tanımları"
+msgstr "Görev ve Adres Tanımları"
 
 #. module: base_contact
 #: help:res.partner.job,date_stop:0
@@ -105,17 +105,17 @@ msgstr "Taşı"
 #: view:res.partner.contact:0
 #: field:res.partner.job,name:0
 msgid "Partner"
-msgstr "Ortak"
+msgstr "Paydaş"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_function0
 msgid "Jobs at a same partner address."
-msgstr "Aynı iş ortağı adresindeki görevler"
+msgstr "Aynı paydaş adresindeki görevler"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_partners0
 msgid "Partners"
-msgstr "Cari Kartlar"
+msgstr "Paydaşlar"
 
 #. module: base_contact
 #: field:res.partner.job,state:0
@@ -128,7 +128,7 @@ msgid ""
 "If the active field is set to False,                 it will allow you to "
 "hide the partner contact without removing it."
 msgstr ""
-"Eğer aktif alan hayır olarak ayarlanmışsa. İş ortağının adresini silmeden "
+"Eğer aktif alan hayır olarak ayarlanmışsa, paydaşın adresini silmeden "
 "gizleyebilirsiniz."
 
 #. module: base_contact
@@ -158,7 +158,7 @@ msgstr ""
 "        ........Bu bölüm listenizdeki tüm kişileri yönetmenize imkan sağlar\n"
 "\n"
 "    Tanımlamanıza izin verir\n"
-"        *İş ortağı ile ilgili olmayan kişiler,\n"
+"        *Paydaş ile ilgili olmayan kişiler,\n"
 "        *birkaç farklı adreste çalışan kişiler (farklı iş ortakları için)\n"
 "        *her iş adresinde farklı işlev gösteren kişiler\n"
 "    "
@@ -167,7 +167,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 "Temel Kişi"
+msgstr "Temel İlgili"
 
 #. module: base_contact
 #: field:res.partner.job,date_stop:0
@@ -177,7 +177,7 @@ msgstr "Durma Tarihi"
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_res_partner_job
 msgid "Contact's Jobs"
-msgstr "Şahıs İş Bilgileri"
+msgstr "İlgilinin işleri"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -189,17 +189,17 @@ msgstr "Kategoriler"
 msgid ""
 "Order of importance                 of this job title in the list of job "
 "title of the linked partner"
-msgstr "Bu görevin sırasının ilgili iş ortağının görev listesindeki önemi"
+msgstr "Bu görevin sırasının ilgili paydaşın görev listesindeki önemi"
 
 #. module: base_contact
 #: field:res.partner.job,extension:0
 msgid "Extension"
-msgstr "İç Hat"
+msgstr "İçhat"
 
 #. module: base_contact
 #: help:res.partner.job,extension:0
 msgid "Internal/External extension phone number"
-msgstr "Telefon No/Dahili No"
+msgstr "İçhat/Dışhat telefon no"
 
 #. module: base_contact
 #: help:res.partner.job,phone:0
@@ -210,28 +210,28 @@ msgstr "İş Telefon No"
 #: view:res.partner.contact:0
 #: field:res.partner.contact,job_ids:0
 msgid "Functions and Addresses"
-msgstr "Pozisyon ve Adres Bilgileri"
+msgstr "Görevler ve Adresleri"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_contact
 #: field:res.partner.job,contact_id:0
 msgid "Contact"
-msgstr "Kişi"
+msgstr "İlgili"
 
 #. module: base_contact
 #: help:res.partner.job,email:0
 msgid "Job E-Mail"
-msgstr "İş e-posta"
+msgstr "İş Eposta"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
 msgid "Partner Seq."
-msgstr "Cari Sıra No."
+msgstr "Paydaş Sıra No."
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_functiontoaddress0
 msgid "Function to address"
-msgstr "Adrese fonksiyon"
+msgstr "Adrese görev"
 
 #. module: base_contact
 #: field:base.contact.installer,progress:0
@@ -263,7 +263,7 @@ msgstr "Geçmiş"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_address
 msgid "Partner Addresses"
-msgstr "İş Ortağı Adresleri"
+msgstr "Paydaş Adresleri"
 
 #. module: base_contact
 #: view:base.contact.installer:0
@@ -273,12 +273,12 @@ msgstr "Adreslerin Kişilere taşınması"
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
 msgid "Contact Seq."
-msgstr "Bağlantı Sırası"
+msgstr "İlgili Sırası"
 
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr "Kişilerde Ara"
+msgstr "İlgili Ara"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@@ -288,7 +288,7 @@ msgstr "Kişilerde Ara"
 #: view:res.partner:0
 #: field:res.partner.address,job_ids:0
 msgid "Contacts"
-msgstr "Bağlantılar"
+msgstr "İlgililer"
 
 #. module: base_contact
 #: view:base.contact.installer:0
@@ -296,7 +296,7 @@ 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 ""
-"Adres ve iş ortağı ile ilgili değişiklikler nedeniyle adres ile ilgili bazı "
+"Adres vePaydaş ile ilgili değişiklikler nedeniyle adres ile ilgili bazı "
 "detaylar kişi bilgisine taşınmalı"
 
 #. module: base_contact
@@ -307,12 +307,12 @@ msgstr "İş ve Özel Adresler"
 #. module: base_contact
 #: help:res.partner.job,address_id:0
 msgid "Address which is linked to the Partner"
-msgstr "İş Ortağı ile ilişkili olan adresler"
+msgstr "Paydaşı ile ilişkili olan adresler"
 
 #. module: base_contact
 #: field:res.partner.job,function:0
 msgid "Partner Function"
-msgstr "Pozisyonu"
+msgstr "Paydaşın Görevi"
 
 #. module: base_contact
 #: help:res.partner.job,other:0
@@ -348,7 +348,7 @@ msgstr "base.contact.installer"
 #. module: base_contact
 #: view:res.partner.job:0
 msgid "Contact Functions"
-msgstr "Pozisyonu"
+msgstr "İlgili Görevi"
 
 #. module: base_contact
 #: field:res.partner.job,phone:0
@@ -363,17 +363,17 @@ msgstr "Adres bilgilerini Kişi bilgilerine taşımak ister misiniz?"
 #. module: base_contact
 #: field:res.partner.contact,active:0
 msgid "Active"
-msgstr "Aktif"
+msgstr "Etkin"
 
 #. module: base_contact
 #: field:res.partner.contact,function:0
 msgid "Main Function"
-msgstr "Pozisyon"
+msgstr "Ana Görev"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_partnertoaddress0
 msgid "Define partners and their addresses."
-msgstr "İş Ortaklarını ve adreslerini tanımla"
+msgstr "Paydaşları ve adreslerini tanımla"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -388,17 +388,17 @@ msgstr "Dil"
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Extra Information"
-msgstr "Extra Bilgi"
+msgstr "Ek Bilgi"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_partners0
 msgid "Companies you work with."
-msgstr "Birlikte çalışılan şirketler"
+msgstr "Birlikte çalıştığınız firmalar"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Partner Contact"
-msgstr "Cari İletişimi"
+msgstr "Paydaş İlgilisi"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -408,7 +408,7 @@ msgstr "Genel"
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Photo"
-msgstr "Fotoğraf"
+msgstr "Foto"
 
 #. module: base_contact
 #: field:res.partner.contact,birthdate:0
@@ -423,7 +423,7 @@ msgstr "Bunu seçerseniz, bütün adresler taşınacak"
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Current"
-msgstr "Güncel"
+msgstr "Geçerli"
 
 #. module: base_contact
 #: field:res.partner.contact,first_name:0
@@ -433,7 +433,7 @@ msgstr "Ad"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_job
 msgid "Contact Partner Function"
-msgstr "Cari İletişim Pozisyonu"
+msgstr "Paydaş İlgilisi Görevi"
 
 #. module: base_contact
 #: field:res.partner.job,other:0
@@ -443,23 +443,23 @@ msgstr "Diğer"
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
 msgid "Function"
-msgstr "Pozisyon"
+msgstr "Görev"
 
 #. module: base_contact
 #: field:res.partner.address,job_id:0
 #: field:res.partner.contact,job_id:0
 msgid "Main Job"
-msgstr "Asıl görev"
+msgstr "Ana İş"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_contacttofunction0
 msgid "Defines contacts and functions."
-msgstr "Kişileri ve İşlevleri tanımlar"
+msgstr "İlgilileri ve görevleri tanımlar"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_contacttofunction0
 msgid "Contact to function"
-msgstr "Kişi Pozisyonu"
+msgstr "İlgili Görevi"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -475,7 +475,7 @@ msgstr "Uyruk"
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
 msgid "Open Jobs"
-msgstr "Açık görevler"
+msgstr "Açık İşler"
 
 #. module: base_contact
 #: field:base.contact.installer,name:0
@@ -485,17 +485,17 @@ msgstr "Ad"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "You can migrate Partner's current addresses to the contact."
-msgstr "İş Ortağının güncel adreslerini kişilere taşı"
+msgstr "Paydaşın güncel adreslerini ilgililere taşı"
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
 msgid "Main Employer"
-msgstr "İşveren"
+msgstr "Ana İşveren"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
 msgid "Address Migration"
-msgstr "Adresi Taşı"
+msgstr "Adres Taşıma"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -506,17 +506,17 @@ msgstr "Posta Adresi"
 #: model:process.node,name:base_contact.process_node_addresses0
 #: view:res.partner:0
 msgid "Addresses"
-msgstr "Adres Bilgileri"
+msgstr "Adresler"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
 msgid "Partner to address"
-msgstr "Cari Adresi"
+msgstr "Adreslenecek Paydaş"
 
 #. module: base_contact
 #: field:res.partner.job,date_start:0
 msgid "Date Start"
-msgstr "Tarih Başlangıcı"
+msgstr "Başlangıç Tarihi"
 
 #. module: base_contact
 #: help:res.partner.job,sequence_contact:0
diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py
index fb152da929d..c074718b6fe 100644
--- a/addons/base_crypt/__openerp__.py
+++ b/addons/base_crypt/__openerp__.py
@@ -26,18 +26,35 @@
     "website" : "http://www.openerp.com",
     "category" : "Tools",
     "description": """
-This module replaces the cleartext password in the database with a password hash.
-=================================================================================
+Replaces cleartext passwords in the database with a secure hash
+===============================================================
+For your existing user base, the removal of the cleartext
+passwords occurs the first time a user logs into the database,
+after installing base_crypt.
 
-It prevents anyone from reading the original password.
-For your existing user base, the removal of the cleartext passwords occurs the first time
-a user logs into the database, after installing base_crypt.
-After installing this module it won't be possible to recover a forgotten password for your
-users, the only solution is for an admin to set a new password.
+All passwords will be replaced by a secure, salted, cryptographic
+hash, preventing anyone from reading the original password in
+the database.
+
+After installing this module it won't be possible to recover a
+forgotten password for your users, the only solution is for an
+admin to set a new password.
+
+Security Warning
+++++++++++++++++
+Installing this module does not mean you can ignore other security measures,
+as the password is still transmitted unencrypted on the network, unless you
+are using a secure protocol such as XML-RPCS.
+It also does not protect the rest of the content of the database, which may
+contain critical data. Appropriate security measures need to be implemented
+by the system administrator in all areas, such as: protection of database
+backups, system files, remote shell access, physical server access, etc.
+
+Interation with LDAP authentication
++++++++++++++++++++++++++++++++++++
+This module is currently not compatible with the ``user_ldap`` module and
+will disable LDAP authentication completely if installed at the same time.
 
-Note: installing this module does not mean you can ignore basic security measures,
-as the password is still transmitted unencrypted on the network (by the client),
-unless you are using a secure protocol such as XML-RPCS.
                     """,
     "depends" : ["base"],
     "data" : [],
diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py
index a616b7e5b74..5a55c02269d 100644
--- a/addons/base_crypt/crypt.py
+++ b/addons/base_crypt/crypt.py
@@ -163,7 +163,7 @@ class users(osv.osv):
         # an existing column cannot be downsized; thus we use the original
         # column size.
         'password': fields.function(get_pw, fnct_inv=set_pw, type='char',
-            method=True, size=64, string='Password', invisible=True,
+            size=64, string='Password', invisible=True,
             store=True),
     }
 
diff --git a/addons/base_crypt/i18n/es_CL.po b/addons/base_crypt/i18n/es_CL.po
new file mode 100644
index 00000000000..2892c5fe0ba
--- /dev/null
+++ b/addons/base_crypt/i18n/es_CL.po
@@ -0,0 +1,72 @@
+# Spanish (Chile) 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-06-06 18:09+0000\n"
+"Last-Translator: doingit.cl <Unknown>\n"
+"Language-Team: Spanish (Chile) <es_CL@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-06-07 04:35+0000\n"
+"X-Generator: Launchpad (build 12959)\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 "res.users"
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está autorizada como compañía para este usuario"
+
+#. 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 "Error!"
+
+#. 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/fi.po b/addons/base_crypt/i18n/fi.po
new file mode 100644
index 00000000000..57b350a204f
--- /dev/null
+++ b/addons/base_crypt/i18n/fi.po
@@ -0,0 +1,71 @@
+# Finnish 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-06-08 10:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Kahdella eri käyttäjällä ei voi olla samaa käyttäjätunnusta!"
+
+#. 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 "Valittu yritys ei ole sallittu tälle käyttäjälle"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Please specify the password !"
+msgstr "Määrittele salasana !"
+
+#. module: base_crypt
+#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
+msgid "Base - Password Encryption"
+msgstr "Base - Salasanan kryptaus"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Error"
+msgstr "Virhe"
+
+#. 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/nb.po b/addons/base_crypt/i18n/nb.po
new file mode 100644
index 00000000000..ce85f3b3625
--- /dev/null
+++ b/addons/base_crypt/i18n/nb.po
@@ -0,0 +1,72 @@
+# Norwegian Bokmal 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-06-09 11:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Du kan ikke ha to brukere med samme login !"
+
+#. 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 ""
+"Det valgte firmaet er ikke i listen over tillatte firmaer for denne brukeren"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Please specify the password !"
+msgstr "Vennligst angi passordet !"
+
+#. module: base_crypt
+#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
+msgid "Base - Password Encryption"
+msgstr "Basis - Passord kryptering"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Error"
+msgstr "Feil"
+
+#. 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/pt.po b/addons/base_crypt/i18n/pt.po
new file mode 100644
index 00000000000..258d3f44ab0
--- /dev/null
+++ b/addons/base_crypt/i18n/pt.po
@@ -0,0 +1,71 @@
+# Portuguese 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-06-06 22:16+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-06-07 04:35+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Não pode ter dois utilizadores com o mesmo nome de utilizador!"
+
+#. 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 "A companhia escolhida não está entre permitidas para este utilizador"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Please specify the password !"
+msgstr "Por favor escolha uma password!"
+
+#. 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 "Erro"
+
+#. 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/vi.po b/addons/base_crypt/i18n/vi.po
new file mode 100644
index 00000000000..cd1ed4f93ea
--- /dev/null
+++ b/addons/base_crypt/i18n/vi.po
@@ -0,0 +1,73 @@
+# Vietnamese 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-06-04 22:52+0000\n"
+"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
+"Language-Team: Vietnamese <vi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-06 04:37+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Bạn không thể có hai người sử dụng với cùng tên đăng nhập !"
+
+#. 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 ""
+"Công ty được lựa chọn không nằm trong các công ty mà người sử dụng này được "
+"phép"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Please specify the password !"
+msgstr "Vui lòng xác định mật khẩu !"
+
+#. module: base_crypt
+#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
+msgid "Base - Password Encryption"
+msgstr "Cơ sở - Mã hóa Mật khẩu"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Error"
+msgstr "Lỗi"
+
+#. 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/zh_CN.po b/addons/base_crypt/i18n/zh_CN.po
new file mode 100644
index 00000000000..ee8bd3df6f4
--- /dev/null
+++ b/addons/base_crypt/i18n/zh_CN.po
@@ -0,0 +1,77 @@
+# Chinese (Simplified) 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-06-22 08:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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-06-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13168)\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 "res.users"
+
+#. 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 "Base - Password Encryption"
+
+#. 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 ""
+"这个模块在数据库里用密码散列代替原来的明文密码，防止任何人读取到原密码。\n"
+"对于已存在在数据，当安装了base_crypt后，明文密码会在用户第一次登陆数据库的时候清除。\n"
+"在安装了这个模块后将不能恢复已遗忘的用户密码，唯一的解决办法是通过管理员输入一个新密码。\n"
+"注意：安装这个模块并不意味着你可以忽略基本安全措施，\n"
+"除非你用了一个安全协议例如XML-RPCS，否则密码在网络仍然以非加密的形式传输（通过客户端）\n"
+"                    "
diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py
index 22bc7f3a089..0208e6cdc37 100644
--- a/addons/base_module_record/base_module_record.py
+++ b/addons/base_module_record/base_module_record.py
@@ -20,53 +20,11 @@
 ##############################################################################
 
 from xml.dom import minidom
-from osv.osv import osv_pool
 from osv import fields,osv
 import pooler
 import string
 import tools
 
-class recording_objects_proxy(osv_pool):
-    def execute(self, *args, **argv):
-        if args[3] == 'create':
-            _old_args = args[4].copy()
-        elif args[3] == 'write':
-            _old_args = args[5].copy()
-        elif len(args) >= 5 and isinstance(args[4], dict):
-            _old_args = args[4].copy()
-        elif len(args) > 5 and args[3] != 'write' and isinstance(args[5], dict):
-            _old_args = args[5].copy()
-        else:
-            _old_args = None
-        res = super(recording_objects_proxy, self).execute(*args, **argv)
-        pool = pooler.get_pool(args[0])
-        mod = pool.get('ir.module.record')
-
-        if mod and mod.recording:
-            if args[3] not in ('default_get','read','fields_view_get','fields_get','search','search_count','name_search','name_get','get','request_get', 'get_sc', 'unlink'):
-                if _old_args is not None:
-                    if args[3] != 'write' and args[3] != 'create' and len(args) > 5 and isinstance(args[5], dict):
-                       args=list(args) 
-                       args[5]=_old_args
-                       args=tuple(args)
-                       mod.recording_data.append(('osv_memory_action', args, argv ,None))
-                    else:
-                       if args[3] == 'create':
-                           args[4].update(_old_args)
-                       elif args[3] == 'write':
-                           args[5].update(_old_args)
-                       mod.recording_data.append(('query', args, argv,res))
-        return res
-
-    def exec_workflow(self, *args, **argv):
-        res = super(recording_objects_proxy, self).exec_workflow(*args, **argv)
-        pool = pooler.get_pool(args[0])
-        mod = pool.get('ir.module.record')
-        if mod and mod.recording:
-            mod.recording_data.append(('workflow', args, argv))
-        return res
-
-recording_objects_proxy()
 
 class xElement(minidom.Element):
     """dom.Element with compact print
diff --git a/addons/base_module_record/i18n/ca.po b/addons/base_module_record/i18n/ca.po
index 7dfa818da88..fbd34fe48a9 100644
--- a/addons/base_module_record/i18n/ca.po
+++ b/addons/base_module_record/i18n/ca.po
@@ -7,15 +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 03:44+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-05-26 05:32+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-27 04:46+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
@@ -34,12 +33,16 @@ 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 ""
+"Si creieu que el vostre mòdul podria interessar a altres persones, ens "
+"agradaria que el publiqueu en Openerp.com, a la secció 'Mòduls'. Podeu fer-"
+"ho mitjançant la pàgina web o utilitzant les característiques del mòdul "
+"'base_modul_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 "Acaba"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_data,init:0
@@ -153,13 +156,13 @@ msgstr "Mòdul creat correctament!"
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save_yaml:0
 msgid "YAML file successfully created !"
-msgstr ""
+msgstr "S'ha creat correctament el fitxer YAML!"
 
 #. 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 ""
+msgstr "Resultat, enganxi això en el xml del mòdul"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_data,init,filter_cond:0
@@ -193,7 +196,7 @@ msgstr "Gravació"
 #. module: base_module_record
 #: model:ir.module.module,shortdesc:base_module_record.module_meta_information
 msgid "Module Record"
-msgstr ""
+msgstr "Gravador de mòduls"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,info,save:0
@@ -204,13 +207,13 @@ msgstr "Continua"
 #: 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 ""
+msgstr "Exporta personalitzacions com un fitxer de dades"
 
 #. module: base_module_record
 #: code:addons/base_module_record/wizard/base_module_save.py:129
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,info,data_kind:0
@@ -242,13 +245,13 @@ msgstr "Informació del mòdul"
 #: 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 "Resultat"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_data,init,end:0
@@ -293,6 +296,30 @@ msgid ""
 "module.\n"
 "    "
 msgstr ""
+"\n"
+"Aquest mòdul us permet crear un nou mòdul sense cap tipus de "
+"desenvolupament.\n"
+"Grava totes les operacions sobre els objectes durant la sessió "
+"d'enregistrament i\n"
+"produeix un mòdul. *ZIP. D'aquesta forma podeu crear el vostre propi mòdul "
+"directament\n"
+"des del client d'OpenERP.\n"
+"\n"
+"Aquesta versió funciona per crear i actualitzar els registres existents. "
+"Recalcula\n"
+"dependències i enllaços per a tot tipus de ginys (many2one, many2many, "
+"...).\n"
+"També suporta fluxos de treball i dades de demostració/actualització.\n"
+"\n"
+"Això li ajudarà a crear fàcilment mòduls reutilitzables i publicables\n"
+"per a les configuracions personalitzades i dades de demostració/prova.\n"
+"\n"
+"Com utilitzar-ho:\n"
+"Executeu Administració/Personalització/Creació de mòduls/Exporta "
+"personalitzacions com un assistent del mòdul.\n"
+"Seleccioneu la data i hora d'enregistrament i els objectes que es gravaran i "
+"Grava mòdul.\n"
+"    "
 
 #~ msgid ""
 #~ "You can continue the recording session by relauching the 'start recording' "
diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index a026a077c85..29699b9000d 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -415,7 +415,7 @@ class report_creator(osv.osv):
         'model_ids': fields.many2many('ir.model', 'base_report_creator_report_model_rel', 'report_id', 'model_id', 'Reported Objects'),
         'field_ids': fields.one2many('base_report_creator.report.fields', 'report_id', 'Fields to Display'),
         'filter_ids': fields.one2many('base_report_creator.report.filter', 'report_id', 'Filters'),
-        'sql_query': fields.function(_sql_query_get, method=True, type="text", string='SQL Query', store=True),
+        'sql_query': fields.function(_sql_query_get, type="text", string='SQL Query', store=True),
         'group_ids': fields.many2many('res.groups', 'base_report_creator_group_rel', 'report_id', 'group_id', 'Authorized Groups'),
         'menu_id': fields.many2one('ir.ui.menu', "Menu", readonly=True),
     }
diff --git a/addons/base_report_creator/i18n/ca.po b/addons/base_report_creator/i18n/ca.po
index c98e62d87b6..f9d450187f6 100644
--- a/addons/base_report_creator/i18n/ca.po
+++ b/addons/base_report_creator/i18n/ca.po
@@ -7,15 +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-10-30 14:07+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-05-26 05:39+0000\n"
+"Last-Translator: cubells <vicent@vcubells.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-27 04:46+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -31,7 +30,7 @@ msgstr ""
 #. module: base_report_creator
 #: model:ir.model,name:base_report_creator.model_report_menu_create
 msgid "Menu Create"
-msgstr ""
+msgstr "Crea menú"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_type:0
@@ -54,7 +53,7 @@ msgid "Graph Mode"
 msgstr "Mode de gràfic"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: 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 "
@@ -66,7 +65,7 @@ msgstr ""
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Legend"
-msgstr ""
+msgstr "Llegenda"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -127,7 +126,7 @@ msgid "Custom Reports"
 msgstr "Informes personalitzats"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "No existeixen models relacionats!"
@@ -145,7 +144,7 @@ msgstr "Suma"
 #. 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 ""
+msgstr "Heu d'indicar color, data inicial i retard de la vista calendari."
 
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
@@ -177,7 +176,7 @@ msgstr "Crea menú per l'informe"
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Form"
-msgstr ""
+msgstr "Formulari"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type2:0
@@ -192,6 +191,7 @@ msgstr "/"
 #: 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 "Informe"
 
@@ -247,6 +247,7 @@ msgstr "I"
 #: constraint:base_report_creator.report:0
 msgid "You can not display field which are not stored in Database."
 msgstr ""
+"No podeu mostrar un camp que no estigui emmagatzemat a la base de dades."
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
@@ -305,7 +306,7 @@ msgstr "Configuració general"
 #. module: base_report_creator
 #: help:base_report_creator.report.fields,sequence:0
 msgid "Gives the sequence order when displaying a list of fields."
-msgstr ""
+msgstr "Indica l'ordre de seqüència quan es mostra una llista de camps."
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,init:0
@@ -384,12 +385,12 @@ msgstr "Cancel·la"
 #. module: base_report_creator
 #: constraint:base_report_creator.report:0
 msgid "You can apply aggregate function to the non calculated field."
-msgstr ""
+msgstr "Podeu aplicar la funció d'agregat per al camp no calculat."
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
 msgid "Menu"
-msgstr ""
+msgstr "Menú"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type1:0
@@ -409,7 +410,7 @@ msgstr "Camp"
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Unique Colors"
-msgstr ""
+msgstr "Colors únics"
 
 #. module: base_report_creator
 #: help:base_report_creator.report,active:0
@@ -417,6 +418,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the report "
 "without removing it."
 msgstr ""
+"Si el camp actiu es desmarca, permet ocultar l'informe sense eliminar-lo."
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
@@ -431,7 +433,7 @@ msgstr "Tercera vista"
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "End Date"
-msgstr ""
+msgstr "Data final"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,name:0
@@ -451,7 +453,7 @@ msgstr "Mitjana"
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Use %(uid)s to filter by the connected user"
-msgstr ""
+msgstr "Utilitzeu %(uid)s per filtrar per l'usuari connectat"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
@@ -520,6 +522,12 @@ msgid ""
 "After installing the module, it adds a menu to define custom report in\n"
 "the \"Dashboard\" menu.\n"
 msgstr ""
+"Aquest mòdul us permet crear qualsevol informe estadístic sobre\n"
+"diversos objectes. És un generador de consultes SQL i navegador\n"
+"per a qualsevol usuari.\n"
+"\n"
+"Després d'instal·lar el mòdul, s'afegeix un menú per definir\n"
+"informes personalitzats en el menú \"Tauler\".\n"
 
 #~ msgid "State"
 #~ msgstr "Estat"
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index 2c0cf191e4e..0afee6233ef 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -56,8 +56,9 @@
 
     <record id="report_designer_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_report_designer_installer"/>
+        <field name="category_id" ref="base.category_tools_customization_config"/>
         <field name="sequence">3</field>
-        <field name="restart">always</field>
+        <field name="type">special</field>
     </record>
 
     <record id="action_report_designer_wizard" model="ir.actions.act_window">
diff --git a/addons/base_report_designer/plugin/openerp_report_designer.zip b/addons/base_report_designer/plugin/openerp_report_designer.zip
index 47ca560e47d..85c9150cb73 100644
Binary files a/addons/base_report_designer/plugin/openerp_report_designer.zip and b/addons/base_report_designer/plugin/openerp_report_designer.zip differ
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/package/Addons.xcu b/addons/base_report_designer/plugin/openerp_report_designer/bin/package/Addons.xcu
index 121c49af167..f9c1280202d 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/package/Addons.xcu
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/package/Addons.xcu
@@ -19,7 +19,7 @@
                 <node oor:name="Submenu">
                     <node oor:name="m11" oor:op="replace">
                         <prop oor:name="URL" oor:type="xs:string">
-                            <value>service:org.openoffice.openerp.report.serverparam?execute</value>
+                            <value>service:org.openoffice.openerp.report.change?execute</value>
                         </prop>
                         <prop oor:name="Title" oor:type="xs:string">
                             <value/>
@@ -283,7 +283,7 @@
             <node oor:name="org.openoffice.openerp.report" oor:op="replace">
                 <node oor:name="m11" oor:op="replace">
                     <prop oor:name="URL" oor:type="xs:string">
-                        <value>service:org.openoffice.openerp.report.serverparam?execute</value>
+                        <value>service:org.openoffice.openerp.report.change?execute</value>
                     </prop>
                     <prop oor:name="ImageIdentifier" oor:type="xs:string">
                         <value/>
@@ -593,7 +593,7 @@
             </node>
             <node oor:name="org.openoffice.openerp.report.image8" oor:op="replace">
                 <prop oor:name="URL">
-                    <value>service:org.openoffice.openerp.report.serverparam?execute</value>
+                    <value>service:org.openoffice.openerp.report.change?execute</value>
                 </prop>
                 <node oor:name="UserDefinedImages">
                     <prop oor:name="ImageSmallURL" oor:type="xs:string">
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
index d4359a466ca..0b68ab10b01 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
@@ -44,68 +44,96 @@
 #
 #
 ##############################################################################
-
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
 if __name__<>"package":
     from lib.gui import *
+    from lib.error import ErrorDialog
     from lib.functions import *
+    from lib.logreport import *
     from lib.rpc import *
+    from ServerParameter import *
+    database="test"
 
-class Change:
-    def __init__(self, aVal= None, sURL=""):
+class Change( unohelper.Base, XJobExecutor ):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        desktop=getDesktop()
+        log_detail(self)
+        self.logobj=Logger()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        self.protocol = {
+            'XML-RPC': 'http://',
+            'XML-RPC secure': 'https://',
+            'NET-RPC': 'socket://',
+        }  
+        host=port=protocol=''
+        if docinfo.getUserFieldValue(0):
+            m = re.match('^(http[s]?://|socket://)([\w.\-]+):(\d{1,5})$',  docinfo.getUserFieldValue(0) or '')
+            host = m.group(2)
+            port = m.group(3)
+            protocol = m.group(1)
+        if  protocol:
+            for (key, value) in self.protocol.iteritems(): 
+                if value==protocol:
+                    protocol=key
+                    break
+        else:
+            protocol='XML-RPC'
         self.win=DBModalDialog(60, 50, 120, 90, "Connect to Open ERP Server")
 
         self.win.addFixedText("lblVariable", 38, 12, 25, 15, "Server  ")
-
-        self.win.addEdit("txtHost",-2,9,60,15,sURL[sURL.find("/")+2:sURL.rfind(":")])
+        self.win.addEdit("txtHost",-2,9,60,15, host or 'localhost')
 
         self.win.addFixedText("lblReportName",45 , 31, 15, 15, "Port  ")
-        self.win.addEdit("txtPort",-2,28,60,15,sURL[sURL.rfind(":")+1:])
+        self.win.addEdit("txtPort",-2,28,60,15, port or "8069")
 
         self.win.addFixedText("lblLoginName", 2, 51, 60, 15, "Protocol Connection")
 
         self.win.addComboListBox("lstProtocol", -2, 48, 60, 15, True)
         self.lstProtocol = self.win.getControl( "lstProtocol" )
 
-#        self.lstProtocol.addItem( "XML-RPC", 0)
-        #self.lstProtocol.addItem( "XML-RPC secure", 1)
-        #self.lstProtocol.addItem( "NET-RPC (faster)", 2)
-
-        self.win.addButton( 'btnOK', -2, -5, 30, 15, 'Ok', actionListenerProc = self.btnOk_clicked )
+        self.win.addButton( 'btnNext', -2, -5, 30, 15, 'Next', actionListenerProc = self.btnNext_clicked )
 
         self.win.addButton( 'btnCancel', -2 - 30 - 5 ,-5, 30, 15, 'Cancel', actionListenerProc = self.btnCancel_clicked )
-        self.aVal=aVal
-        self.protocol = {
-            'XML-RPC': 'http://',
-            'XML-RPC secure': 'https://',
-            'NET-RPC': 'socket://',
-        }
+       
         for i in self.protocol.keys():
             self.lstProtocol.addItem(i,self.lstProtocol.getItemCount() )
+        self.win.doModalDialog( "lstProtocol",  protocol)
 
-        sValue=self.protocol.keys()[0]
-        if sURL<>"":
-            sValue=self.protocol.keys()[self.protocol.values().index(sURL[:sURL.find("/")+2])]
-
-        self.win.doModalDialog( "lstProtocol", sValue)
-
-    def btnOk_clicked(self,oActionEvent):
+    def btnNext_clicked(self,oActionEvent):
         global url
-        url = self.protocol[self.win.getListBoxSelectedItem("lstProtocol")]+self.win.getEditText("txtHost")+":"+self.win.getEditText("txtPort")
-        self.sock=RPCSession(url)
-        desktop=getDesktop()
-        doc = desktop.getCurrentComponent()
-        docinfo=doc.getDocumentInfo()        
-        docinfo.setUserFieldValue(0,url)
-        res=self.sock.listdb()
-        if res == -1:
-            self.aVal.append(url)
-        elif res == 0:
-            self.aVal.append("No Database found !!!")
-        else:
-            self.aVal.append(url)
-        self.aVal.append(res)
+        aVal=''
+        #aVal= Fetature used 
+        try:
+            url = self.protocol[self.win.getListBoxSelectedItem("lstProtocol")]+self.win.getEditText("txtHost")+":"+self.win.getEditText("txtPort")
+            self.sock=RPCSession(url)
+            desktop=getDesktop()
+            doc = desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()        
+            docinfo.setUserFieldValue(0,url)
+            res=self.sock.listdb()
+            self.win.endExecute()
+            ServerParameter(aVal,url)
+        except :
+            import traceback,sys 
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ServerParameter', LOG_ERROR, info)     
+            ErrorDialog("Connection to server fail. please check your Server Parameter", "", "Error")
+            self.win.endExecute()
+                 
+    def btnCancel_clicked(self,oActionEvent):
         self.win.endExecute()
+        
 
-    def btnCancel_clicked( self, oActionEvent ):
-        self.win.endExecute()
+if __name__<>"package" and __name__=="__main__":
+    Change(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( Change, "org.openoffice.openerp.report.change", ("com.sun.star.task.Job",),)
 
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
index dbd597e1f2d..012c6f896a2 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
@@ -51,5 +51,5 @@ if __name__<>"package":
 class LoginTest:
     def __init__(self):
         if not loginstatus:
-            ServerParameter(None)
+            Change(None)
 
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
index 3cf759e7ada..245cd1dc7ce 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
@@ -59,8 +59,7 @@ if __name__<>"package":
     database="test"
 
 class ServerParameter( unohelper.Base, XJobExecutor ):
-    def __init__(self,ctx):
-        self.ctx     = ctx
+    def __init__(self, aVal= None, sURL=""):
         self.module  = "openerp_report"
         self.version = "0.1"
         desktop=getDesktop()
@@ -69,19 +68,12 @@ class ServerParameter( unohelper.Base, XJobExecutor ):
         doc = desktop.getCurrentComponent()
         docinfo=doc.getDocumentInfo()
         self.win=DBModalDialog(60, 50, 160, 108, "Server Connection Parameter")
-
         self.win.addFixedText("lblVariable", 2, 12, 35, 15, "Server URL")
         if docinfo.getUserFieldValue(0)=="":
-            docinfo.setUserFieldValue(0,"http://localhost:8069")
-        self.win.addEdit("txtHost",-34,9,91,15,docinfo.getUserFieldValue(0))
-        self.win.addButton('btnChange',-2 ,9,30,15,'Change', actionListenerProc = self.btnChange_clicked )
-
+           docinfo.setUserFieldValue(0,"http://localhost:8069")
+        self.win.addFixedText("txtHost",-20,12,105,15,sURL)
         self.win.addFixedText("lblDatabaseName", 6, 31, 31, 15, "Database")
-        #self.win.addFixedText("lblMsg", -2,28,123,15)
-#        self.win.addComboListBox("lstDatabase", -2,28,123,15, True)
-#        self.lstDatabase = self.win.getControl( "lstDatabase" )
-        #self.win.selectListBoxItem( "lstDatabase", docinfo.getUserFieldValue(2), True )
-        #self.win.setEnabled("lblMsg",False)
+
 
         self.win.addFixedText("lblLoginName", 17, 51, 20, 15, "Login")
         self.win.addEdit("txtLoginName",-2,48,123,15,docinfo.getUserFieldValue(1))
@@ -92,8 +84,9 @@ class ServerParameter( unohelper.Base, XJobExecutor ):
 
 
         self.win.addButton('btnOK',-2 ,-5, 60,15,'Connect' ,actionListenerProc = self.btnOk_clicked )
-
-        self.win.addButton('btnCancel',-2 - 60 - 5 ,-5, 35,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+        self.win.addButton('btnPrevious',15 -80 ,-5,50,15,'Previous',actionListenerProc = self.btnPrevious_clicked)
+        self.win.addButton('btnCancel',-2 - 110 - 5 ,-5, 35,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+ 
         sValue=""
         if docinfo.getUserFieldValue(0)<>"":
             global url
@@ -125,7 +118,6 @@ class ServerParameter( unohelper.Base, XJobExecutor ):
 
     def btnOk_clicked(self,oActionEvent):
 
-
         sLogin=self.win.getEditText("txtLoginName")
         sPassword=self.win.getEditText("txtPassword")
         global url
@@ -136,20 +128,14 @@ class ServerParameter( unohelper.Base, XJobExecutor ):
             sDatabase=self.win.getListBoxSelectedItem("lstDatabase")
         self.sock=RPCSession(url)
         UID = self.sock.login(sDatabase,sLogin,sPassword)
-        if not UID :
+        if not UID or UID==-1 :
             ErrorDialog("Connection Refuse...","Please enter valid Login/Password")
-            self.win.endExecute()
-        try:
-            ids_module =self.sock.execute(sDatabase, UID, sPassword, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')])
-        except :
-            import traceback,sys
-            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
-            self.logobj.log_write('ServerParameter', LOG_ERROR, info)
-
+          #  self.win.endExecute()
+        ids_module =self.sock.execute(sDatabase, UID, sPassword, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')])
         if not len(ids_module):
             ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error")
             self.logobj.log_write('Module Not Found',LOG_WARNING, ':base_report_designer not install in  database %s' % (sDatabase))
-            self.win.endExecute()
+            #self.win.endExecute()
         else:
             desktop=getDesktop()
             doc = desktop.getCurrentComponent()
@@ -171,27 +157,15 @@ class ServerParameter( unohelper.Base, XJobExecutor ):
             self.logobj.log_write('successful login',LOG_INFO, ':successful login from %s  using database %s' % (sLogin, sDatabase))
             self.win.endExecute()
 
+      
     def btnCancel_clicked( self, oActionEvent ):
         self.win.endExecute()
 
-    def btnChange_clicked(self,oActionEvent):
-        aVal=[]
-        url= self.win.getEditText("txtHost")
-        Change(aVal,url)
-        if aVal[1]== -1:
-           self.win.getEditText("lstDatabase")
-           self.win.removeListBoxItems("lstDatabase", 0, self.win.getListBoxItemCount("lstDatabase"))
-           self.win.setEditText("txtHost",aVal[0])
-           for i in range(len(aVal[1])):
-                self.lstDatabase.addItem(aVal[1][i],i)
-        elif aVal[1]==0:
-            ErrorDialog(aVal[0],"")
-        else:
-            self.win.setEditText("txtHost",aVal[0])
-            self.win.removeListBoxItems("lstDatabase", 0, self.win.getListBoxItemCount("lstDatabase"))
-            for i in range(len(aVal[1])):
-                self.lstDatabase.addItem(aVal[1][i],i)
-
+    def btnPrevious_clicked(self,oActionEvent):
+        self.win.endExecute()
+        Change(None)
+        self.win.endExecute()
+        
 
 if __name__<>"package" and __name__=="__main__":
     ServerParameter(None)
diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 9ed5ec84535..2dab90b90b2 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import installer
-import todo
 import wizard
 import os
 import base64
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index 420deb46bfb..39a417460b0 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -37,8 +37,8 @@ It also helps to easily configure your company.
     'depends': ['base'],
     'init_xml': ['base_setup_data.xml'],
     'update_xml': ['security/ir.model.access.csv',
+                   'wizard/res_company_logo_view.xml',
                    'base_setup_installer.xml',
-                   'base_setup_todo.xml',
                    ],
     'demo_xml': ['base_setup_demo.xml'],
     'installable': True,
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 13906abe6ba..e8168a69ea9 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -1,5 +1,6 @@
 <openerp>
   <data>
+
     <record id="view_base_setup_installer" model="ir.ui.view">
       <field name="name">base.setup.installer.view</field>
       <field name="model">base.setup.installer</field>
@@ -23,7 +24,7 @@
           <separator string="title" position="attributes">
             <attribute name="string">Install Applications</attribute>
           </separator>
-            
+
           <group colspan="8">
             <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
@@ -40,9 +41,21 @@
             <field name="point_of_sale" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <separator string="Install Specific Industry Applications" colspan="4"/>
-            <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="auction" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="product_expiry" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <group name="crm"/> 
+            <group name="sale"/> 
+            <group name="project"/> 
+            <group name="knowledge"/> 
+            <group name="mrp"/> 
+            <group name="account_accountant"/>
+            <group name="purchase"/>
+            <group name="hr"/>
+            <group name="profile_tools"/>
+            <group name="marketing"/>
+            <group name="report_designer"/>
+            <group name="association"/>
           </group>
         </data>
       </field>
@@ -60,8 +73,237 @@
 
     <record id="base_setup_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_installer"/>
+        <field name="category_id" ref="base.category_administration_config"/>
         <field name="sequence">2</field>
-        <field name="restart">always</field>
+        <field name="type">normal_recurring</field>
     </record>
+
+<!--     Migrate data from another application Conf Wiz-->
+
+    <record id="view_migrade_application_installer_modules" model="ir.ui.view">
+        <field name="name">migrade.application.installer.modules.form</field>
+        <field name="model">migrade.application.installer.modules</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">Migrate data from another application</attribute>
+                </form>
+                <separator string="title" position="attributes">
+                     <attribute name="string">Migrate data from another application</attribute>
+                </separator>
+                <xpath expr="//label[@string='description']" position="attributes">
+                    <attribute name="string">Import data from other applications. Following the selected application, you can import more or less type of data matching to OpenERP objects. Choose the application and then the data you want to import in OpenERP</attribute>
+                </xpath>
+                <xpath expr="//button[@string='Install Modules']" position="attributes">
+                    <attribute name="string">Configure</attribute>
+                </xpath>
+                <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                    <attribute name='string'></attribute>
+                </xpath>
+                <group colspan="8">
+                    <field name="import_saleforce"/>
+                    <field name="import_sugarcrm"/>
+                    <field name="sync_google_contact"/>
+                    <field name="quickbooks_ippids"/>
+                </group>
+            </data>
+        </field>
+    </record>
+
+    <record id="action_migrade_application_installer_modules" model="ir.actions.act_window">
+	     <field name="name">Migrate data from another application</field>
+	     <field name="type">ir.actions.act_window</field>
+	     <field name="res_model">migrade.application.installer.modules</field>
+	     <field name="view_id" ref="view_migrade_application_installer_modules"/>
+	     <field name="view_type">form</field>
+	     <field name="view_mode">form</field>
+	     <field name="target">new</field>
+   </record>
+
+   <record id="migrade_application_installer_modules_todo" model="ir.actions.todo">
+      <field name="action_id" ref="action_migrade_application_installer_modules"/>
+      <field name="category_id" ref="base.category_administration_config"/>
+      <field name="type">normal</field>
+      <field name="state">skip</field>
+  </record>
+
+          <!-- Import or create customers configartion view  -->
+
+	 <record id="action_import_create_installer" model="ir.actions.act_window">
+	     <field name="name">Import or create customers </field>
+	     <field name="type">ir.actions.act_window</field>
+	     <field name="res_model">res.partner</field>
+	     <field name="view_type">form</field>
+	     <field name="view_mode">tree,form</field>
+	     <field name="view_id" ref="base.view_partner_tree"/>
+	     <field name="help">Create some customers, suppliers and their contacts manually or import a CSV spreadsheet by clicking on the import link</field>
+	 </record>
+
+    <!--          register configuration wizard -->
+	<record id="config_wizard_action_import_create_installer" model="ir.actions.todo">
+	    <field name="action_id" ref="action_import_create_installer"/>
+	    <field name="category_id" ref="base.category_administration_config"/>
+	    <field name="type">normal</field>
+	    <field name="target">current</field>
+	    <field name="state">skip</field>
+	</record>
+
+	<!--        Define default users preferences-->
+
+     <record id="view_user_preferences_config_form" model="ir.ui.view">
+          <field name="name">Define default users preferences</field>
+          <field name="model">user.preferences.config</field>
+          <field name="type">form</field>
+          <field name="inherit_id" ref="base.res_config_view_base"/>
+          <field name="arch" type="xml">
+            <data>
+              <form position="attributes">
+                <attribute name="string">Define default users preferences</attribute>
+              </form>
+            <xpath expr='//separator[@string="title"]' position='attributes'>
+                  <attribute name='string'>Define default users preferences</attribute>
+            </xpath>
+            <xpath expr="//label[@string='description']"
+               position="attributes">
+              <attribute name="string">Specify default values. This will set the default values for each new user, each user is free to change his own preferences.</attribute>
+            </xpath>
+            <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                  <attribute name='string'></attribute>
+                  <attribute name='rowspan'>12</attribute>
+            </xpath>
+             <group string="res_config_contents" position="replace">
+                    <group colspan="4">
+                        <field colspan="4" name="view" />
+                        <field colspan="4" name="context_lang" />
+                        <field colspan="4" name="context_tz" />
+                        <field colspan="4" name="menu_tips" />
+                  </group>
+              </group>
+            </data>
+          </field>
+      </record>
+
+      <record id="action_user_preferences_config_form" model="ir.actions.act_window">
+          <field name="name">Define default users preferences</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">user.preferences.config</field>
+          <field name="view_type">form</field>
+          <field name="view_id" ref="view_user_preferences_config_form"/>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+      </record>
+
+      <!--   Register configuration wizard -->
+
+      <record id="config_action_user_preferences_config_form" model="ir.actions.todo">
+          <field name="action_id" ref="action_user_preferences_config_form"/>
+          <field name="category_id" ref="base.category_administration_config"/>
+          <field name="type">normal</field>
+          <field name="state">skip</field>
+      </record>
+
+      <!--     Config Wiz   Create New User's Login   -->
+
+      <record id="action_config_access_other_user" model="ir.actions.act_window">
+          <field name="name">Create New User's Login</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">res.users</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">form</field>
+          <field name="view_id" ref="base.view_users_form"/>
+      </record>
+
+      <!--   register configuration wizard  -->
+
+      <record id="config_wizard_action_config_user_form" model="ir.actions.todo">
+          <field name="action_id" ref="action_config_access_other_user"/>
+          <field name="category_id" ref="base.category_administration_config"/>
+          <field name="type">normal</field>
+          <field name="target">current</field>
+          <field name="sequence">1000</field>
+          <field name="state">cancel</field>
+      </record>
+
+      <!--   register Upload Logo configuration wizard  -->
+
+      <record id="config_wizard_action_res_company_logo" model="ir.actions.todo">
+          <field name="action_id" ref="action_res_company_logo"/>
+          <field name="category_id" ref="base.category_administration_config"/>
+          <field name="type">normal</field>
+          <field name="state">cancel</field>
+      </record>
+
+            <!--        Specify Your Terminology Config Wiz-->
+
+     <record id="view_partner_terminology_config_form" model="ir.ui.view">
+          <field name="name">Specify Your Terminology</field>
+          <field name="model">specify.partner.terminology</field>
+          <field name="type">form</field>
+          <field name="inherit_id" ref="base.res_config_view_base"/>
+         <field name="arch" type="xml">
+            <data>
+              <form position="attributes">
+                <attribute name="string">Specify Your Terminology</attribute>
+              </form>
+            <xpath expr='//separator[@string="title"]' position='attributes'>
+                  <attribute name='string'>Specify Your Terminology</attribute>
+            </xpath>
+            <xpath expr="//label[@string='description']"
+               position="attributes">
+              <attribute name="string">Based on the industry needs you can use this wizard to change the terminologies for Partners. </attribute>
+            </xpath>
+            <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                  <attribute name='string'></attribute>
+                 <attribute name='rowspan'>12</attribute>
+            </xpath>
+             <group string="res_config_contents" position="replace">
+                    <group colspan="4">
+                        <field colspan="4" name="partner" />
+                  </group>
+              </group>
+            </data>
+          </field>
+      </record>
+
+      <record id="action_partner_terminology_config_form" model="ir.actions.act_window">
+          <field name="name">Specify Your Terminology</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">specify.partner.terminology</field>
+          <field name="view_type">form</field>
+          <field name="view_id" ref="view_partner_terminology_config_form"/>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+      </record>
+
+      <!--   Register configuration wizard -->
+
+      <record id="config_action_partner_terminology_config_form" model="ir.actions.todo">
+          <field name="action_id" ref="action_partner_terminology_config_form"/>
+          <field name="category_id" ref="base.category_administration_config"/>
+          <field name="type">normal</field>
+          <field name="state">skip</field>
+      </record>
+
+
+    <record id="action_base_setup_company" model="ir.actions.act_window">
+      <field name="name">Company Configuration</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">res.company</field>
+      <field name="view_id" ref="base.view_company_form"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="context">{'res_id': user.company_id.id}</field>
+    </record>
+
+    <record id="base_setup_company_todo" model="ir.actions.todo">
+        <field name="action_id" ref="action_base_setup_company"/>
+        <field name="category_id" ref="base.category_administration_config"/>
+        <field name="sequence">1</field>
+        <field name="type">normal</field>
+        <field name="state">skip</field>
+    </record>
+
   </data>
 </openerp>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
deleted file mode 100644
index 7cd0563aafe..00000000000
--- a/addons/base_setup/base_setup_todo.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<openerp>
-  <data>
-    <record id="view_base_setup_company" model="ir.ui.view">
-      <field name="name">Company Configuration</field>
-      <field name="model">base.setup.company</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_view_base"/>
-      <field name="arch" type="xml">
-        <data>
-          <form position="attributes">
-            <attribute name="string">Company Configuration</attribute>
-          </form>
-          <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">Your company information will be used to personalize documents issued with OpenERP such as invoices, sales orders and much more.</attribute>
-          </xpath>
-          <xpath expr='//separator[@string="title"]' position='attributes'>
-                    <attribute name='string'>Configure Your Company Information</attribute>
-          </xpath>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='rowspan'>25</attribute>
-                    <attribute name='string'></attribute>
-          </xpath>
-          <group string="res_config_contents" position="replace">
-              <group colspan="5">
-                  <group colspan="2">
-                    <field name="company_id" invisible="1"/>
-                    <field name="name" required="True"/><field name="website"/>
-                    <field name="street"/><field name="street2"/>
-                    <field name="zip"/>
-                    <field name="city"/>
-                    <field name="country_id"/>
-                    <field name="state_id"/>
-                    <field name="phone"/>
-                    <field name="email"/>
-                    <field name="account_no"/>
-                    <field name="currency" widget="selection"/>
-                </group>
-                <newline/>
-                <group colspan="2">
-                    <field name="rml_header1" colspan="5" invisible="1" groups="base.group_extended"/>
-                    <field name="rml_footer1" colspan="5" invisible="1" groups="base.group_extended"/>
-                    <field name="rml_footer2" colspan="5" invisible="1" groups="base.group_extended"/>
-
-                    <separator colspan="4"
-                               string="Your Logo - Use a size of about 450x150 pixels."/>
-                    <field colspan="5" name="logo" widget="image"
-                           nolabel="1"/>
-                  </group>
-            </group>
-           </group>
-
-          <xpath expr='//button[@name="action_skip"]' position='replace'/>
-        </data>
-      </field>
-    </record>
-
-    <record id="action_base_setup_company" model="ir.actions.act_window">
-      <field name="name">Company Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">base.setup.company</field>
-      <field name="view_id" ref="view_base_setup_company"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="base_setup_company_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_base_setup_company"/>
-        <field name="sequence">1</field>
-        <field name="restart">onskip</field>
-    </record>
-  </data>
-</openerp>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index e23f1171752..172d9687582 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -19,6 +19,10 @@
 #
 ##############################################################################
 from osv import fields, osv
+import pooler
+import pytz
+from tools.translate import _
+import tools
 
 class base_setup_installer(osv.osv_memory):
     _name = 'base.setup.installer'
@@ -49,7 +53,7 @@ class base_setup_installer(osv.osv_memory):
         'mrp':fields.boolean('Manufacturing',
             help="Helps you manage your manufacturing processes and generate "
                  "reports on those processes."),
-        'account_voucher':fields.boolean('Invoicing',
+        'account_voucher':fields.boolean('Invoicing & Payments',
             help="Allows you to create your invoices and track the payments. It is an easier version of the accounting module for managers who are not accountants."),
         'account_accountant':fields.boolean('Accounting & Finance',
             help="Helps you handle your accounting needs, if you are not an accountant, we suggest you to install only the Invoicing "),
@@ -101,5 +105,219 @@ class base_setup_installer(osv.osv_memory):
         value.update({'progress':progress})
         if progress < 10.:
             progress = 10.
+        
         return {'value':value}
+
+
+    def execute(self, cr, uid, ids, context=None):
+        if context is None:
+             context = {}
+        module_pool = self.pool.get('ir.module.module')
+        modules_selected = []
+        datas = self.read(cr, uid, ids, context=context)[0]
+        for mod in datas.keys():
+            if mod in ('id', 'progress'):
+                continue
+            if datas[mod] == 1:
+                modules_selected.append(mod)
+
+        module_ids = module_pool.search(cr, uid, [('name', 'in', modules_selected)], context=context)
+        for module in module_pool.browse(cr, uid, module_ids, context=context):
+            if module.state == 'uninstalled':
+                module_pool.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context)
+                cr.commit()
+                new_db, self.pool = pooler.restart_pool(cr.dbname, update_module=True)
+            elif module.state == 'installed':
+                cr.execute("update ir_actions_todo set state='open' \
+                                    from ir_model_data as data where data.res_id = ir_actions_todo.id \
+                                    and ir_actions_todo.type='special'\
+                                    and data.model = 'ir.actions.todo' and data.module=%s", (module.name, ))
+        return
+    
 base_setup_installer()
+
+#Migrate data from another application Conf wiz
+
+class migrade_application_installer_modules(osv.osv_memory):
+    _name = 'migrade.application.installer.modules'
+    _inherit = 'res.config.installer'
+    _columns = {
+        'import_saleforce': fields.boolean('Import Saleforce',
+            help="For Import Saleforce"),
+        'import_sugarcrm': fields.boolean('Import Sugarcrm',
+            help="For Import Sugarcrm"),
+        'sync_google_contact': fields.boolean('Sync Google Contact',
+            help="For Sync Google Contact"),
+        'quickbooks_ippids': fields.boolean('Quickbooks Ippids',
+            help="For Quickbooks Ippids"),
+    }
+    
+migrade_application_installer_modules()
+
+class product_installer(osv.osv_memory):
+    _name = 'product.installer'
+    _inherit = 'res.config'
+    _columns = {
+                'customers': fields.selection([('create','Create'), ('import','Import')], 'Customers', size=32, required=True, help="Import or create customers"),
+
+    }
+    _defaults = {
+                 'customers': 'create',
+    }
+    
+    def execute(self, cr, uid, ids, context=None):
+        if context is None:
+             context = {}
+        data_obj = self.pool.get('ir.model.data')
+        val = self.browse(cr, uid, ids, context=context)[0]
+        if val.customers == 'create':
+            id2 = data_obj._get_id(cr, uid, 'base', 'view_partner_form')
+            if id2:
+                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            return {
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'res_model': 'res.partner',
+                    'views': [(id2, 'form')],
+                    'type': 'ir.actions.act_window',
+                    'target': 'current',
+                    'nodestroy':False,
+                }
+        if val.customers == 'import':
+            return {'type': 'ir.actions.act_window'}
+
+product_installer()
+
+
+#       Define default users preferences config wiz
+
+def _lang_get(self, cr, uid, context=None):
+    obj = self.pool.get('res.lang')
+    ids = obj.search(cr, uid, [('translatable','=',True)])
+    res = obj.read(cr, uid, ids, ['code', 'name'], context=context)
+    res = [(r['code'], r['name']) for r in res]
+    return res
+
+def _tz_get(self,cr,uid, context=None):
+    return [(x, x) for x in pytz.all_timezones]
+
+class user_preferences_config(osv.osv_memory):
+    _name = 'user.preferences.config'
+    _inherit = 'res.config'
+    _columns = {
+        'context_tz': fields.selection(_tz_get,  'Timezone', size=64,
+            help="Set default for new user's timezone, used to perform timezone conversions "
+                 "between the server and the client."),
+        'context_lang': fields.selection(_lang_get, 'Language', required=True,
+            help="Sets default language for the all user interface, when UI "
+                "translations are available. If you want to Add new Language, you can add it from 'Load an Official Translation' wizard  from 'Administration' menu."),
+        'view': fields.selection([('simple','Simplified'),
+                                  ('extended','Extended')],
+                                 'Interface', required=True, help= "If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences." ),
+        'menu_tips': fields.boolean('Display Tips', help="Check out this box if you want to always display tips on each menu action"),
+                                 
+    }
+    _defaults={
+               'view' : lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple',
+               'context_lang' : 'en_US',
+               'menu_tips' : True
+    }
+    
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        res = super(user_preferences_config, self).default_get(cr, uid, fields, context=context)
+        res_default = self.pool.get('ir.values').get(cr, uid, 'default', False, ['res.users'])
+        for id, field, value in res_default:
+            res.update({field: value})
+        return res
+
+    def execute(self, cr, uid, ids, context=None):
+        user_obj = self.pool.get('res.users')
+        user_ids = user_obj.search(cr, uid, [], context=context)
+        for o in self.browse(cr, uid, ids, context=context):
+            user_obj.write(cr , uid, user_ids ,{'context_tz' : o.context_tz, 'context_lang' : o.context_lang, 'view' : o.view, 'menu_tips' : o.menu_tips}, context=context)
+            ir_values_obj = self.pool.get('ir.values')
+            ir_values_obj.set(cr, uid, 'default', False, 'context_tz', ['res.users'], o.context_tz)
+            ir_values_obj.set(cr, uid, 'default', False, 'context_lang', ['res.users'], o.context_lang)
+            ir_values_obj.set(cr, uid, 'default', False, 'view', ['res.users'], o.view)
+            ir_values_obj.set(cr, uid, 'default', False, 'menu_tips', ['res.users'], o.menu_tips)
+        return {}
+
+user_preferences_config()
+
+# Specify Your Terminology
+
+class specify_partner_terminology(osv.osv_memory):
+    _name = 'specify.partner.terminology'
+    _inherit = 'res.config'
+    _columns = {
+        'partner': fields.selection([('Customer','Customer'),
+                                  ('Client','Client'),
+                                  ('Member','Member'),
+                                  ('Patient','Patient'),
+                                  ('Partner','Partner'),
+                                  ('Donor','Donor'),
+                                  ('Guest','Guest'),
+                                  ('Tenant','Tenant')
+                                  ],
+                                 'Choose how to call a customer', required=True ),
+    }
+    _defaults={
+               'partner' :'Partner',
+    }
+    
+    def make_translations(self, cr, uid, ids, name, type, src, value, res_id=0, context=None):
+        trans_obj = self.pool.get('ir.translation')
+        user_obj = self.pool.get('res.users')
+        context_lang = user_obj.browse(cr, uid, uid, context=context).context_lang
+        existing_trans_ids = trans_obj.search(cr, uid, [('name','=',name), ('lang','=',context_lang), ('type','=',type), ('src','=',src), ('res_id','=',res_id)])
+        if existing_trans_ids:
+            trans_obj.write(cr, uid, existing_trans_ids, {'value': value}, context=context)
+        else:
+            create_id = trans_obj.create(cr, uid, {'name': name,'lang': context_lang, 'type': type, 'src': src, 'value': value , 'res_id': res_id}, context=context)
+        return {}
+    
+    def execute(self, cr, uid, ids, context=None):
+        def _case_insensitive_replace(ref_string, src, value):
+            import re
+            pattern = re.compile(src, re.IGNORECASE)
+            return pattern.sub(_(value), _(ref_string))
+        trans_obj = self.pool.get('ir.translation')
+        fields_obj = self.pool.get('ir.model.fields')
+        menu_obj = self.pool.get('ir.ui.menu')
+        act_window_obj = self.pool.get('ir.actions.act_window')
+        for o in self.browse(cr, uid, ids, context=context):
+            #translate label of field
+            field_ids = fields_obj.search(cr, uid, [('field_description','ilike','Customer')])
+            for f_id in fields_obj.browse(cr ,uid, field_ids, context=context):
+                field_ref = f_id.model_id.model + ',' + f_id.name
+                self.make_translations(cr, uid, ids, field_ref, 'field', f_id.field_description, _case_insensitive_replace(f_id.field_description,'Customer',o.partner), context=context)
+            #translate help tooltip of field
+            for obj in self.pool.obj_pool.values():
+                for field_name, field_rec in obj._columns.items():
+                    if field_rec.help.lower().count('customer'):
+                        field_ref = obj._name + ',' + field_name
+                        self.make_translations(cr, uid, ids, field_ref, 'help', field_rec.help, _case_insensitive_replace(field_rec.help,'Customer',o.partner), context=context)
+            #translate menuitems
+            menu_ids = menu_obj.search(cr,uid, [('name','ilike','Customer')])
+            for m_id in menu_obj.browse(cr, uid, menu_ids, context=context):
+                menu_name = m_id.name
+                menu_ref = 'ir.ui.menu' + ',' + 'name'
+                self.make_translations(cr, uid, ids, menu_ref, 'model', menu_name, _case_insensitive_replace(menu_name,'Customer',o.partner), res_id=m_id.id, context=context)
+            #translate act window name
+            act_window_ids = act_window_obj.search(cr, uid, [('name','ilike','Customer')])
+            for act_id in act_window_obj.browse(cr ,uid, act_window_ids, context=context):
+                act_ref = 'ir.actions.act_window' + ',' + 'name'
+                self.make_translations(cr, uid, ids, act_ref, 'model', act_id.name, _case_insensitive_replace(act_id.name,'Customer',o.partner), res_id=act_id.id, context=context)
+            #translate act window tooltips
+            act_window_ids = act_window_obj.search(cr, uid, [('help','ilike','Customer')])
+            for act_id in act_window_obj.browse(cr ,uid, act_window_ids, context=context):
+                act_ref = 'ir.actions.act_window' + ',' + 'help'
+                self.make_translations(cr, uid, ids, act_ref, 'model', act_id.help, _case_insensitive_replace(act_id.help,'Customer',o.partner), res_id=act_id.id, context=context)
+        return {}
+    
+specify_partner_terminology()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
deleted file mode 100644
index f5c8c8d09a6..00000000000
--- a/addons/base_setup/todo.py
+++ /dev/null
@@ -1,178 +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 operator import itemgetter
-
-from osv import osv, fields
-import netsvc
-import tools
-
-class base_setup_company(osv.osv_memory):
-    """
-    """
-    _name = 'base.setup.company'
-    _inherit = 'res.config'
-    logger = netsvc.Logger()
-
-    def _get_all(self, cr, uid, model, context=None):
-        models = self.pool.get(model)
-        all_model_ids = models.search(cr, uid, [])
-
-        output = [(False, '')]
-        output.extend(
-            sorted([(o.id, o.name)
-                    for o in models.browse(cr, uid, all_model_ids,
-                                           context=context)],
-                   key=itemgetter(1)))
-        return output
-
-    def _get_all_states(self, cr, uid, context=None):
-        return self._get_all(
-            cr, uid, 'res.country.state', context=context)
-    def _get_all_countries(self, cr, uid, context=None):
-        return self._get_all(cr, uid, 'res.country', context=context)
-
-    def _show_company_data(self, cr, uid, context=None):
-        # We only want to show the default company data in demo mode, otherwise users tend to forget
-        # to fill in the real company data in their production databases
-        return self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'module_meta_information').demo
-
-
-    def default_get(self, cr, uid, fields_list=None, context=None):
-        """ get default company if any, and the various other fields
-        from the company's fields
-        """
-        defaults = super(base_setup_company, self)\
-              .default_get(cr, uid, fields_list=fields_list, context=context)
-        companies = self.pool.get('res.company')
-        company_id = companies.search(cr, uid, [], limit=1, order="id")
-        if not company_id or 'company_id' not in fields_list:
-            return defaults
-        company = companies.browse(cr, uid, company_id[0], context=context)
-        defaults['company_id'] = company.id
-
-        if not self._show_company_data(cr, uid, context=context):
-            return defaults
-
-        defaults['currency'] = company.currency_id.id
-        for field in ['name','logo','rml_header1','rml_footer1','rml_footer2']:
-            defaults[field] = company[field]
-
-        if company.partner_id.address:
-            address = company.partner_id.address[0]
-            for field in ['street','street2','zip','city','email','phone']:
-                defaults[field] = address[field]
-            for field in ['country_id','state_id']:
-                if address[field]:
-                    defaults[field] = address[field].id
-
-        return defaults
-
-    _columns = {
-        'company_id':fields.many2one('res.company', 'Company'),
-        'name':fields.char('Company Name', size=64, required=True),
-        'street':fields.char('Street', size=128),
-        'street2':fields.char('Street 2', size=128),
-        'zip':fields.char('Zip Code', size=24),
-        'city':fields.char('City', size=128),
-        'state_id':fields.selection(_get_all_states, 'Fed. State'),
-        'country_id':fields.selection(_get_all_countries, 'Country'),
-        'email':fields.char('E-mail', size=64),
-        'phone':fields.char('Phone', size=64),
-        'currency':fields.many2one('res.currency', 'Currency', required=True),
-        'rml_header1':fields.char('Report Header', size=200,
-            help='''This sentence will appear at the top right corner of your reports.
-We suggest you to put a slogan here:
-"Open Source Business Solutions".'''),
-        'rml_footer1':fields.char('Report Footer 1', size=200,
-            help='''This sentence will appear at the bottom of your reports.
-We suggest you to write legal sentences here:
-Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07'''),
-        'rml_footer2':fields.char('Report Footer 2', size=200,
-            help='''This sentence will appear at the bottom of your reports.
-We suggest you to put bank information here:
-IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''),
-        'logo':fields.binary('Logo'),
-        'account_no':fields.char('Bank Account No', size=64),
-        'website': fields.char('Company Website', size=64, help="Example: http://openerp.com"),
-    }
-
-    def execute(self, cr, uid, ids, context=None):
-        assert len(ids) == 1, "We should only get one object from the form"
-        payload = self.browse(cr, uid, ids[0], context=context)
-        if not getattr(payload, 'company_id', None):
-            raise ValueError('Case where no default main company is setup '
-                             'not handled yet')
-        company = payload.company_id
-        company.write({
-            'name':payload.name,
-            'rml_header1':payload.rml_header1,
-            'rml_footer1':payload.rml_footer1,
-            'rml_footer2':payload.rml_footer2,
-            'logo':payload.logo,
-            'currency_id':payload.currency.id,
-            'account_no':payload.account_no,
-        })
-
-        company.partner_id.write({
-            'name':payload.name,
-            'website':payload.website,
-        })
-
-        address_data = {
-            'name':payload.name,
-            'street':payload.street,
-            'street2':payload.street2,
-            'zip':payload.zip,
-            'city':payload.city,
-            'email':payload.email,
-            'phone':payload.phone,
-            'country_id':int(payload.country_id),
-            'state_id':int(payload.state_id),
-        }
-
-        if company.partner_id.address:
-            company.partner_id.address[0].write(
-                address_data)
-        else:
-            self.pool.get('res.partner.address').create(cr, uid,
-                    dict(address_data,
-                         partner_id=int(company.partner_id)),
-                    context=context)
-base_setup_company()
-
-class res_currency(osv.osv):
-    _inherit = 'res.currency'
-
-    def name_get(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-#        We can use the following line,if we want to restrict this name_get for company setup only
-#        But, its better to show currencies as name(Code).
-        if not len(ids):
-            return []
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        reads = self.read(cr, uid, ids, ['name','symbol'], context, load='_classic_write')
-        return [(x['id'], tools.ustr(x['name']) + (x['symbol'] and (' (' + tools.ustr(x['symbol']) + ')') or '')) for x in reads]
-
-res_currency()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/wizard/__init__.py b/addons/base_setup/wizard/__init__.py
new file mode 100644
index 00000000000..3c482efa976
--- /dev/null
+++ b/addons/base_setup/wizard/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import res_company_logo
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_setup/wizard/res_company_logo.py b/addons/base_setup/wizard/res_company_logo.py
new file mode 100644
index 00000000000..255b0e89408
--- /dev/null
+++ b/addons/base_setup/wizard/res_company_logo.py
@@ -0,0 +1,49 @@
+# -*- 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
+import tools
+from tools.translate import _
+
+
+class res_company_logo(osv.osv_memory):
+    _name = 'res.company.logo'
+    _inherit = 'res.config'
+    _columns = {
+        'logo' : fields.binary('Logo'),
+    }
+    _defaults={
+               'logo':lambda self,cr,uid,c: self.pool.get('res.company').browse(cr, uid, uid,c).logo,
+     }
+
+    def execute(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        user_comp = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
+        get_val = self.browse(cr, uid, ids)[0]
+        user_comp.write({'logo': get_val.logo}, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+    
+res_company_logo()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_setup/wizard/res_company_logo_view.xml b/addons/base_setup/wizard/res_company_logo_view.xml
new file mode 100644
index 00000000000..a21fd261dd8
--- /dev/null
+++ b/addons/base_setup/wizard/res_company_logo_view.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <record id="view_res_company_logo" model="ir.ui.view">
+            <field name="name">res.company.logo.form</field>
+            <field name="model">res.company.logo</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
+            <field name="arch" type="xml">
+            <data>
+                <form position="attributes">
+                     <attribute name="string">Upload Your Company Logo</attribute>
+                </form>
+                <xpath expr='//separator[@string="title"]' position='attributes'>
+                   <attribute name='string'> </attribute>
+                </xpath>
+                <xpath expr="//label[@string='description']"
+                      position="attributes">
+                      <attribute name="string">Upload your company logo in JPG or PNG with a format similar to 450*150 pixels </attribute>
+                </xpath>
+                <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                     <attribute name='string'> </attribute>
+                     <attribute name='rowspan'>12</attribute>
+                 </xpath>
+                 <xpath expr="//button[@string='Next']" position="replace">
+                      <button icon="gtk-ok" string="Upload" name="execute" type="object"/>
+                  </xpath>
+                 <group string="res_config_contents" position="replace">
+                    <group colspan="4">
+                        <field colspan="4" height="150" name="logo" widget="image" nolabel="1"/>
+                  </group>
+                </group>
+             </data>
+            </field>
+        </record>
+
+        <record id="action_res_company_logo" model="ir.actions.act_window">
+            <field name="name">Upload Your Company Logo</field>
+            <field name="res_model">res.company.logo</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_res_company_logo"/>
+            <field name="target">new</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/base_synchro/i18n/fi.po b/addons/base_synchro/i18n/fi.po
new file mode 100644
index 00000000000..3d6f0a35015
--- /dev/null
+++ b/addons/base_synchro/i18n/fi.po
@@ -0,0 +1,289 @@
+# Finnish 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-06-09 10:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
+msgid "Base Synchronization"
+msgstr "Pohjatietojen synkronointi"
+
+#. module: base_synchro
+#: field:base.synchro.server,server_db:0
+msgid "Server Database"
+msgstr "Palvelintietokanta"
+
+#. module: base_synchro
+#: view:base.synchro.server:0
+#: model:ir.model,name:base_synchro.model_base_synchro_server
+msgid "Synchronized server"
+msgstr "Synkronoitu palvelin"
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,name:0
+msgid "Field Name"
+msgstr "Kentän nimi"
+
+#. module: base_synchro
+#: field:base.synchro.obj,synchronize_date:0
+msgid "Latest Synchronization"
+msgstr "Viimeisin synkronointi"
+
+#. module: base_synchro
+#: field:base.synchro,user_id:0
+msgid "Send Result To"
+msgstr "Lähetä tulos"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_avoid
+msgid "Fields to not synchronize"
+msgstr "Kentät, joita ei synkronoida"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Close"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Transfer Data To Server"
+msgstr "Siirrä tiedot palvelimelle"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj
+msgid "Register Class"
+msgstr "Rekisteröi luokka"
+
+#. 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 "Synkronoidut objektit"
+
+#. module: base_synchro
+#: field:base.synchro.server,obj_ids:0
+msgid "Models"
+msgstr "Mallit"
+
+#. 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 "Objekti"
+
+#. module: base_synchro
+#: field:base.synchro.server,login:0
+msgid "User Name"
+msgstr "Käyttäjänimi"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: view:base.synchro.obj.line:0
+msgid "Group By"
+msgstr "Ryhmittelyn peruste"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Upload"
+msgstr "Lähetä palvelimelle"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Latest synchronization"
+msgstr "Viimeisin synkronointi"
+
+#. module: base_synchro
+#: model:ir.module.module,description:base_synchro.module_meta_information
+msgid "Synchronization with all objects."
+msgstr "Synkronoi kaikki objektit"
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,name:0
+msgid "Date"
+msgstr "Päivämäärä"
+
+#. module: base_synchro
+#: field:base.synchro.server,password:0
+msgid "Password"
+msgstr "Salasana"
+
+#. module: base_synchro
+#: field:base.synchro.obj,avoid_ids:0
+msgid "Fields Not Sync."
+msgstr "Ei synkronoidut kentät"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Both"
+msgstr "Molemmat"
+
+#. module: base_synchro
+#: field:base.synchro.obj,name:0
+msgid "Name"
+msgstr "Nimi"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Fields"
+msgstr "Kentät"
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+msgid "Transfered Ids Details"
+msgstr "Siirrettyjen tunnusten yksityiskohdat"
+
+#. module: base_synchro
+#: field:base.synchro.obj,action:0
+msgid "Synchronisation direction"
+msgstr "Synkronoinnin suunta"
+
+#. module: base_synchro
+#: field:base.synchro.obj,server_id:0
+msgid "Server"
+msgstr "Palvelin"
+
+#. 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 "Synkronoidut instanssit"
+
+#. module: base_synchro
+#: field:base.synchro.obj,active:0
+msgid "Active"
+msgstr "Aktiivinen"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: field:base.synchro.obj,model_id:0
+msgid "Object to synchronize"
+msgstr "Synkronoitava objekti"
+
+#. module: base_synchro
+#: model:ir.module.module,shortdesc:base_synchro.module_meta_information
+msgid "Base Synchro"
+msgstr "Perustietojen synkronointi"
+
+#. 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 "Synkronoitavat palvelimet"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Transfer Details"
+msgstr "Siirron tiedot"
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,remote_id:0
+msgid "Remote Id"
+msgstr "Etätunniste"
+
+#. module: base_synchro
+#: field:base.synchro.obj,line_id:0
+msgid "Ids Affected"
+msgstr "kohde id:t"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_63
+msgid "History"
+msgstr "Historia"
+
+#. 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 "Synkronointi"
+
+#. module: base_synchro
+#: field:base.synchro.obj,domain:0
+msgid "Domain"
+msgstr "Toimialue"
+
+#. 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 "Palvelimen nimi"
+
+#. module: base_synchro
+#: field:base.synchro.obj,sequence:0
+msgid "Sequence"
+msgstr "Sekvenssi"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid ""
+"The synchronisation has been started.You will receive a request when it's "
+"done."
+msgstr "Synkronointi on aloitettu. Saat pyynnön kun se on valmis."
+
+#. module: base_synchro
+#: field:base.synchro.server,server_port:0
+msgid "Server Port"
+msgstr "Palvelimen portti"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.menu_action_view_base_synchro
+msgid "Synchronize objects"
+msgstr "Synkronoi objektit"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Synchronization Complited!"
+msgstr "Synkronointi valmis!"
+
+#. 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 "Paikallinen id"
+
+#. 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 "Suotimet"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Download"
+msgstr "Lataa"
+
+#. module: base_synchro
+#: field:base.synchro,server_url:0
+#: field:base.synchro.server,server_url:0
+msgid "Server URL"
+msgstr "Palvelimen URL"
diff --git a/addons/base_synchro/i18n/vi.po b/addons/base_synchro/i18n/vi.po
new file mode 100644
index 00000000000..d7e4baa6385
--- /dev/null
+++ b/addons/base_synchro/i18n/vi.po
@@ -0,0 +1,289 @@
+# Vietnamese 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-07-06 04:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese <vi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-07-07 04:41+0000\n"
+"X-Generator: Launchpad (build 13168)\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_tools/i18n/zh_CN.po b/addons/base_tools/i18n/zh_CN.po
new file mode 100644
index 00000000000..4dd9285396e
--- /dev/null
+++ b/addons/base_tools/i18n/zh_CN.po
@@ -0,0 +1,32 @@
+# Chinese (Simplified) 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-06-29 01:21+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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-06-30 04:34+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: base_tools
+#: model:ir.module.module,shortdesc:base_tools.module_meta_information
+msgid "Common base for tools modules"
+msgstr "base_tools"
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
+"\n"
+"    "
diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/base_vat.py
index 69b312ee62f..6393c0a6182 100644
--- a/addons/base_vat/base_vat.py
+++ b/addons/base_vat/base_vat.py
@@ -23,6 +23,9 @@ import string
 
 from osv import osv, fields
 from tools.translate import _
+from tools.misc import ustr
+import re
+import datetime
 
 _ref_vat = {
     'be': 'BE0477472701', 'at': 'ATU12345675',
@@ -39,7 +42,7 @@ _ref_vat = {
     'pt': 'PT123456789', 'ro': 'RO1234567897',
     'se': 'SE123456789701', 'si': 'SI12345679',
     'sk': 'SK0012345675', 'el': 'EL12345670',
-    'mx': 'MXABC123456T1B'
+    'mx': 'MXABCD831230T1B',
 
             }
 
@@ -1072,17 +1075,36 @@ class res_partner(osv.osv):
                 return False
         return True
 
+    __check_vat_mx_re = re.compile(r"(?P<primeras>[A-Za-z\xd1\xf1&]{3,4})" \
+                                    r"[ \-_]?" \
+                                    r"(?P<ano>[0-9]{2})(?P<mes>[01][0-9])(?P<dia>[0-3][0-9])" \
+                                    r"[ \-_]?" \
+                                    r"(?P<code>[A-Za-z0-9&\xd1\xf1]{3})$")
+    
     def check_vat_mx(self, vat):
+        ''' Mexican VAT verification
+        
+        Verificar RFC México
         '''
-        Verificar RFC méxico
-        '''
-        if not 12 <= len(vat) <= 13:
+        # we convert to 8-bit encoding, to help the regex parse only bytes
+        vat = ustr(vat).encode('iso8859-1')
+        m = self.__check_vat_mx_re.match(vat)
+        if not m:
+            #No valid format
             return False
-        elif len(vat)==12 and not vat[:3].isalpha() | vat[3:9].isdigit() | vat[-3:].isalnum():
-            return False
-        elif len(vat)==13 and not vat[:4].isalpha() | vat[4:10].isdigit() | vat[-3:].isalnum():
+        try:
+            ano = int(m.group('ano'))
+            if ano > 30:
+                ano = 1900 + ano
+            else:
+                ano = 2000 + ano
+            datetime.date(ano, int(m.group('mes')), int(m.group('dia')))
+        except ValueError:
             return False
+        
+        #Valid format and valid date
         return True
+        
 res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_vat/i18n/sq.po b/addons/base_vat/i18n/sq.po
index 2d216b2f115..cc4a52b0999 100644
--- a/addons/base_vat/i18n/sq.po
+++ b/addons/base_vat/i18n/sq.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-08-02 14:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-07-06 17:28+0000\n"
+"Last-Translator: Arianit Kukaj <Unknown>\n"
 "Language-Team: Albanian <sq@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-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-07 04:41+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -24,6 +24,8 @@ msgid ""
 "The Vat does not seems to be correct. You should have entered something like "
 "this %s"
 msgstr ""
+"Vat nuk duket të jetë në rregull. Ti duhet të shtypesh diçka të ngjaishme si "
+"kjo %s"
 
 #. module: base_vat
 #: model:ir.module.module,description:base_vat.module_meta_information
@@ -65,7 +67,7 @@ msgstr ""
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
diff --git a/addons/base_vat/i18n/vi.po b/addons/base_vat/i18n/vi.po
index 0dbceb2ef86..19cae05fe2b 100644
--- a/addons/base_vat/i18n/vi.po
+++ b/addons/base_vat/i18n/vi.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-08-02 14:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-05-25 14:58+0000\n"
+"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-26 04:36+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -65,7 +65,7 @@ msgstr ""
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Đối tác"
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
diff --git a/addons/board/board.py b/addons/board/board.py
index 7de35fcc5f8..85f2cce7ef7 100644
--- a/addons/board/board.py
+++ b/addons/board/board.py
@@ -129,6 +129,7 @@ class board_board(osv.osv):
         if vids:
             view_id = vids[0]
             arch = self.pool.get('ir.ui.view.custom').browse(cr, user, view_id, context=context)
+            res['custom_view_id'] = view_id
             res['arch'] = arch.arch
         res['arch'] = self._arch_preprocessing(cr, user, res['arch'], context=context)
         res['toolbar'] = {'print': [], 'action': [], 'relate': []}
diff --git a/addons/board/i18n/vi.po b/addons/board/i18n/vi.po
index 8d5cacd08d1..de624c11309 100644
--- a/addons/board/i18n/vi.po
+++ b/addons/board/i18n/vi.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-16 17:34+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-05-25 15:06+0000\n"
+"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-26 04:36+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: board
 #: view:res.log.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Năm  "
 
 #. module: board
 #: model:ir.model,name:board.model_board_menu_create
@@ -32,13 +32,13 @@ msgstr ""
 #: field:board.note.type,name:0
 #: model:ir.model,name:board.model_board_note_type
 msgid "Note Type"
-msgstr ""
+msgstr "Loại Ghi chú"
 
 #. module: board
 #: view:board.note:0
 #: field:board.note,user_id:0
 msgid "Author"
-msgstr ""
+msgstr "Tác giả"
 
 #. module: board
 #: model:ir.module.module,shortdesc:board.module_meta_information
@@ -54,7 +54,7 @@ msgstr ""
 #: code:addons/board/wizard/board_menu_create.py:45
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Lỗi Người sử dụng!"
 
 #. module: board
 #: view:board.board:0
@@ -68,7 +68,7 @@ msgstr ""
 #: field:board.note,note:0
 #: model:ir.model,name:board.model_board_note
 msgid "Note"
-msgstr ""
+msgstr "Ghi chú"
 
 #. module: board
 #: view:board.note:0
@@ -102,7 +102,7 @@ msgstr ""
 #: view:res.log.report:0
 #: field:res.log.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Tháng"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.dashboard_open
@@ -130,12 +130,12 @@ msgstr ""
 #. module: board
 #: selection:res.log.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Tháng Ba"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Tháng Tám"
 
 #. module: board
 #: view:board.board:0
@@ -146,7 +146,7 @@ msgstr ""
 #. module: board
 #: field:res.log.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Ngày tạo"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_note_form
@@ -162,7 +162,7 @@ msgstr ""
 #. module: board
 #: selection:res.log.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Tháng Sáu"
 
 #. module: board
 #: field:board.note,type:0
@@ -183,23 +183,23 @@ msgstr ""
 #: view:board.note:0
 #: field:board.note,date:0
 msgid "Date"
-msgstr ""
+msgstr "Ngày"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Tháng Bảy"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Các bộ lọc Mở rộng..."
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Ngày"
 
 #. module: board
 #: view:board.menu.create:0
@@ -209,12 +209,12 @@ msgstr ""
 #. module: board
 #: selection:res.log.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Tháng Hai"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Tháng Mười"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
@@ -229,22 +229,22 @@ msgstr ""
 #. module: board
 #: view:res.log.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Tháng-1    "
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Tháng Giêng"
 
 #. module: board
 #: view:board.note:0
 msgid "Notes"
-msgstr ""
+msgstr "Các ghi chú"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Tháng Mười Một"
 
 #. module: board
 #: help:board.board.line,sequence:0
@@ -256,7 +256,7 @@ msgstr ""
 #. module: board
 #: selection:res.log.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Tháng Tư"
 
 #. module: board
 #: view:board.board:0
@@ -265,7 +265,7 @@ msgstr ""
 #: model:ir.ui.menu,name:board.admin_menu_dasboard
 #: model:ir.ui.menu,name:board.menu_dasboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Bảng điều khiển"
 
 #. module: board
 #: model:ir.module.module,description:board.module_meta_information
@@ -275,22 +275,22 @@ msgstr ""
 #. module: board
 #: field:board.board.line,action_id:0
 msgid "Action"
-msgstr ""
+msgstr "Hành động"
 
 #. module: board
 #: field:board.board.line,position:0
 msgid "Position"
-msgstr ""
+msgstr "Chức vụ"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Model"
-msgstr ""
+msgstr "Mô hình"
 
 #. module: board
 #: field:board.menu.create,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "Tên trình đơn"
 
 #. module: board
 #: view:board.board:0
@@ -301,7 +301,7 @@ msgstr ""
 #. module: board
 #: selection:board.board.line,position:0
 msgid "Left"
-msgstr ""
+msgstr "Trái"
 
 #. module: board
 #: field:board.board,view_id:0
@@ -311,43 +311,43 @@ msgstr ""
 #. module: board
 #: selection:board.board.line,position:0
 msgid "Right"
-msgstr ""
+msgstr "Phải"
 
 #. module: board
 #: field:board.board.line,width:0
 msgid "Width"
-msgstr ""
+msgstr "Chiều rộng"
 
 #. module: board
 #: view:res.log.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Tháng   "
 
 #. module: board
 #: field:board.board.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Trình tự"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Tháng Chín"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Tháng Mười Hai"
 
 #. module: board
 #: view:board.board:0
 #: view:board.menu.create:0
 msgid "Create Menu"
-msgstr ""
+msgstr "Tạo trình đơn"
 
 #. module: board
 #: field:board.board.line,height:0
 msgid "Height"
-msgstr ""
+msgstr "Chiều cao"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_menu_create
diff --git a/addons/caldav/i18n/fi.po b/addons/caldav/i18n/fi.po
new file mode 100644
index 00000000000..445d25ee8c1
--- /dev/null
+++ b/addons/caldav/i18n/fi.po
@@ -0,0 +1,818 @@
+# Finnish 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-06-28 09:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-29 04:43+0000\n"
+"X-Generator: Launchpad (build 13168)\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 "Tiedostonnimi"
+
+#. 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 "Osallistuja"
+
+#. 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 "Varoitus !"
+
+#. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr "Objekti"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Todo"
+msgstr "Tehtävät"
+
+#. 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 "Palvelut"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Expression as constant"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Evolution"
+msgstr "Evoluutio"
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "Ok"
+msgstr "OK"
+
+#. 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 "Tiedostonimi"
+
+#. module: caldav
+#: field:caldav.browse,url:0
+msgid "Caldav Server"
+msgstr "Caldav palvelin"
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Error!"
+msgstr "Virhe!"
+
+#. 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 "Tehtävät"
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr "Käytä kenttää"
+
+#. 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 "Kalenteririvit"
+
+#. 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 "Virhe! Et voi luoda rekursiivisia kansioita."
+
+#. 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 "Tyyppi"
+
+#. 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 "Virhe !"
+
+#. 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 "Luontipäivä"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Attributes Mapping"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_document_directory
+msgid "Directory"
+msgstr "Hakemisto"
+
+#. 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 "Toimialue"
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "_Subscribe"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,user_id:0
+msgid "Owner"
+msgstr "Omistaja"
+
+#. 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 "kalenteri"
+
+#. 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 "Virheellinen ics formaatti, tiedostoa ei voi tuoda"
+
+#. 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 "Viesti..."
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Other"
+msgstr "Muu"
+
+#. 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 "Kalenterit"
+
+#. module: caldav
+#: field:basic.calendar,collection_id:0
+msgid "Collection"
+msgstr "Kokoelma"
+
+#. 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 "Hakemiston nimen tulee olla uniikki !"
+
+#. 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 "Lauseke"
+
+#. 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 "Kenttien kartoitukset"
+
+#. 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 "Muu tieto"
+
+#. module: caldav
+#: field:user.preference,device:0
+msgid "Software/Devices"
+msgstr "Ohjelmisto/Laitteet"
+
+#. 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 "Toiminto"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,description:0
+#: view:caldav.browse:0
+#: field:caldav.browse,description:0
+msgid "Description"
+msgstr "Kuvaus"
+
+#. 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 "Mäppäys"
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:86
+#, python-format
+msgid "Import Sucessful"
+msgstr "Tuonti onnistui"
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "_Import"
+msgstr "_Tuo"
+
+#. 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 "Väli tuntia"
+
+#. 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 "Nimi"
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Alarm"
+msgstr "Hälytys"
+
+#. 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 "Järjestys"
+
+#. module: caldav
+#: model:ir.module.module,shortdesc:caldav.module_meta_information
+msgid "Share Calendar using CalDAV"
+msgstr "Jaa kalenteri käyttäen CalDAV:ia"
+
+#. module: caldav
+#: field:basic.calendar,calendar_color:0
+msgid "Color"
+msgstr "Väri"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "MY"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_fields
+msgid "Calendar fields"
+msgstr "Kalenterikentät"
+
+#. 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 "Tilaa"
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr "Hakemistolla täytyy olla ylätason hakemisto tai tietovarasto"
+
+#. 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/tr.po b/addons/caldav/i18n/tr.po
new file mode 100644
index 00000000000..54e72a958c6
--- /dev/null
+++ b/addons/caldav/i18n/tr.po
@@ -0,0 +1,818 @@
+# Turkish 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-06-20 20:57+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"Language-Team: Turkish <tr@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-06-21 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Value Mapping"
+msgstr "Değer Eşleme"
+
+#. module: caldav
+#: help:caldav.browse,url:0
+msgid "Url of the caldav server, use for synchronization"
+msgstr "Caldav sunucusu url si, senkronize etmek için kullanın"
+
+#. module: caldav
+#: field:basic.calendar.alias,name:0
+msgid "Filename"
+msgstr "Dosya ismi"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_export
+msgid "Event Export"
+msgstr "Olay Dışaaktarımı"
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Provide path for Remote Calendar"
+msgstr "Uzaktan Takvim yolunu belirt"
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
+msgid "Import .ics File"
+msgstr ".ics Dosyası İçe aktar"
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr "_Kapat"
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Attendee"
+msgstr "Katılımcı"
+
+#. module: caldav
+#: sql_constraint:basic.calendar.fields:0
+msgid "Can not map a field more than once"
+msgstr "Birden çok alan eşleştirilemiyor"
+
+#. 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 "Uyarı!"
+
+#. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr "Nesne"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Todo"
+msgstr "Yapılacaklar"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_user_preference
+msgid "User preference Form"
+msgstr "Kullanıcı tercih Formu"
+
+#. module: caldav
+#: field:user.preference,service:0
+msgid "Services"
+msgstr "Hizmetler"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Expression as constant"
+msgstr "Sabit İfade"
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Evolution"
+msgstr "Evrim"
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "Ok"
+msgstr "Tamam"
+
+#. 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 "Dosya adı"
+
+#. module: caldav
+#: field:caldav.browse,url:0
+msgid "Caldav Server"
+msgstr "Caldav Sunucusu"
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Error!"
+msgstr "Hata!"
+
+#. module: caldav
+#: help:caldav.browse,caldav_doc_file:0
+msgid "download full caldav Documentation."
+msgstr "Tam calsav Belgesi indir"
+
+#. 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 "YAPILACAK"
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr "ICS Dışaaktar"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr "Alanı Kullan"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:787
+#, python-format
+msgid "Can not create line \"%s\" more than once"
+msgstr "\"%s\" Satırı birden çok oluşturulamıyor"
+
+#. 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 "Takvim Satırları"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_subscribe
+msgid "Event subscribe"
+msgstr "Olay aboneliği"
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import ICS"
+msgstr "ICS içeaktar"
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+#: view:user.preference:0
+msgid "_Cancel"
+msgstr "_Vazgeç"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_event
+msgid "basic.calendar.event"
+msgstr "temel.Etkinlik.olay"
+
+#. 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 "Etkinlik"
+
+#. 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/zh_CN.po b/addons/caldav/i18n/zh_CN.po
new file mode 100644
index 00000000000..8cdf821ca45
--- /dev/null
+++ b/addons/caldav/i18n/zh_CN.po
@@ -0,0 +1,818 @@
+# Chinese (Simplified) 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-07-04 10:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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-07-05 04:33+0000\n"
+"X-Generator: Launchpad (build 13168)\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 "caldav服务器网址，用于同步"
+
+#. 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 "导入 .ics 文件"
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr "关闭(_C)："
+
+#. 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 "在日程表明细中请为 \"%s\" 进行合适的设置"
+
+#. 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/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py
index 9e67f972216..f6ecc5dccd5 100644
--- a/addons/caldav/wizard/caldav_browse.py
+++ b/addons/caldav/wizard/caldav_browse.py
@@ -26,9 +26,8 @@ import addons
 from tools.translate import _
 
 class caldav_browse(osv.osv_memory):
-    
+
     __doc = {
-    
     'other' : _("""
   * Webdav server that provides remote access to calendar
   * Synchronisation of calendar using WebDAV
@@ -45,11 +44,8 @@ class caldav_browse(osv.osv_memory):
         HOSTNAME: Host on which OpenERP server(With webdav) is running
         PORT : Port on which OpenERP server is running (By Default : 8069)
         DATABASE_NAME: Name of database on which OpenERP Calendar is created
-        CALENDAR_NAME: Name of calendar to access
      """),
-     
-     
-     
+
      'iphone' : _("""
     For SSL specific configuration see the documentation below
 
@@ -60,7 +56,7 @@ Now, to setup the calendars, you need to:
 3. Click on "Other"
 4. From the "Calendars" group, select "Add CalDAV Account"
 
-5. Enter the host's name 
+5. Enter the host's name
    (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , openerp.com is the host)
 
 6. Fill Username and password with your openerp login and password
@@ -71,8 +67,8 @@ Now, to setup the calendars, you need to:
 9. If you are not using a SSL server, you'll get an error, do not worry and push "Continue"
 
 10. Then click to "Advanced Settings" to specify the right
-    ports and paths. 
-    
+    ports and paths.
+
 11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.
 
 12. Set the "Account URL" to the right path of the OpenERP webdav:
@@ -87,8 +83,6 @@ Now, to setup the calendars, you need to:
     Note that when creating a new calendar entry, you will have to specify
     which calendar it should be saved at.
 
-
-
 IF you need SSL (and your certificate is not a verified one, as usual),
 then you first will need to let the iPhone trust that. Follow these
 steps:
@@ -99,13 +93,13 @@ steps:
       is the default 8071)
     s2. Safari will try to connect and issue a warning about the certificate
       used. Inspect the certificate and click "Accept" so that iPhone
-      now trusts it.   
+      now trusts it.
     """),
     'android' : _("""
 Prerequire
 ----------
 There is no buit-in way to synchronize calendar with caldav.
-So you need to install a third part software : Calendar (CalDav) 
+So you need to install a third part software : Calendar (CalDav)
 for now it's the only one
 
 configuration
@@ -114,7 +108,7 @@ configuration
 1. Open Calendar Sync
    I'll get an interface with 2 tabs
    Stay on the first one
-   
+
 2. CaDAV Calendar URL : put the URL given above (ie : http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)
 
 3. Put your openerp username and password
@@ -122,7 +116,7 @@ configuration
 4. If your server don't use SSL, you'll get a warnign, say "Yes"
 
 5. Then you can synchronize manually or custom the settings to synchronize every x minutes.
-    
+
     """),
     
      'evolution' : _("""
@@ -130,7 +124,7 @@ configuration
 
     2. File -> New -> Calendar
 
-    3. Fill the form 
+    3. Fill the form
         - type : CalDav
         - name : Whaterver you want (ie : Meeting)
         - 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
@@ -140,10 +134,9 @@ configuration
 
     4. Click ok and give your openerp password
 
-    5. A new calendar named with the name you gave should appear on the left side.     
+    5. A new calendar named with the name you gave should appear on the left side.
      """),
-     
-     
+
      'thunderbird' : _("""
 Prerequire
 ----------
@@ -161,7 +154,7 @@ configuration
 
 4. for format choose CalDav
    and as location the url given above (ie : http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)
-   
+
 5. Choose a name and a color for the Calendar, and we advice you to uncheck "alarm"
 
 6. Then put your openerp login and password (to give the password only check the box "Use password Manager to remember this password"
@@ -169,8 +162,6 @@ configuration
 7. Then Finish, your meetings should appear now in your calendar view
 """),
     }
-    
-    
     _name = 'caldav.browse'
     _description = 'Caldav Browse'
 
@@ -181,55 +172,48 @@ configuration
     }
 
     def default_get(self, cr, uid, fields, context=None):
+        pref_obj = self.pool.get('user.preference')
+        pref_ids = pref_obj.browse(cr, uid ,context.get('rec_id',False), context=context)
         res = {}
-        host = ''
+        host = context.get('host')
         port = ''
-        prefix = 'http://'  
+        prefix = 'http://'
         if not config.get('xmlrpc'):
             if not config.get('netrpc'):
-                prefix = 'https://' 
-                host = config.get('xmlrpcs_interface', None)
+                prefix = 'https://'
                 port = config.get('xmlrpcs_port', 8071)
             else:
-                host = config.get('netrpc_interface', None)
-                port = config.get('netrpc_port',8070) 
-        else: 
-            host = config.get('xmlrpc_interface', None)
+                port = config.get('netrpc_port',8070)
+        else:
             port = config.get('xmlrpc_port',8069)
-        if host ==  '' or None:
-                host = 'localhost'
-                port = 8069
         if not config.get_misc('webdav','enable',True):
             raise Exception("WebDAV is disabled, cannot continue")
         user_pool = self.pool.get('res.users')
         current_user = user_pool.browse(cr, uid, uid, context=context)
-        pref_obj = self.pool.get('user.preference')
-        pref_ids = pref_obj.browse(cr, uid ,context.get('rec_id',False), context=context)
         #TODO write documentation
         res['description'] = self.__doc['other']
         if pref_ids:
-            pref_ids = pref_ids[0] 
+            pref_ids = pref_ids[0]
             if pref_ids.device == 'iphone':
                 url = host + ':' + str(port) + '/'+ pref_ids.service + '/' + cr.dbname + '/'+'calendars/'
             else :
                 url = host + ':' + str(port) + '/'+ pref_ids.service + '/' + cr.dbname + '/'+'calendars/'+ 'users/'+ current_user.login + '/'+ pref_ids.collection.name+ '/'+ pref_ids.calendar.name
-            
+
             res['description'] = self.__doc.get(pref_ids.device , self.__doc['other'])
         file = open(addons.get_module_resource('caldav','doc', 'caldav_doc.pdf'),'rb')
         res['caldav_doc_file'] = base64.encodestring(file.read())
-        
+
         #res['doc_link'] = 'http://doc.openerp.com/'
         res['url'] = prefix+url
         return res
 
     def browse_caldav(self, cr, uid, ids, context):
-
         return {}
 
 caldav_browse()
 
 class user_preference(osv.osv_memory):
-    
+
     _name = 'user.preference'
     _description = 'User preference Form'
 
@@ -238,32 +222,39 @@ class user_preference(osv.osv_memory):
                'calendar' :fields.many2one('basic.calendar', 'Calendar', required=True),
                'service': fields.selection([('webdav','CalDAV')], "Services"),
                'device' : fields.selection([('other', 'Other'), ('iphone', 'iPhone'), ('android', 'Android based device'),('thunderbird', 'Sunbird/Thunderbird'), ('evolution','Evolution')], "Software/Devices"),
+               'host_name': fields.char('Host Name', size=64, required=True),
     }
-    
+
     def _get_default_calendar(self, cr, uid, context):
         if context == None:
             context = {}
         name = context.get('cal_name')
-        
         collection_obj = self.pool.get('basic.calendar')
         ids = collection_obj.search(cr, uid, [('name', '=', name)])
         return ids[0]
-       
-        
+
     def _get_default_collection(self, cr, uid, context):
         collection_obj = self.pool.get('document.directory')
         ids = collection_obj.search(cr, uid, [('name', '=', 'c')])
         return ids[0]
     
-        
+    def _get_default_host(self, cr, uid, context):
+        ids=self.search(cr,uid,[])
+        host_name = ''
+        if ids:
+            ids = len(ids)> 1 and len(ids)-1 or ids[0] # Use len(ids)-1 for taking the value of last id 
+            host_name = self.browse(cr, uid,[ids],context=context)[0].host_name
+        return host_name
+
     _defaults={
               'service': 'webdav',
               'collection' : _get_default_collection,
               'calendar' : _get_default_calendar,
               'device' : 'other',
-              
-    }    
-   
+              'host_name':_get_default_host
+
+    }
+
     def open_window(self, cr, uid, ids, context=None):
         obj_model = self.pool.get('ir.model.data')
         model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','caldav_Browse')])
@@ -278,6 +269,22 @@ class user_preference(osv.osv_memory):
             'target': 'new',
             'context': context,
         }
-    
-    
+
+    def next_window(self, cr, uid, ids, context=None):
+        obj_model = self.pool.get('ir.model.data')
+        host_name  = self.browse (cr,uid,ids)[0].host_name
+        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','user_prefernce_form')])
+        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])
+        context.update({'res_id': ids,'host':host_name})
+        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'user.preference',
+            'views': [(resource_id,'form')],
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context': context,
+        }
+
 user_preference()
diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 53af6029883..565e3a44407 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -11,19 +11,39 @@
                     <group colspan="4" width="700" height="500">
                         <separator string="Browse caldav" colspan="4"/>
                         <field name="url" colspan="4" />
-                        
                         <separator string="Description" colspan="4"/>
                         <field name="description"  colspan="4"  nolabel="1"/>
                         <separator colspan="4"/>
-                      <group col="4" colspan="4">
-                        <label string="" colspan="2"/>
-                        <button special="cancel" string="_Close" icon="gtk-close"/>
-                      </group>
+                        <group col="4" colspan="4">
+                            <label string="" colspan="2"/>
+                            <button special="cancel" string="_Close" icon="gtk-close"/>
+                        </group>
                     </group>
                 </form>
             </field>
         </record>
 
+        <record id="host_prefernce_form" model="ir.ui.view">
+            <field name="name">host_preference</field>
+           <field name="model">user.preference</field>
+           <field name="type">form</field>
+            <field name="arch" type="xml">
+               <form string="Caldav's host name configuration">
+                	<label string="Configure your openerp hostname. For example : " colspan="4"></label>
+                    <newline/>
+                    <label string="database.my.openerp.com  or companyserver.com" colspan="4"/>
+                    <newline/>
+                    <separator colspan="4"/>
+                    <field name="host_name"  colspan="4" width="250" />
+                    <separator colspan="4"/>
+                    <group col="4" colspan="4">
+                       <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                       <button name="next_window" string="Next" type="object" icon="gtk-go-forward"/>
+                    </group>
+               </form>
+            </field>
+        </record>
+
      <record id="user_prefernce_form" model="ir.ui.view">
             <field name="name">user_preference</field>
             <field name="model">user.preference</field>
diff --git a/addons/claim_from_delivery/i18n/fi.po b/addons/claim_from_delivery/i18n/fi.po
new file mode 100644
index 00000000000..84fd929478a
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/fi.po
@@ -0,0 +1,33 @@
+# Finnish 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-06-20 10:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-21 04:36+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr "Reklamaatio"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,description:claim_from_delivery.module_meta_information
+msgid "Create Claim from delivery order:\n"
+msgstr "Luo reklamaatio toimitustilaukselta:\n"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
+msgid "Claim from delivery"
+msgstr "Reklamaatio toimitukselta"
diff --git a/addons/claim_from_delivery/i18n/zh_CN.po b/addons/claim_from_delivery/i18n/zh_CN.po
new file mode 100644
index 00000000000..9d6c10ac3bf
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/zh_CN.po
@@ -0,0 +1,33 @@
+# Chinese (Simplified) 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-07-04 05:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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-07-05 04:33+0000\n"
+"X-Generator: Launchpad (build 13168)\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 "创建送货单索赔：\n"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
+msgid "Claim from delivery"
+msgstr "送货单索赔"
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 903bf5f0b68..1d0ece2dce1 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -129,6 +129,7 @@ Creates a dashboard for CRM that includes:
             'test/test_crm_phonecall.yml',
             'test/test_crm_recurrent_meeting.yml',
             'test/test_crm_stage_changes.yml',
+            'test/test_crm_recurrent_meeting_case2.yml',
              ],
     'installable': True,
     'active': False,
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index d7b67879a7a..0b1e8db7bbb 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -44,8 +44,177 @@ AVAILABLE_PRIORITIES = [
     ('5', 'Lowest'),
 ]
 
-class crm_case(object):
-    """A simple python class to be used for common functions """
+class crm_base(object):
+    """
+        Base classe for crm object,
+        Object that inherit from this class should have
+            date_open
+            date_closed
+            user_id
+            partner_id
+            partner_address_id
+        as field to be compatible with this class
+        
+    """
+    def _get_default_partner_address(self, cr, uid, context=None):
+
+        """Gives id of default address for current user
+        :param context: if portal in context is false return false anyway
+        """
+        if context is None:
+            context = {}
+        if not context.get('portal'):
+            return False
+        return self.pool.get('res.users').browse(cr, uid, uid, context).address_id.id
+
+    def _get_default_partner(self, cr, uid, context=None):
+        """Gives id of partner for current user
+        :param context: if portal in context is false return false anyway
+        """
+        if context is None:
+            context = {}
+        if not context.get('portal', False):
+            return False
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if not user.address_id:
+            return False
+        return user.address_id.partner_id.id
+    
+    def _get_default_email(self, cr, uid, context=None):
+        """Gives default email address for current user
+        :param context: if portal in context is false return false anyway
+        """
+        if not context.get('portal', False):
+            return False
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if not user.address_id:
+            return False
+        return user.address_id.email
+    
+    def _get_default_user(self, cr, uid, context=None):
+        """Gives current user id
+       :param context: if portal in context is false return false anyway
+        """
+        if context and context.get('portal', False):
+            return False
+        return uid
+
+    def _get_section(self, cr, uid, context=None):
+        """Gives section id for current User
+        """
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        return user.context_section_id.id or False
+    
+    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
+        """This function returns value of partner email based on Partner Address
+        @param ids: List of case IDs
+        @param add: Id of Partner's address
+        @email: Partner's email ID
+        """
+        if not add:
+            return {'value': {'email_from': False}}
+        address = self.pool.get('res.partner.address').browse(cr, uid, add)
+        if address.email:
+            return {'value': {'email_from': address.email, 'phone': address.phone}}
+        else:
+            return {'value': {'phone': address.phone}}
+        
+    def onchange_partner_id(self, cr, uid, ids, part, email=False):
+        """This function returns value of partner address based on partner
+        @param ids: List of case IDs
+        @param part: Partner's id
+        @email: Partner's email ID
+        """
+        data={}
+        if  part:
+            addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
+            data = {'partner_address_id': addr['contact']}
+            data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
+        return {'value': data}
+    
+    
+    def case_open(self, cr, uid, ids, *args):
+        """Opens Case
+        @param ids: List of case Ids
+        """
+        cases = self.browse(cr, uid, ids)
+        for case in cases:
+            data = {'state': 'open', 'active': True}
+            if not case.user_id:
+                data['user_id'] = uid
+            self.write(cr, uid, case.id, data)
+
+
+        self._action(cr, uid, cases, 'open')
+        return True
+
+    def case_close(self, cr, uid, ids, *args):
+        """Closes Case
+        @param ids: List of case Ids
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self.write(cr, uid, ids, {'state': 'done',
+                                  'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'),
+                                  })
+        #
+        # We use the cache of cases to keep the old case state
+        #
+        self._action(cr, uid, cases, 'done')
+        return True
+
+    def case_cancel(self, cr, uid, ids, *args):
+        """Cancels Case
+        @param ids: List of case Ids
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self.write(cr, uid, ids, {'state': 'cancel',
+                                  'active': True})
+        self._action(cr, uid, cases, 'cancel')
+        for case in cases:
+            message = _("The case '%s' has been cancelled.") % (case.name,)
+            self.log(cr, uid, case.id, message)
+        return True
+
+    def case_pending(self, cr, uid, ids, *args):
+        """Marks case as pending
+        @param ids: List of case Ids
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self.write(cr, uid, ids, {'state': 'pending', 'active': True})
+        self._action(cr, uid, cases, 'pending')
+        return True
+
+    def case_reset(self, cr, uid, ids, *args):
+        """Resets case as draft
+        @param ids: List of case Ids
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self.write(cr, uid, ids, {'state': 'draft', 'active': True})
+        self._action(cr, uid, cases, 'draft')
+        return True
+    
+    def _action(self, cr, uid, cases, state_to, scrit=None, context=None):
+        if context is None:
+            context = {}
+        context['state_to'] = state_to
+        rule_obj = self.pool.get('base.action.rule')
+        model_obj = self.pool.get('ir.model')
+        model_ids = model_obj.search(cr, uid, [('model','=',self._name)])
+        rule_ids = rule_obj.search(cr, uid, [('model_id','=',model_ids[0])])
+        return rule_obj._action(cr, uid, rule_ids, cases, scrit=scrit, context=context)
+
+class crm_case(crm_base):
+    """
+        A simple python class to be used for common functions 
+        Object that inherit from this class should inherit from mailgate.thread
+        And need a stage_id field
+        
+        And object that inherit (orm inheritance) from a class the overwrite copy 
+    """
 
     def _find_lost_stage(self, cr, uid, type, section_id):
         return self._find_percent_stage(cr, uid, 0.0, type, section_id)
@@ -105,35 +274,7 @@ class crm_case(object):
             return {'value':{}}
         return {'value':{'probability': stage.probability}}
 
-    def _get_default_partner_address(self, cr, uid, context=None):
-
-        """Gives id of default address for current user
-        @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 context: A standard dictionary for contextual values
-        """
-        if context is None:
-            context = {}
-        if not context.get('portal', False):
-            return False
-        return self.pool.get('res.users').browse(cr, uid, uid, context).address_id.id
-
-    def _get_default_partner(self, cr, uid, context=None):
-        """Gives id of partner for current user
-        @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 context: A standard dictionary for contextual values
-        """
-        if context is None:
-            context = {}
-        if not context.get('portal', False):
-            return False
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        if not user.address_id:
-            return False
-        return user.address_id.partner_id.id
+    
 
     def copy(self, cr, uid, id, default=None, context=None):
         """
@@ -145,6 +286,7 @@ class crm_case(object):
         @param default: Dictionary of default values for copy.
         @param context: A standard dictionary for contextual values
         """
+        
         if context is None:
             context = {}
         if default is None:
@@ -164,40 +306,9 @@ class crm_case(object):
                 })
         return super(osv.osv, self).copy(cr, uid, id, default, context=context)
 
-    def _get_default_email(self, cr, uid, context=None):
-        """Gives default email address for current user
-        @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 context: A standard dictionary for contextual values
-        """
-        if not context.get('portal', False):
-            return False
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        if not user.address_id:
-            return False
-        return user.address_id.email
+    
 
-    def _get_default_user(self, cr, uid, context=None):
-        """Gives current user id
-        @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 context: A standard dictionary for contextual values
-        """
-        if context and context.get('portal', False):
-            return False
-        return uid
-
-    def _get_section(self, cr, uid, context=None):
-        """Gives section id for current User
-        @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 context: A standard dictionary for contextual values
-        """
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        return user.context_section_id.id or False
+    
 
     def _find_next_stage(self, cr, uid, stage_list, index, current_seq, stage_pool, context=None):
         if index + 1 == len(stage_list):
@@ -274,38 +385,9 @@ class crm_case(object):
         @param context: A standard dictionary for contextual values"""
         return self.stage_change(cr, uid, ids, context=context, order='sequence desc')
 
-    def onchange_partner_id(self, cr, uid, ids, part, email=False):
-        """This function returns value of partner address based on partner
-        @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 IDs
-        @param part: Partner's id
-        @email: Partner's email ID
-        """
-        data={}
-        if  part:
-            addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
-            data = {'partner_address_id': addr['contact']}
-            data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
-        return {'value': data}
+    
 
-    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
-        """This function returns value of partner email based on Partner Address
-        @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 IDs
-        @param add: Id of Partner's address
-        @email: Partner's email ID
-        """
-        if not add:
-            return {'value': {'email_from': False}}
-        address = self.pool.get('res.partner.address').browse(cr, uid, add)
-        if address.email:
-            return {'value': {'email_from': address.email, 'phone': address.phone}}
-        else:
-            return {'value': {'phone': address.phone}}
+    
 
     def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
         mailgate_pool = self.pool.get('mailgate.thread')
@@ -331,8 +413,6 @@ class crm_case(object):
             if not case.user_id:
                 data['user_id'] = uid
             self.write(cr, uid, case.id, data)
-
-
         self._action(cr, uid, cases, 'open')
         return True
 
@@ -423,11 +503,14 @@ class crm_case(object):
         @param ids: List of case Ids
         @param *args: Tuple Value for additional Params
         """
+        state = 'draft' 
+        if 'crm.phonecall' in args:
+            state = 'open' 
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
         self._history(cr, uid, cases, _('Draft'))
-        self.write(cr, uid, ids, {'state': 'draft', 'active': True})
-        self._action(cr, uid, cases, 'draft')
+        self.write(cr, uid, ids, {'state': state, 'active': True})
+        self._action(cr, uid, cases, state)
         return True
 
     def remind_partner(self, cr, uid, ids, context=None, attach=False):
@@ -454,9 +537,9 @@ class crm_case(object):
         """
         for case in self.browse(cr, uid, ids, context=context):
             if not destination and not case.email_from:
-                raise osv.except_osv(_('Error!'), ("Partner Email is not specified in Case"))
+                return False
             if not case.user_id.user_email:
-               raise osv.except_osv(_('Error!'), ("User Email is not specified in Case"))
+                return False
             
             if destination and case.section_id.user_id:
                 case_email = case.section_id.user_id.user_email
@@ -521,15 +604,7 @@ class crm_case(object):
         cases = self.browse(cr, uid, ids2, context=context)
         return self._action(cr, uid, cases, False, context=context)
 
-    def _action(self, cr, uid, cases, state_to, scrit=None, context=None):
-        if context is None:
-            context = {}
-        context['state_to'] = state_to
-        rule_obj = self.pool.get('base.action.rule')
-        model_obj = self.pool.get('ir.model')
-        model_ids = model_obj.search(cr, uid, [('model','=',self._name)])
-        rule_ids = rule_obj.search(cr, uid, [('model_id','=',model_ids[0])])
-        return rule_obj._action(cr, uid, rule_ids, cases, scrit=scrit, context=context)
+    
 
     def format_body(self, body):
         return self.pool.get('base.action.rule').format_body(body)
@@ -607,7 +682,7 @@ class crm_case_section(osv.osv):
 
     _columns = {
         'name': fields.char('Sales Team', size=64, required=True, translate=True),
-        'complete_name': fields.function(get_full_name, method=True, type='char', size=256, readonly=True, store=True),
+        'complete_name': fields.function(get_full_name, type='char', size=256, readonly=True, store=True),
         'code': fields.char('Code', size=8),
         'active': fields.boolean('Active', help="If the active field is set to "\
                         "true, it will allow you to hide the sales team without removing it."),
diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
index 32551d438c4..1ca212d0525 100644
--- a/addons/crm/crm_installer.py
+++ b/addons/crm/crm_installer.py
@@ -23,20 +23,20 @@ from lxml import etree
 from osv import fields, osv
 
 class crm_installer(osv.osv_memory):
-    _name = 'crm.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         'name': fields.char('Name', size=64),
         'crm_helpdesk': fields.boolean('Helpdesk', help="Manages a Helpdesk service."),
         'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fundraising process and tracking."),
         'crm_claim': fields.boolean('Claims', help="Manages the suppliers and customers claims, including your corrective or preventive actions."),
-        'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
+        'crm_caldav': fields.boolean('Synchronization: Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
         'sale_crm': fields.boolean('Opportunity to Quotation', help="This module relates sale from opportunity cases in the CRM."),
-        'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."),
-        'thunderbird': fields.boolean('Thunderbird', help="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."),
-        'outlook': fields.boolean('MS-Outlook', help="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."),
+        'fetchmail': fields.boolean('Synchronization: Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."),
+        'thunderbird': fields.boolean('Plug-In: Thunderbird', help="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."),
+        'outlook': fields.boolean('Plug-In: MS-Outlook', help="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."),
         'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."),
+        'import_google': fields.boolean('Google Import', help="Imports contacts and events from your google account."),
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 35ff5a0a7cc..e5566e2f7b0 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -2,67 +2,63 @@
   <data>
     <record id="view_crm_installer" model="ir.ui.view">
       <field name="name">crm.installer.view</field>
-      <field name="model">crm.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes">
-            <attribute name="string">CRM Application Configuration</attribute>
-          </form>
-
-          <separator string="title" position="attributes">
-            <attribute name="string">Configure Your CRM Application</attribute>
-          </separator>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">Enhance your core CRM Application with additional functionalities.</attribute>
+          <xpath expr="//group[@name='crm']" position="replace">
+            <newline/>
+            <separator  string="Customer Relationship Management Features" colspan="4" />
+            <field name="crm_claim" groups="base.group_extended" />
+            <field name="crm_helpdesk" groups="base.group_extended" />
+            <field name="crm_fundraising" groups="base.group_extended" />
+            <field name="wiki_sale_faq" groups="base.group_extended" />
+            <field name="sale_crm" invisible="1" groups="base.group_extended" />
+            <field name="crm_caldav" />
+            <field name="fetchmail" />
+            <field name="thunderbird" />
+            <field name="outlook" />
           </xpath>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-              <attribute name='rowspan'>13</attribute>
-              <attribute name='string'></attribute>
-          </xpath>
-          <xpath expr="//button[@string='Install Modules']" position="attributes">
-            <attribute name="string">Configure</attribute>
-          </xpath>
-            <group colspan="8">
-            <group colspan="4" col="4" groups="base.group_extended" name="other">
-                  <field name="crm_claim" />
-                  <field name="crm_helpdesk" />
-                  <field name="crm_fundraising" />
-                  <field name="wiki_sale_faq"/>
-                    <field name="sale_crm" invisible="1"/>
-            </group>
-            <group colspan="2" col="2">
-                <separator string="Synchronization" colspan="4" />
-                <field name="crm_caldav" />
-                <field name="fetchmail" />
-            </group>
-            <group colspan="2" col="2">
-              <separator string="Plug-In" colspan="4" />
-                  <field name="thunderbird" />
-                  <field name="outlook" />
-              </group>
-          </group>
         </data>
       </field>
     </record>
-
-    <record id="action_crm_installer" model="ir.actions.act_window">
-      <field name="name">CRM Application Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">crm.installer</field>
-      <field name="view_id" ref="view_crm_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
+    
+    <record model="ir.actions.act_window" id="crm_case_section_view_form_installer">
+        <field name="name">Create Sales Team</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">crm.case.section</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="crm.crm_case_section_view_tree"/>
+        <field name="help">Define sales teams to structure your sales organization and assign users to each team. You should also define the sales stage to each team. As an example, if you use Solutions Selling techniques to track your opportunities, you can assign the following stage to the team: Territory, Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost.</field>
     </record>
 
-    <record id="crm_installer_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_crm_installer"/>
-        <field name="sequence">3</field>
-        <field name="restart">always</field>
-        <field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
+    <record id="crm_case_section_installer_todo" model="ir.actions.todo">
+        <field name="action_id" ref="crm_case_section_view_form_installer"/>
+        <field name="category_id" ref="base.category_sales_management_config"/>
+        <field name="sequence">10</field>
+        <field name="type">normal</field>
+        <field name="state">skip</field>
     </record>
+
+    <record model="ir.actions.act_window" id="crm_case_stage_form_installer">
+        <field name="name">Review Sales Stages</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">crm.case.stage</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="crm.crm_case_stage_tree"/>
+        <field name="help">Stages will allow salesmen to easily track how a specific opportunity is positioned in the sales cycle. In order to efficiently manage your sales pipeline, it's important to define conditions to go to the next step. Example: to set an opportunity as 'Qualified', you must set the "Expected Revenue" and the "Expected Closing Date." You should also have a look at the tooltip of the field "Change Probability Automatically".</field>
+    </record>
+
+    <record id="crm_case_stage_installer_todo" model="ir.actions.todo">
+        <field name="action_id" ref="crm_case_stage_form_installer"/>
+        <field name="category_id" ref="base.category_sales_management_config"/>
+        <field name="sequence">10</field>
+        <field name="type">normal</field>
+        <field name="state">skip</field>
+    </record>
+
   </data>
 </openerp>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 864e4dfc0a4..98bc01a51af 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -143,7 +143,7 @@ class crm_lead(crm_case, osv.osv):
             domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]"),
         'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \
             domain="['|',('section_id','=',section_id),('section_id','=',False)]"),
-        'channel_id': fields.many2one('res.partner.canal', 'Channel'),
+        'channel_id': fields.many2one('res.partner.canal', 'Lead Source'),
 
         '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'),
@@ -161,16 +161,16 @@ class crm_lead(crm_case, osv.osv):
         'referred': fields.char('Referred By', size=64),
         'date_open': fields.datetime('Opened', readonly=True),
         'day_open': fields.function(_compute_day, string='Days to Open', \
-                                method=True, multi='day_open', type="float", store=True),
+                                multi='day_open', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
-                                method=True, multi='day_close', type="float", store=True),
+                                multi='day_close', type="float", store=True),
         'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
         'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
-        'subjects': fields.function(_get_email_subject, fnct_search=_history_search, string='Subject of Email', method=True, type='char', size=64),
+        'subjects': fields.function(_get_email_subject, fnct_search=_history_search, string='Subject of Email', type='char', size=64),
     }
 
 
@@ -270,7 +270,6 @@ class crm_lead(crm_case, osv.osv):
         data_obj = self.pool.get('ir.model.data')
         value = {}
 
-        view_id = False
 
         for case in self.browse(cr, uid, ids, context=context):
             context.update({'active_id': case.id})
@@ -346,7 +345,7 @@ class crm_lead(crm_case, osv.osv):
         """
         mailgate_pool = self.pool.get('email.server.tools')
 
-        subject = msg.get('subject')
+        subject = msg.get('subject') or _("No Subject")
         body = msg.get('body')
         msg_from = msg.get('from')
         priority = msg.get('priority')
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 55be89c2252..0159141eb1c 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -105,7 +105,7 @@
                     </group>
                     <group colspan="2" col="3">
                         <separator string="Communication" colspan="4" col="3"/>
-                        <field name="email_from" widget="email"/><button string="Send Email"
+                        <field name="email_from" widget="email"/><button string="Mail"
                         name="%(crm.action_crm_send_mail)d"
                         context="{'mail':'new', 'model': 'crm.lead'}"
                         icon="terp-mail-message-new" type="action" colspan="1"/>
@@ -327,15 +327,14 @@
                     domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))]"
                 />
                 <separator orientation="vertical"/>
-                <field name="name" string="Subject"/>
-                <field name="partner_name"/>
-                <field name="email_from"/>
+                <field name="name" string="Lead / Customer"
+                    domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                 <field name="user_id">
                     <filter icon="terp-personal-"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Leads" />
                 </field>
-                <field name="subjects"/>
+                <field name="subjects" groups="base.group_extended"/>
                 <field name="section_id" widget="selection"
                     context="{'invisible_section': False}">
                     <filter icon="terp-personal+" groups="base.group_extended"
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 57ce46b52cc..4e329ddc6d4 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 from base_calendar import base_calendar
-from crm import crm_case
+from crm import crm_base, crm_case
 from osv import fields, osv
 from tools.translate import _
 import logging
@@ -36,13 +36,13 @@ class crm_phonecall(crm_case, osv.osv):
 crm_phonecall()
 
 
-class crm_meeting(crm_case, osv.osv):
+class crm_meeting(crm_base, osv.osv):
     """ CRM Meeting Cases """
 
     _name = 'crm.meeting'
     _description = "Meeting"
     _order = "id desc"
-    _inherit = ['mailgate.thread',"calendar.event"]
+    _inherit = "calendar.event"
     _columns = {
         # From crm.case
         'name': fields.char('Summary', size=124, required=True, states={'done': [('readonly', True)]}), 
@@ -125,7 +125,7 @@ class calendar_attendee(osv.osv):
        return result
 
     _columns = {
-        'categ_id': fields.function(_compute_data, method=True, \
+        'categ_id': fields.function(_compute_data, \
                         string='Event Type', type="many2one", \
                         relation="crm.case.categ", multi='categ_id'),
     }
@@ -138,16 +138,19 @@ class res_users(osv.osv):
 
     def create(self, cr, uid, data, context=None):
         user_id = super(res_users, self).create(cr, uid, data, context=context)
-        data_obj = self.pool.get('ir.model.data')
-        try:
-            data_id = data_obj._get_id(cr, uid, 'crm', 'ir_ui_view_sc_calendar0')
-            view_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
-            self.pool.get('ir.ui.view_sc').copy(cr, uid, view_id, default = {
-                                        'user_id': user_id}, context=context)
-        except:
-            # Tolerate a missing shortcut. See product/product.py for similar code.
-            logging.getLogger('orm').debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
-            
+        
+        # add shortcut unless 'noshortcut' is True in context
+        if not(context and context.get('noshortcut', False)):
+            data_obj = self.pool.get('ir.model.data')
+            try:
+                data_id = data_obj._get_id(cr, uid, 'crm', 'ir_ui_view_sc_calendar0')
+                view_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
+                self.pool.get('ir.ui.view_sc').copy(cr, uid, view_id, default = {
+                                            'user_id': user_id}, context=context)
+            except:
+                # Tolerate a missing shortcut. See product/product.py for similar code.
+                logging.getLogger('orm').debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
+        
         return user_id
 
 res_users()
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 61ef9942464..aabd4e8592f 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}</field>
+        <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id, 'virtual_id' : True}</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 a2d66040fa9..9ece8cafaae 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -45,8 +45,7 @@
                         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)]}"
-                                on_change="onchange_edit_all(rrule_type,edit_all)"/>
+                           <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}" />
                     </group>
                 </group>
                 <notebook colspan="4">
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index b49edb850da..353eefb8f1b 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -59,7 +59,7 @@
                                     colspan="1" />
                                 <group col="3" colspan="2">
                                     <field name="email_from" string="Email" />
-                                    <button string="Send Email"
+                                    <button string="Mail"
                                     name="%(crm.action_crm_send_mail)d"
                                     context="{'mail':'new', 'model': 'crm.lead'}"
                                     icon="terp-mail-message-new" type="action" />
@@ -132,7 +132,7 @@
                             <group colspan="2" col="2">
                                 <separator string="Mailings" colspan="2"/>
                                 <field name="optin" on_change="on_change_optin(optin)"/>
-                        		<field name="optout" on_change="on_change_optout(optout)"/>
+                                <field name="optout" on_change="on_change_optout(optout)"/>
                             </group>
                         </page>
 
@@ -310,7 +310,7 @@
                                 domain="[]"
                                 help="Show Sales Team"/>
                         </field>
-                        <field name="subjects"/>
+
                         <newline/>
                         <group  expand="0" string="Extended Filters..." groups="base.group_extended">
                               <field name="stage_id" widget="selection" domain="[('type', '=', 'opportunity')]"/>
@@ -326,6 +326,7 @@
                               <newline/>
                               <field name="create_date" string="Creation Date"/>
                               <field name="date_closed"/>
+                              <field name="subjects"/>
                         </group>
                         <newline/>
                         <group expand="0" string="Group By..." colspan="16">
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 6a4e7bfd7c7..ecae065beac 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -19,20 +19,19 @@
 #
 ##############################################################################
 
-from crm import crm_case
+from crm import crm_base
 from osv import fields, osv
 from tools.translate import _
 import crm
 import time
 from datetime import datetime
 
-class crm_phonecall(crm_case, osv.osv):
+class crm_phonecall(crm_base, osv.osv):
     """ Phonecall Cases """
 
     _name = "crm.phonecall"
     _description = "Phonecall"
     _order = "id desc"
-    _inherit = ['mailgate.thread']
     _columns = {
         # From crm.case
         'id': fields.integer('ID'),
@@ -53,10 +52,10 @@ class crm_phonecall(crm_case, osv.osv):
                                     ('draft', 'Draft'), 
                                     ('open', 'Todo'), 
                                     ('cancel', 'Cancelled'), 
-                                    ('done', 'Done'), 
-                                    ('pending', 'Pending'),
+                                    ('done', 'Held'), 
+                                    ('pending', 'Not Held'),
                                 ], 'State', size=16, readonly=True, 
-                                  help='The state is set to \'Draft\', when a case is created.\
+                                  help='The state is set to \'Todo\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
@@ -79,18 +78,25 @@ class crm_phonecall(crm_case, osv.osv):
                          the canall which is this opportunity source."), 
         'date_closed': fields.datetime('Closed', readonly=True), 
         'date': fields.datetime('Date'), 
-        'opportunity_id': fields.many2one ('crm.lead', 'Opportunity'), 
+        'opportunity_id': fields.many2one ('crm.lead', 'Lead/Opportunity'), 
         'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
     }
 
+    def _get_default_state(self, cr, uid, context=None):
+        if context and context.get('default_state', False):
+            return context.get('default_state')
+        return 'open'
+
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 
         'priority': crm.AVAILABLE_PRIORITIES[2][0], 
-        'state':  'open', 
+        'state':  _get_default_state, 
         'user_id': lambda self,cr,uid,ctx: uid,
         'active': 1, 
     }
     
+    
+    
     # From crm.case
 
     def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
@@ -122,14 +128,14 @@ class crm_phonecall(crm_case, osv.osv):
         return res
 
     def case_reset(self, cr, uid, ids, *args):
-        """Resets case as draft
+        """Resets case as Todo
         @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 Ids
         @param *args: Tuple Value for additional Params
         """
-        res = super(crm_phonecall, self).case_reset(cr, uid, ids, args)
+        res = super(crm_phonecall, self).case_reset(cr, uid, ids, args, 'crm.phonecall')
         self.write(cr, uid, ids, {'duration': 0.0})
         return res
 
diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml
index 683cbd9735f..8f0661ab8be 100644
--- a/addons/crm/crm_phonecall_demo.xml
+++ b/addons/crm/crm_phonecall_demo.xml
@@ -18,6 +18,7 @@
 			<field name="categ_id" ref="crm.categ_phone1"/>
 			<field eval="&quot;(769) 703-274&quot;" name="partner_phone"/>
 			<field eval="2.3" name="duration"/>
+			<field eval="&quot;done&quot;" name="state"/>
 		</record>
 		<record id="crm_case_phone02" model="crm.phonecall">
 			<field name="partner_address_id" ref="base.res_partner_address_6"/>
@@ -33,6 +34,7 @@
 			<field name="categ_id" ref="crm.categ_phone1"/>
 			<field eval="&quot;(956) 293-2595&quot;" name="partner_phone"/>
 			<field eval="1.5" name="duration"/>
+			<field eval="&quot;done&quot;" name="state"/>
 		</record>
 		<record id="crm_case_phone03" model="crm.phonecall">
 			<field name="partner_address_id" ref="base.res_partner_address_2"/>
@@ -49,6 +51,7 @@
 			<field eval="&quot;(079) 681-2139&quot;" name="partner_phone"/>
 			<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
 			<field eval="5.0" name="duration"/>
+			<field eval="&quot;done&quot;" name="state"/>
 		</record>
 		<record id="crm_case_phone04" model="crm.phonecall">
 			<field eval="time.strftime('%Y-%m-21 14:10:23')" name="date"/>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 41975d9ced4..55e7657ec05 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -4,7 +4,7 @@
 
     <act_window
         id="crm_case_categ_phone_create_partner"
-        name="Schedule Phone Call"
+        name="Schedule a Call"
         res_model="crm.phonecall"
         src_model="res.partner"
         view_mode="calendar,tree,form"
@@ -61,15 +61,15 @@
         parent="base.menu_base_partner" sequence="4" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
-        <field name="name">Inbound</field>
+        <field name="name">Logged Calls</field>
         <field name="res_model">crm.phonecall</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
-        <field name="context" eval="'{\'search_default_section_id\':section_id, \'default_state\':\'open\', \'search_default_current\':1,\'search_default_today\':1, \'default_categ_id\': ' + str(ref('categ_phone1')) +'}'"/>
+        <field name="view_id" ref="crm_case_inbound_phone_tree_view"/>
+        <field name="domain">[('state','=','done')]</field>
+        <field name="context" eval="'{\'search_default_section_id\':section_id, \'default_state\':\'done\', \'search_default_today\':1}'"/>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
-        <field name="help">The Inbound Calls tool allows you to log your inbound calls on the fly. Each call you get will appear on the partner form to trace every contact you have with a partner. From the phone call form, you can trigger a request for another call, a meeting or an opportunity.</field>
+        <field name="help">This tool allows you to log your inbound calls on the fly. Each call you get will appear on the partner form to trace every contact you have with a partner. From the phone call form, you can trigger a request for another call, a meeting or an opportunity.</field>
 
     </record>
 
@@ -90,24 +90,24 @@
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_incoming0">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_inbound_phone_form_view"/>
+        <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
     </record>
 
-    <menuitem name="Inbound" id="menu_crm_case_phone_inbound"
+    <menuitem name="Logged Calls" id="menu_crm_case_phone_inbound"
         parent="crm.menu_crm_case_phone"
         action="crm_case_categ_phone_incoming0" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">
-        <field name="name">Outbound</field>
+        <field name="name">Scheduled Calls</field>
         <field name="res_model">crm.phonecall</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone2'))+')]'"/>
-        <field name="context" eval="'{\'search_default_section_id\':section_id, \'default_state\':\'open\', \'search_default_current\':1, \'default_categ_id\': ' + str(ref('categ_phone2')) +'}'"/>
+        <field name="domain">[('state','!=','done')]</field>
+        <field name="context" eval="'{\'search_default_section_id\':section_id, \'default_state\':\'open\', \'search_default_current\':1,\'search_default_today\':1}'"/>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
-        <field name="help">Outbound Calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team.</field>
+        <field name="help">Scheduled calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team.</field>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing0">
@@ -131,7 +131,7 @@
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
     </record>
 
-    <menuitem name="Outbound" id="menu_crm_case_phone_outbound"
+    <menuitem name="Scheduled Calls" id="menu_crm_case_phone_outbound"
         parent="crm.menu_crm_case_phone"
         action="crm_case_categ_phone_outgoing0" />
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 44487e2aef5..2490526bb0e 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -31,20 +31,20 @@
                 <field name="partner_contact"/>
                 <field name="partner_phone"/>
                 <field name="user_id"/>
-                <field name="categ_id" string="Type"/>
+                <field name="categ_id"/>
                 <field name="create_date" invisible="1"/>
                 <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
-                    states="draft,open,pending"
+                    states="open,pending"
                     icon="gtk-index"
                     type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Meeting"
-                    states="draft,open,pending" icon="gtk-redo"
+                    states="open,pending" icon="gtk-redo"
                      name="action_make_meeting" type="object" />
                 <field name="state"/>
-                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                <button name="case_cancel" string="Cancel" states="open,pending" type="object" icon="gtk-cancel"/>
+                <button name="case_open" string="Todo" states="pending" type="object" icon="gtk-go-forward"/>
+                <button name="case_close" string="Held" states="open,pending" type="object" icon="gtk-jump-to"/>
                 <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause"/>
             </tree>
         </field>
@@ -61,21 +61,21 @@
                  <group colspan="6" col="7">
                     <field name="name" required="1"/>
                     <field name="partner_phone"/>
-                    <field name="duration" widget="float_time" required="1"/>
+                    <field name="duration" widget="float_time"/>
                     <button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/>
 
-                    <field name="date" required="1"/>
+                    <field name="date"/>
                     <field name="user_id"/>
                     <field name="section_id" colspan="1" widget="selection" />
-                    <button string="Convert to Opportunity"
-                        name="%(phonecall2opportunity_act)d"
-                        icon="gtk-index" type="action"
-                        attrs="{'invisible':[('opportunity_id','!=',False)]}" />
-                    <label colspan="6"  string=""/>
                     <button string="Schedule Other Call"
                      icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
                     type="action"  />
+                    <label colspan="6"  string=""/>
+                    <button string="Convert to Opportunity"
+                        name="%(phonecall2opportunity_act)d"
+                        icon="gtk-index" type="action"
+                        attrs="{'invisible':[('opportunity_id','!=',False)]}" />
 
                 </group>
 
@@ -98,8 +98,7 @@
                 <group col="2" colspan="2">
                     <separator colspan="2" string="Categorization" />
                     <field name="categ_id" widget="selection"
-                        domain="[('object_id.model', '=', 'crm.phonecall')]"
-                        string="Type" />
+                        domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                     <field name="priority"/>
                     <field name="opportunity_id"/>
                 </group>
@@ -109,94 +108,32 @@
                 <group col="8" colspan="4">
                     <field name="state" select="1" />
                     <button name="case_cancel" string="Cancel"
-                        states="draft,open,pending" type="object"
+                        states="open,pending" type="object"
                         icon="gtk-cancel" />
-                    <button name="case_open" string="Open"
-                        states="draft,pending" type="object"
+                    <button name="case_open" string="Todo"
+                        states="pending" type="object"
                         icon="gtk-go-forward" />
                     <button name="case_pending" string="Not Held"
                         states="open" type="object" icon="gtk-media-pause" />
                     <button name="case_close" string="Held"
-                        states="open,draft,pending" type="object"
+                        states="open,pending" type="object"
                         icon="gtk-jump-to" />
-                    <button name="case_reset" string="Reset to Draft"
-                        states="done,cancel" type="object"
+                    <button name="case_reset" string="Reset to Todo"
+                        states="cancel" type="object"
                         icon="gtk-convert" />
                 </group>
             </form>
         </field>
     </record>
 
-    <!--Inbound Phonecalls Form View -->
-
-    <record model="ir.ui.view" id="crm_case_inbound_phone_form_view">
-        <field name="name">CRM - Inbound Phone Call Form</field>
-        <field name="model">crm.phonecall</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Phone Call">
-                <group colspan="4" col="7">
-                    <field name="name" required="1"/>
-                    <field name="partner_phone"/>
-                    <field name="duration" widget="float_time"/>
-                    <button string="Schedule a Meeting"
-                        name="action_make_meeting"
-                        icon="gtk-redo"
-                        type="object" />
-
-                    <field name="date" required="1"/>
-                    <field name="user_id"/>
-                    <field name="section_id" colspan="1" widget="selection" />
-                    <button string="Convert to Opportunity"
-                        name="%(phonecall2opportunity_act)d"
-                        icon="gtk-index" type="action"
-                        attrs="{'invisible':[('opportunity_id','!=',False)]}" />
-                    <label colspan="6"  string=""/>
-                    <button string="Schedule Other Call"
-                     icon="terp-call-start"
-                    name="%(phonecall_to_phonecall_act)d"
-                    type="action"  />
-
-                </group>
-                <group col="3" colspan="2">
-                    <separator colspan="3" string="Contacts" />
-                    <field name="partner_id"
-                        on_change="onchange_partner_id(partner_id, email_from)" />
-                    <button string="Create a Partner"
-                        icon="terp-partner"
-                        name="%(action_crm_phonecall2partner)d"
-                        type="action"
-                        attrs="{'invisible':[('partner_id','!=',False)]}"
-                        groups="base.group_partner_manager" />
-                    <newline/>
-                    <field name="partner_address_id"
-                        on_change="onchange_partner_address_id(partner_address_id, email_from)" />
-                    <newline/>
-                    <field name="partner_mobile" />
-                </group>
-                <group col="2" colspan="2">
-                    <separator colspan="2" string="Categorization" />
-                    <field name="categ_id" widget="selection"
-                        domain="[('object_id.model', '=', 'crm.phonecall')]"
-                        string="Type" />
-                    <field name="priority"/>
-                    <field name="opportunity_id"/>
-                </group>
-                <separator string="Description" colspan="4" />
-                <field name="description" nolabel="1" colspan="4" />
-                <separator colspan="4" />
-            </form>
-        </field>
-    </record>
-
-    <!--Inbound Phonecalls Tree View -->
+    <!--Logged Phonecalls Tree View -->
 
     <record model="ir.ui.view" id="crm_case_inbound_phone_tree_view">
-        <field name="name">CRM - Inbound Phone Calls Tree</field>
+        <field name="name">CRM - Logged Phone Calls Tree</field>
         <field name="model">crm.phonecall</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Phone Calls" colors="grey:state in ('cancel','done');blue:state in ('pending',)" editable="top">
+            <tree string="Phone Calls" editable="top">
                 <field name="date"/>
                 <field name="name"/>
                 <field name="partner_id"
@@ -207,21 +144,15 @@
                 <field name="partner_phone"/>
                 <field name="user_id"/>
                 <field name="categ_id" widget="selection"
-                    domain="[('object_id.model', '=', 'crm.phonecall')]"
-                    string="Type" />
+                    domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                 <field name="state" invisible="1"/>
                 <field name="create_date" invisible="1"/>
                 <button string="Schedule Other Call"
                     icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
                     type="action"  />
-                <button string="Convert to Opportunity"
-                    name="%(phonecall2opportunity_act)d"
-                    states="draft,open,pending"
-                    icon="gtk-index"
-                    type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Meeting"
-                    states="draft,open,pending" icon="gtk-redo"
+                     icon="gtk-redo"
                      name="action_make_meeting" type="object" />
             </tree>
         </field>
@@ -252,7 +183,7 @@
             <search string="Search Phonecalls">
                <filter icon="terp-check" string="Current"
                    name="current"
-                   domain="[('state','in', ('draft','open','pending'))]"/>
+                   domain="[('state','in', ('open','pending'))]"/>
                <filter icon="terp-go-today" string="Today"
                    domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),
                     ('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
diff --git a/addons/crm/i18n/sv.po b/addons/crm/i18n/sv.po
index a90efd1c9e2..887c6ea83a8 100644
--- a/addons/crm/i18n/sv.po
+++ b/addons/crm/i18n/sv.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-21 14:37+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-06-03 13:57+0000\n"
+"Last-Translator: Jan-Eric Lindh <jelindh@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-04-29 04:59+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-04 04:53+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -46,7 +46,7 @@ msgstr "Schemalägg telefonsamtal"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
 msgid "Stage of case"
-msgstr ""
+msgstr "Uppgiftsstatus"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -108,7 +108,7 @@ msgstr "Kan inte lägga till anteckning!"
 #. module: crm
 #: field:crm.case.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Statusnamn"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "Koden för säljteamet måste vara unikt!"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr "Ingen repetition"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -536,9 +536,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -675,7 +675,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr ""
+msgstr "# Telefonsamtal"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
@@ -809,8 +809,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1086,7 +1086,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2590,7 +2590,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3104,8 +3104,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
diff --git a/addons/crm/i18n/tr.po b/addons/crm/i18n/tr.po
index 476d6f5a88e..b6542f5220e 100644
--- a/addons/crm/i18n/tr.po
+++ b/addons/crm/i18n/tr.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:15+0000\n"
-"PO-Revision-Date: 2011-05-22 17:11+0000\n"
+"PO-Revision-Date: 2011-06-20 20:31+0000\n"
 "Last-Translator: Ayhan KIZILTAN <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-05-23 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-06-21 04:36+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr "Aday Sayısı"
+msgstr "Aday #"
 
 #. module: crm
 #: view:crm.lead:0
@@ -316,6 +316,8 @@ msgid ""
 "communication history) will be merged with existing Opportunity of Selected "
 "partner."
 msgstr ""
+"Varolan Fırsatla Birleştirmeyi seçerseniz, aday ayrıntıları (iletişim "
+"geçmişi) Seçilen paydaşın varolan carolan fırsatıyla birleştirilecektir."
 
 #. module: crm
 #: selection:crm.meeting,class:0
@@ -386,7 +388,7 @@ msgstr "Olasılığı otomatik olarak değiştir"
 #. module: crm
 #: field:base.action.rule,regex_history:0
 msgid "Regular Expression on Case History"
-msgstr ""
+msgstr "Durum Geçmişinin Düzenli Anlatımı"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:209
@@ -450,6 +452,11 @@ msgid ""
 "customer. You can also import a .CSV file with a list of calls to be done by "
 "your sales team."
 msgstr ""
+"Giden Çağrılar satış takımınız tarafından bütün çağrıları listeler. Bir "
+"satış elemanı çağrı bilgisini form görünümünde kayıteder. Bir müşteriyle "
+"kuracağınız her iletişimin izlenebilmesi için paydaş formunda saklanacaktır. "
+"Satış takımınız tarafından yapılacak çağrı listesini de .CSV dosyası olarak "
+"içeaktarabilirsiniz."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_action
@@ -640,6 +647,8 @@ msgid ""
 "Thick this box if you want that on escalation, the responsible of this sale "
 "team automatically becomes responsible of the lead/opportunity escaladed"
 msgstr ""
+"Yükseltmek istiyorsanız bu kutuyu tıklayın, bu satış takımının sorumlusu "
+"otomatikman yükseltilen aday/fırsatın sorumlusu olur."
 
 #. module: crm
 #: help:crm.installer,outlook:0
@@ -662,6 +671,8 @@ msgid ""
 "Default state of mind for period preceeding the 'Max Interval' computation. "
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
+"'Ençok Aralık' hesaplamasından önce gelen dönemin varsayılan ruh durumudur. "
+"Eğer paydaşın hiç bir etkinliği yoksa bu başlangıç ruh durumudur."
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
@@ -689,6 +700,8 @@ msgid ""
 "The partner category that will be added to partners that match the "
 "segmentation criterions after computation."
 msgstr ""
+"Hesaplamadan sonraki bölümleme kriterlerine uyan paydaşa eklenecek paydaş "
+"kategorisi."
 
 #. module: crm
 #: view:crm.lead:0
@@ -702,6 +715,8 @@ msgid ""
 "modes available with the customer. With each commercial opportunity, you can "
 "indicate                         the canall which is this opportunity source."
 msgstr ""
+"Kanallar, müşteriyle yapılabilecek farklı iletişim modellerini temsil eder. "
+"Her ticari fırsatla, bu fırsatın kaynağı olan kanalı belirtebilirsiniz."
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:93
@@ -726,6 +741,8 @@ msgid ""
 "The email address put in the 'Reply-To' of all emails sent by OpenERP about "
 "cases in this sales team"
 msgstr ""
+"Bu satış takımının durumu ile ilgili OpenERP tarafından gönderielecek "
+"epostaların 'Şuna Yanıt Ver' alanına konulacak eposta adresi"
 
 #. module: crm
 #: view:res.users:0
@@ -738,6 +755,7 @@ msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
 msgstr ""
+"Yineleme kuralı dışında tutulan bir zaman tekrarlama modelini tanımlar."
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
@@ -761,6 +779,8 @@ msgid ""
 "Helps you to synchronize the meetings with other calendar clients and "
 "mobiles."
 msgstr ""
+"Toplantılarınızı diğer takvim müşterilerinizle ve cep telefonları ile "
+"senkronize etmenizi sağlar."
 
 #. module: crm
 #: selection:crm.meeting,freq:0
@@ -795,7 +815,7 @@ msgstr "Olası Gelir"
 #. module: crm
 #: help:crm.segmentation,name:0
 msgid "The name of the segmentation."
-msgstr ""
+msgstr "Bölümleme Adı"
 
 #. module: crm
 #: field:crm.case.stage,probability:0
@@ -806,7 +826,7 @@ msgstr "Olasılık (%)"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr ""
+msgstr "Aday Oluşturma"
 
 #. module: crm
 #: view:board.board:0
@@ -991,6 +1011,8 @@ msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
 msgstr ""
+"Bu özellik yinelenen takvim öğeleri için istisna tutulan tarih/saat "
+"listesini belirtir."
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
@@ -1035,7 +1057,7 @@ msgstr "Bu vak'ada tanımlanan Satış Ekibi'ne gönder"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr ""
+msgstr "Kazanıldı İşaretle"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1045,7 +1067,7 @@ msgstr "Alış Tutarı"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr ""
+msgstr "Kaybedildi İşaretle"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -1063,7 +1085,7 @@ msgstr "'%s' fırsatı kapandı."
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Açılışa kadar Gün Sayısı"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1091,7 +1113,7 @@ msgstr "Cep"
 #. module: crm
 #: field:crm.meeting,end_type:0
 msgid "Way to end reccurency"
-msgstr ""
+msgstr "Yineleme sonlandırma yolu"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:53
@@ -1165,6 +1187,8 @@ msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
 msgstr ""
+"Eğer etkin alan doğru olarak ayarlıysa, etkinlik alarmını silmeden "
+"gizleyebilirsiniz."
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
@@ -1175,7 +1199,7 @@ msgstr "Kapanan/ İptal edilen Telefon görüşmesi fırsata dönüştürülemed
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr ""
+msgstr "Paydaş Bölümlendirmeleri"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1233,7 +1257,7 @@ msgstr "Satış Departmanı"
 #. module: crm
 #: field:crm.send.mail,html:0
 msgid "HTML formatting?"
-msgstr ""
+msgstr "HTML formatı mı?"
 
 #. module: crm
 #: field:crm.case.stage,type:0
@@ -1249,7 +1273,7 @@ msgstr "Tür"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Compute Segmentation"
-msgstr ""
+msgstr "Bölimleme Hesabı"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1350,7 +1374,7 @@ msgstr "Belirli aralıklarla olayın otomatik olarak tekrarlamasına izin ver"
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition Case Fields"
-msgstr ""
+msgstr "Durum Alanları Koşulları"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1391,7 +1415,7 @@ msgstr "Eylül"
 #. module: crm
 #: field:crm.segmentation,partner_id:0
 msgid "Max Partner ID processed"
-msgstr ""
+msgstr "İşlem gören Enfazla Paydaş No"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
@@ -1408,7 +1432,7 @@ msgstr "Açılış Tarihi"
 #. module: crm
 #: help:crm.phonecall,duration:0
 msgid "Duration in Minutes"
-msgstr ""
+msgstr "Dakika olarak Süre"
 
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
@@ -1426,6 +1450,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the sales team "
 "without removing it."
 msgstr ""
+"Eğer etkin alan doğru olarak ayarlıysa, satış takımını silmeden "
+"gizleyebilirsiniz."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1446,7 +1472,7 @@ msgstr "Cuma"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
 msgid "crm.lead"
-msgstr ""
+msgstr "miy.aday"
 
 #. module: crm
 #: field:crm.meeting,write_date:0
@@ -1456,7 +1482,7 @@ msgstr "Yazım Tarihi"
 #. module: crm
 #: view:crm.meeting:0
 msgid "End of recurrency"
-msgstr ""
+msgstr "Yineleme sonu"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1469,6 +1495,8 @@ msgid ""
 "Check if you want to use this tab as part of the segmentation rule. If not "
 "checked, the criteria beneath will be ignored"
 msgstr ""
+"Bu sekmeyi bölümleme kuralının bir parçası olarak kullanmak için burayı "
+"işaretleyin. Eğer işaretlenmezse, altındaki kriter yok sayılacaktır."
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -1494,7 +1522,7 @@ msgstr "Pazartesi"
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Kapanışa kadar Gün Sayısı"
 
 #. module: crm
 #: field:crm.add.note,attachment_ids:0
@@ -1513,7 +1541,7 @@ msgstr "No"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner2opportunity
 msgid "Partner To Opportunity"
-msgstr ""
+msgstr "Paydaşı Fırsata"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1572,6 +1600,9 @@ msgid ""
 "better manage your interactions with them. The segmentation tool is able to "
 "assign categories to partners according to criteria you set."
 msgstr ""
+"Paydaşlarınızla etkileşim daha iyi yönetmek için onlara atayacağınız özel "
+"paydaş kategorileri oluşturun. Bölümleme aracı, ayarladığınız kriterler göre "
+"paydaşlarınıza kategori atamanızı sağlar."
 
 #. module: crm
 #: field:crm.case.section,code:0
@@ -1623,7 +1654,7 @@ msgstr "İptal"
 #. 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
@@ -1633,7 +1664,7 @@ msgstr "İki Fırsatı Birleştir"
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Fix amout of times"
-msgstr ""
+msgstr "Süre Miktarını Düzelt"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1650,7 +1681,7 @@ msgstr "İstisnai Kural"
 #. module: crm
 #: help:base.action.rule,act_mail_to_partner:0
 msgid "Check this if you want the rule to send an email to the partner."
-msgstr ""
+msgstr "Eğer paydaşa bir eposta göndermek isterseniz bunu işaretleyin."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
@@ -1665,7 +1696,7 @@ msgstr "Kişileri Davet Et"
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
-msgstr ""
+msgstr "Hata ! Yinelenen Satış takımı oluşturamazsınız."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1703,6 +1734,10 @@ msgid ""
 "mainly used by the sales manager in order to do the periodic review with the "
 "teams of the sales pipeline."
 msgstr ""
+"Fırsat Analizleri, planlanan gelir, planlanan maliyet, geçen sontarihler ya "
+"da fırsatlarla etkileşim sayısı gibi müşşteri bilgilerinizehızlı bir şekilde "
+"erişmenizi sağlar. Bu rapor genel olarak  yalnızca satış müdürü tarafından "
+"satış kanallarına ait takımların süreli incelemeleri için kullanılır."
 
 #. module: crm
 #: field:crm.case.categ,name:0
@@ -1726,6 +1761,10 @@ 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 ""
+"Satışlarınıza ait satış kanallarının daha iyi bir şekilde organize edilmesi "
+"için adaylara ve fırsatlara özel aşamalar ekleyin. Aşamalar, belirli bir "
+"adayın ya da fırsatın satış çevriminde nasıl bir durumda olduğunu kolayca "
+"izlenmesini sağlar."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1741,12 +1780,12 @@ msgstr "Doğum Günü"
 #. module: crm
 #: view:crm.meeting:0
 msgid "The"
-msgstr ""
+msgstr "Bu"
 
 #. module: crm
 #: field:crm.send.mail.attachment,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Sihirbaz"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1754,12 +1793,14 @@ msgid ""
 "Sales team to which this case belongs to. Defines responsible user and e-"
 "mail address for the mail gateway."
 msgstr ""
+"Bu durumun bağlı olduğu satış takımı. Ağgeçidi için sorumlu kullanıcı ve e-"
+"posta adresi tanımlar."
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Creation"
-msgstr ""
+msgstr "Oluşturma"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1772,7 +1813,7 @@ msgstr "Yüksek"
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
-msgstr ""
+msgstr "Olasıyı iş ortağına dönüştür"
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
@@ -1786,6 +1827,10 @@ 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 ""
+"Toplantı Davetiyeleri ile paydaşlarınıza/iş arkadaşlarınıza göndereceğiniz "
+"toplantı davetiyeleri oluşturabilir ve yönetebilirsiniz. Yalnızca OpenERP "
+"kullanıcıların değil, müşterileriniz dışarıdan gruplar da davet "
+"edebilirsiniz."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -1800,22 +1845,22 @@ msgstr "Beşinci"
 #. module: crm
 #: view:crm.phonecall2phonecall:0
 msgid "_Schedule"
-msgstr ""
+msgstr "_Plan"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "Kapanış Gecikmesi"
 
 #. module: crm
 #: field:crm.meeting,we:0
 msgid "Wed"
-msgstr ""
+msgstr "Çrş"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Potential Reseller"
-msgstr ""
+msgstr "Potansiyel Satıcı"
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
@@ -1834,7 +1879,7 @@ msgstr "Grupla..."
 #. module: crm
 #: help:crm.lead,partner_id:0
 msgid "Optional linked partner, usually after conversion of the lead"
-msgstr ""
+msgstr "Seçmeli bağlantılı paydaş, genellikle paydaşın dönüşümden sonraki"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1844,7 +1889,7 @@ msgstr "Davet Detayları"
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Team"
-msgstr ""
+msgstr "Ana Takım"
 
 #. module: crm
 #: field:crm.lead,date_action:0
@@ -1864,25 +1909,25 @@ msgstr "Saat"
 #. module: crm
 #: field:crm.lead,zip:0
 msgid "Zip"
-msgstr ""
+msgstr "PKod"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:213
 #, python-format
 msgid "The case '%s' has been opened."
-msgstr ""
+msgstr "'%s' durumu açılmıştır."
 
 #. module: crm
 #: view:crm.installer:0
 msgid "title"
-msgstr ""
+msgstr "unvan"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Inbound"
-msgstr ""
+msgstr "Gelen"
 
 #. module: crm
 #: help:crm.case.stage,probability:0
@@ -1890,6 +1935,8 @@ msgid ""
 "This percentage depicts the default/average probability of the Case for this "
 "stage to be a success"
 msgstr ""
+"Bu yüzde, bu aşamadaki durumun varsayılan/ortalama başarılı olma olasılığını "
+"anlatır."
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1905,7 +1952,7 @@ msgstr "İletişim Geçmişi"
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Free"
-msgstr ""
+msgstr "Ücretsiz"
 
 #. module: crm
 #: view:crm.installer:0
@@ -1938,11 +1985,15 @@ msgid ""
 "with a partner. From the phone call form, you can trigger a request for "
 "another call, a meeting or an opportunity."
 msgstr ""
+"Gelen Çağrılar aracı gelen çağrılarınıza anında bağlanmanızı sağlar. "
+"Aldığınız her çağrı, bir paydaşla kuracağınız her iletişimin izlenmesi için "
+"paydaş formunda görünecektir. Telefon çağrı formundan, başka bir çağrıyı, "
+"bir toplantıyı ya da bir fırsatı tetikleyebilirsainiz."
 
 #. module: crm
 #: help:crm.meeting,recurrency:0
 msgid "Recurrent Meeting"
-msgstr ""
+msgstr "Yinelenen Toplantı"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1981,11 +2032,14 @@ msgid ""
 "opportunities. You can also synchronize meetings with your mobile phone "
 "using the caldav interface."
 msgstr ""
+"Toplantı takvimi, satış takımınca paylaşılır ve personel tatilleri ya da iş "
+"fırsatları gibi diğer uygulamalarla tam olarak entegredir. Caldav arayüzünü "
+"kullanarak toplantılarınızı da cep telefonunuzdan senkronize edebilirsiniz."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
-msgstr ""
+msgstr "Fırsata Telefon Çağrısı"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
@@ -1995,7 +2049,7 @@ msgstr "Yanıtla"
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select stages for this Sales Team"
-msgstr ""
+msgstr "Bu Satış Takımı için aşama seçin"
 
 #. module: crm
 #: view:board.board:0
@@ -2005,12 +2059,12 @@ msgstr "Aşamalara göre fırsatlar"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency Option"
-msgstr ""
+msgstr "Yineleme Seçeneği"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
 msgid "Prospect is converting to business partner"
-msgstr ""
+msgstr "Olası Paydaşın iş ortağına dönüştürülüyor"
 
 #. module: crm
 #: view:crm.lead2opportunity:0
@@ -2024,7 +2078,7 @@ msgstr "Fırsata Dönüştür"
 #: view:crm.phonecall.report:0
 #: view:res.partner:0
 msgid "Held"
-msgstr ""
+msgstr "Elde"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2043,12 +2097,12 @@ msgstr "Extra Bilgi"
 #: 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 "Fırsatları Birleştir"
 
 #. 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
@@ -2058,7 +2112,7 @@ msgstr "miy.telefongörüşmesi"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Mail Campaign 2"
-msgstr ""
+msgstr "Posta Kampanyası 2"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2095,7 +2149,7 @@ msgstr "Satış Alış Kuralı Kullan"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr ""
+msgstr "Adayda Fırsat Ortağına"
 
 #. module: crm
 #: field:crm.meeting,location:0
@@ -2135,7 +2189,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
 msgid "Segmentation line"
-msgstr ""
+msgstr "Bölümleme satırı"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0
@@ -2146,7 +2200,7 @@ msgstr "Planlanan Tarih"
 #. module: crm
 #: field:crm.meeting,base_calendar_url:0
 msgid "Caldav URL"
-msgstr ""
+msgstr "Caldav Adresi"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2156,13 +2210,13 @@ msgstr "Beklenen Gelir"
 #. 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 "Tür, adaylar ve fırsatları ayırdetmek için kullanılır"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -2187,6 +2241,11 @@ msgid ""
 "The opportunities and sales order displayed, will automatically be filtered "
 "according to his team."
 msgstr ""
+"Farklı satış elemanlarınızı organize etmek ya da satış bölümlerinizi "
+"takımlara ayırmak için bir Satış Takımı tanımlar. Her takım kendine ait "
+"fırsatlar listesi, satış siparişleri, vb. ile çalışacaktır. Her kullanıcı "
+"kendi kullanıcı tercihlerine göre varsayılan takım ayarlar. Görüntülenen "
+"fırsatlar ve satış siparişleri, otomatik olarak bu takıma göre süzülecektir."
 
 #. module: crm
 #: help:crm.meeting,count:0
@@ -2198,41 +2257,41 @@ msgstr "x kere tekrarla"
 #: 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 "Satış Takımları"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
 msgid "Lead to Partner"
-msgstr ""
+msgstr "Adaydan Paydaşa"
 
 #. module: crm
 #: view:crm.segmentation:0
 #: field:crm.segmentation.line,segmentation_id:0
 #: model:ir.actions.act_window,name:crm.crm_segmentation-act
 msgid "Segmentation"
-msgstr ""
+msgstr "Bölümleme"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Takım"
 
 #. module: crm
 #: field:crm.installer,outlook:0
 msgid "MS-Outlook"
-msgstr ""
+msgstr "MS-Outlook"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 #: view:res.partner:0
 msgid "Not Held"
-msgstr ""
+msgstr "Elde Değil"
 
 #. module: crm
 #: field:crm.lead.report,probability:0
 msgid "Probability"
-msgstr ""
+msgstr "Olasılık"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2264,6 +2323,15 @@ msgid ""
 "email gateway: new emails may create leads, each of them automatically gets "
 "the history of the conversation with the prospect."
 msgstr ""
+"Adaylar, ürünlerinize ve hizmetlerinize ilgi duyan aday ya da paydaşların "
+"ilk temaslarını yönetmeyi ve izlemeyi sağlar. Bir aday, satış çevriminizde "
+"genellikle ilk adımdır. Yeterli bulunduğunda bir aday, herhangi bir "
+"bağlantılı etkinliğinde ayrıntılı olarak izlenmesi için ilgili paydaşın "
+"oluşturulması sırasında iş fırsatına çevrilebilir. Bir adayın veritabanını "
+"içeaktarabilir, kartvizitlerin kaydını tutabilir ya da websitenizin iletişim "
+"formunu OpenERP Adaylarla entegre edebilirsiniz. Adaylar eposta ağgeçidine "
+"bağlanabilir: yeni epostalar adayları oluşturur, her biri adaylarla yapılan "
+"konuşma geçmişini otomatikmen alır."
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -2287,7 +2355,7 @@ msgstr "Yapılacaklar"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Delegate"
-msgstr ""
+msgstr "Vekil"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2298,6 +2366,7 @@ msgstr "Reddet"
 #: help:crm.lead,optin:0
 msgid "If opt-in is checked, this contact has accepted to receive emails."
 msgstr ""
+"Eğer opt-in (onaylı) işaretliyse, bu ilgili eposta almayı kabul etmiştir."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2341,12 +2410,12 @@ msgstr "Kapalı"
 #. module: crm
 #: view:crm.installer:0
 msgid "Plug-In"
-msgstr ""
+msgstr "Eklenti"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
 msgid "Internal Meeting"
-msgstr ""
+msgstr "İç Toplantı"
 
 #. module: crm
 #: code:addons/crm/crm.py:411
@@ -2372,7 +2441,7 @@ msgstr "Müşteri Toplantısı"
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
-msgstr ""
+msgstr "Toplu CC"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2386,7 +2455,7 @@ msgstr "Telefon Görüşmeleri"
 #: help:crm.lead.report,delay_open:0
 #: help:crm.phonecall.report,delay_open:0
 msgid "Number of Days to open the case"
-msgstr ""
+msgstr "Durumun açılması için gün sayısı"
 
 #. module: crm
 #: field:crm.lead,phone:0
@@ -2413,17 +2482,17 @@ msgstr "'%s' fırsat aşaması '%s' olarak değiştirilmiştir."
 #: code:addons/crm/crm_lead.py:282
 #, python-format
 msgid "Changed Stage to: %s"
-msgstr ""
+msgstr "Aşamayı şuna Değiştir: %s"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
-msgstr ""
+msgstr "Zorunlu İfade"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2433,7 +2502,7 @@ msgstr "Belirsiz"
 #. module: crm
 #: field:crm.send.mail,email_cc:0
 msgid "CC"
-msgstr ""
+msgstr "CC"
 
 #. module: crm
 #: view:crm.send.mail:0
@@ -2452,11 +2521,13 @@ msgid ""
 "Helps you manage wiki pages for Frequently Asked Questions on Sales "
 "Application."
 msgstr ""
+"Satış Uygulamasındaki Sık Sorulan Sorular wiki sayfalarını yönetmenizi "
+"sağlar."
 
 #. module: crm
 #: help:crm.installer,crm_fundraising:0
 msgid "This may help associations in their fundraising process and tracking."
-msgstr ""
+msgstr "Derneklerin bağış toplama işlemlerini ve izlenmesini sağlar."
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
@@ -2468,12 +2539,12 @@ msgstr "İşlem"
 #. module: crm
 #: field:crm.installer,crm_claim:0
 msgid "Claims"
-msgstr ""
+msgstr "Sikayetler"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
 msgid "Decrease (0>1)"
-msgstr ""
+msgstr "Azalt (0>1)"
 
 #. module: crm
 #: view:crm.add.note:0
@@ -2526,7 +2597,7 @@ msgstr "Maximum Aralık"
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 msgid "_Schedule Call"
-msgstr ""
+msgstr "_Çağrı Planla"
 
 #. module: crm
 #: code:addons/crm/crm.py:326
@@ -2561,28 +2632,28 @@ msgstr "Meşgul"
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Repeat every"
-msgstr ""
+msgstr "Tekrarlama"
 
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
-msgstr ""
+msgstr "Danışma Masası"
 
 #. module: crm
 #: field:crm.meeting,recurrency:0
 msgid "Recurrent"
-msgstr ""
+msgstr "Yinelenen"
 
 #. module: crm
 #: code:addons/crm/crm.py:397
 #, python-format
 msgid "The case '%s' has been cancelled."
-msgstr ""
+msgstr "'%s' Durumu iptal edilmiştir."
 
 #. module: crm
 #: field:crm.installer,sale_crm:0
 msgid "Opportunity to Quotation"
-msgstr ""
+msgstr "Fırsatta Teklife"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail
@@ -2598,7 +2669,7 @@ msgstr "Açık Fırsatlarım"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 msgid "CRM - Statistics Dashboard"
-msgstr ""
+msgstr "CRM - İstatistik Paneli"
 
 #. module: crm
 #: help:crm.meeting,rrule:0
@@ -2607,6 +2678,9 @@ msgid ""
 "e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
 "      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 msgstr ""
+"Yinelenen olaylar için tekrarlama modeli kuralı tanımlar\n"
+"Örneğin: İki ayda bir ayın pazar günü için 10 oluşum: "
+"SIKLIK=AYLIK;ARALIK=2;SAYI=10;GÜNLÜK=-1PAZ"
 
 #. module: crm
 #: field:crm.lead,job_id:0
@@ -2623,6 +2697,7 @@ msgstr "Max. İletişim Geçmişi"
 #: view:crm.lead2partner:0
 msgid "Are you sure you want to create a partner based on this lead ?"
 msgstr ""
+"Bu aday temel alınarak bir paydaş oluşturmak istediğinizden emin misiniz?"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2634,7 +2709,7 @@ msgstr "Toplantı Türü"
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
-msgstr ""
+msgstr "Varolan Fırstla Birleştir"
 
 #. module: crm
 #: help:crm.lead,state:0
@@ -2648,6 +2723,13 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"Bir vak'a oluşturulduğu zaman, durumu 'taslak' olarak ayarlanır.             "
+"                     \n"
+"Eğer vak'anın işlemi sürüyor ise 'aç' olarak ayarlanır.                      "
+"            \n"
+"Eğer vak'a bitti ise, durum 'tamamlandı' olarak ayarlanır.                   "
+"               \n"
+"Eğer vak'a yeniden gözden geçirilecekse durum 'bekliyor' olarak ayarlanır."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2666,11 +2748,13 @@ msgid ""
 "The computation is made on all events that occured during this interval, the "
 "past X periods."
 msgstr ""
+"Bu aralık içerisinde, geçmiş X süresi, meydana gelen bütün etkinliklerin "
+"hesabı yapılır."
 
 #. module: crm
 #: view:board.board:0
 msgid "My Win/Lost Ratio for the Last Year"
-msgstr ""
+msgstr "Geçen Yıl için Kazanım/Kayıp oranım"
 
 #. module: crm
 #: field:crm.installer,thunderbird:0
@@ -2685,19 +2769,19 @@ msgstr "E-posta sayısı"
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr ""
+msgstr "Aday Ara"
 
 #. 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 "Açmada gecikme"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency period"
-msgstr ""
+msgstr "Yineleme Dönemi"
 
 #. module: crm
 #: field:crm.meeting,week_list:0
@@ -2707,22 +2791,22 @@ msgstr "İş günü"
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr ""
+msgstr "Oneren"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity
 msgid "Lead To Opportunity"
-msgstr ""
+msgstr "Adaydan Fırsata"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Katılımcı Bilgisi"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Test"
-msgstr ""
+msgstr "Bölümleme Testi"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2732,31 +2816,31 @@ msgstr "Devam Prosesi"
 #. module: crm
 #: view:crm.installer:0
 msgid "Configure Your CRM Application"
-msgstr ""
+msgstr "MİY Uygulamanızı Yapılandırın"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr ""
+msgstr "Paydaşa Telefon Çağrısı"
 
 #. 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 "Fırsata dönüştürülürken oluşturulan müstakbel paydaşın adı"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
 #: field:crm.phonecall2phonecall,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Şuna Ata"
 
 #. module: crm
 #: field:crm.add.note,state:0
 #: field:crm.send.mail,state:0
 msgid "Set New State To"
-msgstr ""
+msgstr "Yeni Durumu şuna Ayarla"
 
 #. module: crm
 #: field:crm.lead,date_action_last:0
@@ -2770,65 +2854,65 @@ msgstr "Son İşlem"
 #: field:crm.phonecall,duration:0
 #: field:crm.phonecall.report,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Süre"
 
 #. module: crm
 #: field:crm.send.mail,reply_to:0
 msgid "Reply To"
-msgstr ""
+msgstr "Şuna Yanıt ver"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.open_board_crm
 #: model:ir.ui.menu,name:crm.menu_board_crm
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "Satış Panosu"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:56
 #, python-format
 msgid "A partner is already defined on this lead."
-msgstr ""
+msgstr "Bu hadaya bir paydaş zaten tanımlanmış"
 
 #. module: crm
 #: field:crm.lead.report,nbr:0
 #: field:crm.phonecall.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "Durum #"
 
 #. module: crm
 #: help:crm.meeting,section_id:0
 #: help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr ""
+msgstr "Durumun bağlı olduğu satış takımı"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Sunday"
-msgstr ""
+msgstr "Pazar"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fourth"
-msgstr ""
+msgstr "Dördüncü"
 
 #. module: crm
 #: selection:crm.add.note,state:0
 #: selection:crm.merge.opportunity,state:0
 #: selection:crm.send.mail,state:0
 msgid "Unchanged"
-msgstr ""
+msgstr "Değiştirilmemiş"
 
 #. module: crm
 #: 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 "Paydaş Bölümleme"
 
 #. module: crm
 #: field:crm.lead,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "Faks"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
@@ -2849,7 +2933,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Assignment"
-msgstr ""
+msgstr "Atama"
 
 #. module: crm
 #: field:crm.lead,company_id:0
@@ -2859,72 +2943,72 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr ""
+msgstr "Cuma"
 
 #. module: crm
 #: field:crm.meeting,allday:0
 msgid "All Day"
-msgstr ""
+msgstr "Tüm Gün"
 
 #. module: crm
 #: field:crm.segmentation.line,operator:0
 msgid "Mandatory / Optional"
-msgstr ""
+msgstr "Zorunlu / Seçmeli"
 
 #. module: crm
 #: 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 "Toplantı Davetleri"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
-msgstr ""
+msgstr "Nesne Adı"
 
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "E-mail address of the contact"
-msgstr ""
+msgstr "İlgilinin E-posta adresi"
 
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred By"
-msgstr ""
+msgstr "Öneren"
 
 #. module: crm
 #: view:crm.lead:0
 #: model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr ""
+msgstr "İç Not Ekle"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:304
 #, python-format
 msgid "The stage of lead '%s' has been changed to '%s'."
-msgstr ""
+msgstr "'%s' Adayın aşaması '%s' olarak değiştirilmiştir."
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
-msgstr ""
+msgstr "Sonuncu"
 
 #. module: crm
 #: field:crm.lead,message_ids:0
 #: field:crm.meeting,message_ids:0
 #: field:crm.phonecall,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mesajlar"
 
 #. module: crm
 #: help:crm.case.stage,on_change:0
 msgid "Change Probability on next and previous stages."
-msgstr ""
+msgstr "Sonraki ve önceki aşamaların Olabilirliğini değiştir."
 
 #. module: crm
 #: code:addons/crm/crm.py:455
@@ -2939,7 +3023,7 @@ msgstr "Hata!"
 #: field:crm.opportunity2phonecall,name:0
 #: field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr ""
+msgstr "Çağrı Özeti"
 
 #. module: crm
 #: selection:crm.add.note,state:0
@@ -2951,34 +3035,34 @@ msgstr ""
 #: selection:crm.phonecall.report,state:0
 #: selection:crm.send.mail,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Vazgeçildi"
 
 #. module: crm
 #: field:crm.add.note,body:0
 msgid "Note Body"
-msgstr ""
+msgstr "Not Gövdesi"
 
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "Aşamaya göre Planlanan Gelirlerim"
 
 #. module: crm
 #: field:crm.lead.report,date_closed:0
 #: field:crm.phonecall.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Kapanış Tarihi"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Ay   "
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Links"
-msgstr ""
+msgstr "Bağlantılar"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2988,6 +3072,10 @@ msgid ""
 "instance reflect your product structure or the different types of sales you "
 "do."
 msgstr ""
+"Adaylarınızı ve fırsatlarınızı firmanızın etkinliklerine uyacak şekilde "
+"sınıflandırmak ve analiz etmek için özel kategoriler oluşturun. Bu "
+"kategoriler örnek olarak ürününüzün yapısını ya da yaptığınız farklı satış "
+"türlerini yansıtabilir."
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
@@ -2995,6 +3083,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 ""
+"Eğer bir paydaş bir süre hiç satınalma yapmamışsa, ruh durumunu bu katsayı "
+"ile azaltın. Bu bir çarpım işlemidir"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
@@ -3004,33 +3094,37 @@ msgid ""
 "several criteria and drill down the information, by adding more groups in "
 "the report."
 msgstr ""
+"Bu rapordan, satış takımınızın performansını telefon görüşmeleri temel "
+"alınarak analiz edebilirsiniz. Bilgileri, çeşitli kriterlere göre "
+"gruplandırabilir ya da süzebilirsiniz ve bu raporda daha çok grup ekleyerek "
+"bilgiyi derinleştirebilirsiniz."
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Mailgateway"
-msgstr ""
+msgstr "Ağgeçidi"
 
 #. module: crm
 #: help:crm.lead,user_id:0
 msgid "By Default Salesman is Administrator when create New User"
-msgstr ""
+msgstr "Yeni Kullanıcı oluştururken Varsayılan Satış Elemanı Yöneticidir"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Mails"
-msgstr ""
+msgstr "Posta sayısı"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Uyarı"
 
 #. module: crm
 #: field:crm.phonecall,name:0
 #: view:res.partner:0
 msgid "Call Summary"
-msgstr ""
+msgstr "Çağrı Özeti"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
@@ -3040,22 +3134,22 @@ msgstr "İşleç"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
 msgid "Phonecall To Phonecall"
-msgstr ""
+msgstr "Telefonçağrısından Telefonçağrısına"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
-msgstr ""
+msgstr "Planlama/Çağrı Kütüğü"
 
 #. module: crm
 #: field:crm.installer,fetchmail:0
 msgid "Fetch Emails"
-msgstr ""
+msgstr "Çekme Epostalar"
 
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Onaylandı"
 
 #. module: crm
 #: help:crm.send.mail,email_cc:0
@@ -3063,16 +3157,18 @@ 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 ""
+"Bu adresler bu e-postanın bir kopyasını alacaklardır. Kalıcı CC listesini "
+"değiştirmek için, bu durumun toplu CC alanını düzenleyiniz."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
-msgstr ""
+msgstr "Onayla"
 
 #. module: crm
 #: field:crm.meeting,su:0
 msgid "Sun"
-msgstr ""
+msgstr "Pazar"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
@@ -3082,7 +3178,7 @@ msgstr "Bölüm"
 #. module: crm
 #: view:crm.lead:0
 msgid "Total of Planned Revenue"
-msgstr ""
+msgstr "Toplam Planlanan Gelir"
 
 #. module: crm
 #: code:addons/crm/crm.py:375
@@ -3091,6 +3187,7 @@ msgid ""
 "You can not escalate, You are already at the top level regarding your sales-"
 "team category."
 msgstr ""
+"Yükseltemezsiniz, satış-takımı kategorisine göre zaten en üzt seviyedesiniz."
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -3100,23 +3197,23 @@ msgstr "Zorunlu Olmayan İfade"
 #. module: crm
 #: selection:crm.meeting,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "Ayın günü"
 
 #. module: crm
 #: field:crm.lead2opportunity,probability:0
 msgid "Success Rate (%)"
-msgstr ""
+msgstr "Başarı Oranı (%)"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
 #: model:crm.case.stage,name:crm.stage_opportunity1
 msgid "New"
-msgstr ""
+msgstr "Yeni"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Mail TO"
-msgstr ""
+msgstr "Şuna Postala"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3138,14 +3235,14 @@ msgstr "Kanal"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule Call"
-msgstr ""
+msgstr "Çağrı Planla"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
-msgstr ""
+msgstr "Kapatılmış/İptal edilmiş Adaylar Fırsata dönüştürülemez."
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -3160,59 +3257,63 @@ msgid ""
 "If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
+"Kategorinin bölümlendirme kriterlerine uyan paydaşlarla sınırlandırıldığını "
+"kontrol edin.                        \n"
+"Eğer işaretliyse, bölümleme kriterlerine uymayan paydaşlardan kategoriyi "
+"kaldırın"
 
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "İtiraz Tarihi/Süresi"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Confidential"
-msgstr ""
+msgstr "Güvenilir"
 
 #. module: crm
 #: help:crm.meeting,date_deadline:0
 msgid ""
 "Deadline Date is automatically                         computed from Start "
 "Date + Duration"
-msgstr ""
+msgstr "Bitiş Tarihi Başlangıç Tarihi + Süre den otomatik olarak hesaplanır"
 
 #. module: crm
 #: field:crm.lead,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Fed. Eyalet"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr ""
+msgstr "Adaylardan iş fırsatları oluşturma"
 
 #. module: crm
 #: help:crm.send.mail,html:0
 msgid "Select this if you want to send email with HTML formatting."
-msgstr ""
+msgstr "HTML formatında e-posta göndermek için bunu seçin."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Need Information"
-msgstr ""
+msgstr "Bilgi Gerekiyor"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
 msgid "Prospect Opportunity"
-msgstr ""
+msgstr "Beklenen Fırsat"
 
 #. module: crm
 #: view:crm.installer:0
 #: model:ir.actions.act_window,name:crm.action_crm_installer
 msgid "CRM Application Configuration"
-msgstr ""
+msgstr "MİY Uygulaması Yapılandırması"
 
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
 msgid "Set Category to"
-msgstr ""
+msgstr "Kategoriyi şuna Ayarla"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -3222,7 +3323,7 @@ msgstr "Yapılandırma"
 #. module: crm
 #: field:crm.meeting,th:0
 msgid "Thu"
-msgstr ""
+msgstr "Perş"
 
 #. module: crm
 #: view:crm.add.note:0
@@ -3233,56 +3334,56 @@ msgstr ""
 #: view:crm.phonecall2phonecall:0
 #: view:crm.send.mail:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Vazgeç"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Ay-1    "
 
 #. module: crm
 #: help:crm.installer,sale_crm:0
 msgid "This module relates sale from opportunity cases in the CRM."
-msgstr ""
+msgstr "Bu modül MİY de fırsat durumundan yapılan satışla ilgilidir."
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Daily"
-msgstr ""
+msgstr "Günlük"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 #: model:crm.case.stage,name:crm.stage_opportunity2
 msgid "Qualification"
-msgstr ""
+msgstr "Yeterlik"
 
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Definition"
-msgstr ""
+msgstr "Aşama Tanımı"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "First"
-msgstr ""
+msgstr "İlk"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Aralik"
 
 #. module: crm
 #: field:crm.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Resim"
 
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition on Communication History"
-msgstr ""
+msgstr "İletişim Geçmişi Koşulları"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3295,28 +3396,35 @@ msgid ""
 "bought goods to another supplier.                  \n"
 "Use this functionality for recurring businesses."
 msgstr ""
+"Bir dönem, bu bölümde satış ve satınalma döngüsü arasındaki günlerin\n"
+"ortalamasıdır.                 \n"
+"Genel olarak uzun bir süre hiç satınalma yapılmamış ve mal satınalmamış bir "
+"paydaşı belirlemek için kullanılır,                  \n"
+"böyle bir durumda ruh durumunun düştüğünü ve başka bir tedarikçiden mal "
+"satınaldığını düşünürüz.                  \n"
+"Bu işlevi yinelenen işler için kullanın."
 
 #. module: crm
 #: view:crm.send.mail:0
 msgid "_Send Reply"
-msgstr ""
+msgstr "_Yanıt Gönder"
 
 #. module: crm
 #: field:crm.meeting,vtimezone:0
 msgid "Timezone"
-msgstr ""
+msgstr "Saat dilimi"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,msg:0
 #: field:crm.lead2partner,msg:0
 #: view:crm.send.mail:0
 msgid "Message"
-msgstr ""
+msgstr "Mesaj"
 
 #. module: crm
 #: field:crm.meeting,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "Cts"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3324,51 +3432,51 @@ msgstr ""
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesman"
-msgstr ""
+msgstr "Satış Elemanı"
 
 #. module: crm
 #: field:crm.lead,date_deadline:0
 msgid "Expected Closing"
-msgstr ""
+msgstr "Beklenen Kapanış"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr ""
+msgstr "Fırsata Telefonçağrısı"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
 msgid "Allows to delete non draft cases"
-msgstr ""
+msgstr "Taslak olmayan durumların silinmesini sağlar"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule Meeting"
-msgstr ""
+msgstr "Toplantı Planla"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Partner Name"
-msgstr ""
+msgstr "Paydaş Adı"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Outbound"
-msgstr ""
+msgstr "Giden"
 
 #. module: crm
 #: field:crm.lead,date_open:0
 #: field:crm.phonecall,date_open:0
 msgid "Opened"
-msgstr ""
+msgstr "Açık"
 
 #. module: crm
 #: view:crm.case.section:0
 #: field:crm.case.section,member_ids:0
 msgid "Team Members"
-msgstr ""
+msgstr "Takım Üyeleri"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3377,17 +3485,17 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Contacts"
-msgstr ""
+msgstr "İlgililer"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Interest in Computer"
-msgstr ""
+msgstr "Bilgisayara İlgisi var"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "Davet Ayrıntısı"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
@@ -3401,17 +3509,19 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Bu e-posta adresleri gönderilmeden önce bütün gelen ve giden e-postaların CC "
+"satırına eklenecektir. Birden fazla e-posta adresini virgül ile ayırınız."
 
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Hata! Yinelemeli üyeler oluşturamazsınız."
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
 msgid "Success Probability"
-msgstr ""
+msgstr "Başarı Olasılığı"
 
 #. module: crm
 #: code:addons/crm/crm.py:426
@@ -3429,12 +3539,12 @@ msgstr "Taslak"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
-msgstr ""
+msgstr "Satış Takımına göre Durumlar"
 
 #. module: crm
 #: field:crm.meeting,attendee_ids:0
 msgid "Attendees"
-msgstr ""
+msgstr "Katılanlar"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3443,38 +3553,38 @@ msgstr ""
 #: model:process.node,name:crm.process_node_meeting0
 #: model:res.request.link,name:crm.request_link_meeting
 msgid "Meeting"
-msgstr ""
+msgstr "Toplantı"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr ""
+msgstr "Durum Kategorisi"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "7 Days"
-msgstr ""
+msgstr "7 Gün"
 
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
-msgstr ""
+msgstr "Aşama ve Kullanıcıya göre Planlanan Gelir"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication & History"
-msgstr ""
+msgstr "İletişim & Geçmiş"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Report"
-msgstr ""
+msgstr "MİY Aday Raporu"
 
 #. module: crm
 #: field:crm.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Yapılandırma Gelişimi"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -3487,61 +3597,61 @@ msgstr "Normal"
 #. module: crm
 #: field:crm.lead,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "Cadde 2"
 
 #. 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 "Toplantı Kategorileri"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2partner:0
 #: view:crm.phonecall2partner:0
 msgid "You may have to verify that this partner does not exist already."
-msgstr ""
+msgstr "Bu paydaşın halihazırda olmadığını doğrulamalızınız."
 
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "Açılış Gecikmesi"
 
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Kullanıcı"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Kasım"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:67
 #, python-format
 msgid "No E-Mail ID Found for your Company address!"
-msgstr ""
+msgstr "Firma adresinizde bir Eposta Kimliği yok!"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
-msgstr ""
+msgstr "Aşamaya göre Fırsatlar"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule Phone Call"
-msgstr ""
+msgstr "Telefon Çağrısı Planla"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Ocak"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_opportunity_stage_act
@@ -3551,16 +3661,19 @@ msgid ""
 "them to easily track how is positioned a specific opportunity in the sales "
 "cycle."
 msgstr ""
+"Satış fırsatlarını koruyarak satışlarınıza ait satış hunilerini daha iyi "
+"organize etmek için özel aşamalar oluşturun. Satış döngüsü içerisinde "
+"belirli bir fırsatın nasıl bir durumda olduğunun kolayca izlenmesini sağlar."
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
 msgid "Contract"
-msgstr ""
+msgstr "Sözleşme"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead4
 msgid "Twitter Ads"
-msgstr ""
+msgstr "Twitter Reklamları"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:26
@@ -3569,28 +3682,28 @@ msgstr ""
 #: code:addons/crm/wizard/crm_send_email.py:270
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Hata"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Planned Revenues"
-msgstr ""
+msgstr "Planlanan Gelir"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Need Consulting"
-msgstr ""
+msgstr "Danışma İsteniyor"
 
 #. module: crm
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "Hata ! Yinelen profiller oluşturamazsınız."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:232
 #, python-format
 msgid "The case '%s' has been closed."
-msgstr ""
+msgstr "'%s' Durumu kapatılmıştır."
 
 #. module: crm
 #: field:crm.lead,partner_address_id:0
@@ -3602,18 +3715,18 @@ msgstr "Cari İletişimi"
 #. module: crm
 #: field:crm.meeting,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "Yinelenen Kimlik tarihi"
 
 #. module: crm
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Aynı kullanıcı adı ile iki kullanıcı oluşturamazsınız !"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:100
 #, python-format
 msgid "Merged into Opportunity: %s"
-msgstr ""
+msgstr "Fırsatla Birleştir: %s"
 
 #. module: crm
 #: code:addons/crm/crm.py:347
@@ -3628,48 +3741,48 @@ msgstr "Kapat"
 #: view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Categorization"
-msgstr ""
+msgstr "Sınıflandırma"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "Eylem Kuralları"
 
 #. module: crm
 #: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Yineleme"
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
 msgid "Phonecall"
-msgstr ""
+msgstr "Telefonçağrısı"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "Perşembe"
 
 #. module: crm
 #: view:crm.meeting:0
 #: field:crm.send.mail,email_to:0
 msgid "To"
-msgstr ""
+msgstr "Kime"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Private"
-msgstr ""
+msgstr "Özel"
 
 #. module: crm
 #: field:crm.lead,function:0
 msgid "Function"
-msgstr ""
+msgstr "İşlev"
 
 #. module: crm
 #: view:crm.add.note:0
 msgid "_Add"
-msgstr ""
+msgstr "_Ekle"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -3705,79 +3818,79 @@ msgstr "Açıklama"
 #: field:res.partner,section_id:0
 #: field:res.users,context_section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Satış Takımı"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayıs"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Interest in Accessories"
-msgstr ""
+msgstr "Aksesuarlara ilgi duyuyor"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:211
 #, python-format
 msgid "The opportunity '%s' has been opened."
-msgstr ""
+msgstr "'%s' Fırsatı açılmıştır."
 
 #. module: crm
 #: field:crm.lead.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "Eposta sayısı"
 
 #. module: crm
 #: field:crm.lead,street:0
 msgid "Street"
-msgstr ""
+msgstr "Cadde"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities by User and Team"
-msgstr ""
+msgstr "Kullanıcıya ve Takıma göre Fırsatlar"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "Çalışma Saatleri"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,is_customer_add:0
 msgid "Customer"
-msgstr ""
+msgstr "Müşteri"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Şubat"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 #: view:res.partner:0
 msgid "Schedule a Meeting"
-msgstr ""
+msgstr "Toplantı Planla"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
 #: model:crm.case.stage,name:crm.stage_opportunity6
 #: view:crm.lead:0
 msgid "Lost"
-msgstr ""
+msgstr "Kayıp"
 
 #. module: crm
 #: field:crm.lead,country_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Ülke"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3785,50 +3898,50 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Fırsata Dönüştür"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Çarşamba"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Nisan"
 
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr ""
+msgstr "Kampanya Adı"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
 msgid "Phone calls by user and section"
-msgstr ""
+msgstr "Kullanıcıya ve bölüme göre telefon çağrıları"
 
 #. module: crm
 #: selection:crm.lead2opportunity.action,name:0
 msgid "Merge with existing Opportunity"
-msgstr ""
+msgstr "Geçerli Fırsatla birleştir"
 
 #. module: crm
 #: field:crm.meeting,select1:0
 msgid "Option"
-msgstr ""
+msgstr "Seçenek"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 #: model:crm.case.stage,name:crm.stage_opportunity4
 msgid "Negotiation"
-msgstr ""
+msgstr "Görüşme"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
-msgstr ""
+msgstr "Bek. Kapanış"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3839,33 +3952,33 @@ msgstr "Sıra No"
 #. module: crm
 #: field:crm.send.mail,body:0
 msgid "Message Body"
-msgstr ""
+msgstr "İleti Gövdesi"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Accept"
-msgstr ""
+msgstr "TAMAM"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
 msgid "Control Variable"
-msgstr ""
+msgstr "Kontrol Değişkeni"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Second"
-msgstr ""
+msgstr "Saniye"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 #: model:crm.case.stage,name:crm.stage_opportunity3
 msgid "Proposition"
-msgstr ""
+msgstr "Önerme"
 
 #. module: crm
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr ""
+msgstr "Telefonçağrısı"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3873,12 +3986,12 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Yıl"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
-msgstr ""
+msgstr "Habermektubu"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
@@ -4285,3 +4398,9 @@ msgstr ""
 
 #~ msgid "Form View"
 #~ msgstr "Formu Göster"
+
+#~ msgid "Telesales"
+#~ msgstr "Telesatış"
+
+#~ msgid "Mail Campaign 1"
+#~ msgstr "Posta Kampanyası 1"
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index da15c68eb6e..2b55be47a1e 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.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-04-11 11:33+0000\n"
-"Last-Translator: lky <Unknown>\n"
+"PO-Revision-Date: 2011-07-01 15:43+0000\n"
+"Last-Translator: hifly <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-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:06+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -36,12 +36,12 @@ msgstr "需要服务"
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Monthly"
-msgstr "按月"
+msgstr "月度"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 msgid "Schedule a PhoneCall"
-msgstr "安排一个电话访问"
+msgstr "安排一次电话访问"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
@@ -67,7 +67,7 @@ msgstr "显示为"
 #: field:crm.meeting,day:0
 #: selection:crm.meeting,select1:0
 msgid "Date of month"
-msgstr "月的天数"
+msgstr "每月的指定日期"
 
 #. module: crm
 #: view:crm.lead:0
@@ -124,10 +124,10 @@ msgid "The code of the sales team must be unique !"
 msgstr "销售团队编码必须唯一！"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
-msgstr "线索'%s'已转化商机"
+msgstr "线索'%s'已转化为商机"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:228
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr "不重复"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -152,7 +152,7 @@ msgstr "警告！"
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Yearly"
-msgstr "按年"
+msgstr "年度"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -172,7 +172,7 @@ msgstr "营销活动"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 msgid "Do not create a partner"
-msgstr "不能创建这业务伙伴"
+msgstr "不能创建业务伙伴"
 
 #. module: crm
 #: view:crm.lead:0
@@ -184,7 +184,7 @@ msgstr "搜索商机"
 #, python-format
 msgid ""
 "Opportunity must have Partner assigned before merging with other Opportunity."
-msgstr "必须要为商机选择一个业务伙伴才能进行商机合并."
+msgstr "必须为商机选择业务伙伴才能和其它商机合并."
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:46
@@ -536,9 +536,9 @@ msgstr "第一次与新的潜在客户接触"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -597,7 +597,7 @@ msgstr "销售FAQ"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail_attachment
 msgid "crm.send.mail.attachment"
-msgstr ""
+msgstr "crm.send.mail.attachment"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -805,8 +805,8 @@ msgid "Statistics Dashboard"
 msgstr "统计控制台"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -870,7 +870,7 @@ msgstr "事件类型"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_installer
 msgid "crm.installer"
-msgstr ""
+msgstr "crm.installer"
 
 #. module: crm
 #: field:crm.segmentation,exclusif:0
@@ -1099,7 +1099,7 @@ msgstr "订阅"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2610,7 +2610,7 @@ msgid "Meeting Type"
 msgstr "会议类型"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr "合并现有的商机"
@@ -3128,8 +3128,8 @@ msgid "Schedule Call"
 msgstr "计划的电话访问"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr "已结束/已取消的线索不能转换为商机"
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index 92221068e25..f68bea03880 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -25,9 +25,9 @@ from crm import crm
 
 AVAILABLE_STATES = [
     ('draft','Draft'),
-    ('open','Open'),
+    ('open','Todo'),
     ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
+    ('done', 'Held'),
     ('pending','Pending')
 ]
 
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index bc2ce828f5e..acc91cbef41 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -108,7 +108,7 @@
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
-                        <filter string="Type" icon="terp-stock_symbol-selection"
+                        <filter string="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
                         <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 9df185ae831..659ef075b7f 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -54,82 +54,14 @@
                         <tree string="Phone Calls" colors="gray:state in ('draft', 'cancel','done','pending')">
                             <field name="date" string="Date"/>
                             <field name="name" string="Call Summary"/>
-                            <field name="categ_id" string="Type" widget="selection"/>
+                            <field name="categ_id" widget="selection"/>
                             <field name="user_id"/>
                             <field name="state"/>
                             <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                            <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                            <button name="case_open" string="Todo" states="draft,pending" type="object" icon="gtk-go-forward"/>
                             <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
                             <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause"/>
                         </tree>
-            <form string="Phone Call">
-                 <group colspan="6" col="7">
-                    <field name="name" required="1"/>
-                    <field name="partner_phone"   attrs="{'required': [('categ_id.name', '=', 'Outbound')]}"/>
-                    <field name="duration" widget="float_time" required="1"/>
-                    <button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/>
-
-                    <field name="date" required="1"/>
-                    <field name="user_id"/>
-                    <field name="section_id" colspan="1" widget="selection" />
-                    <button string="Convert to Opportunity"
-                        name="%(phonecall2opportunity_act)d"
-                        icon="gtk-index" type="action"
-                        attrs="{'invisible':[('opportunity_id','!=',False)]}" />
-                    <label colspan="6"  string=""/>
-                    <button string="Schedule Other Call"
-                     icon="terp-call-start"
-                    name="%(phonecall_to_phonecall_act)d"
-                    type="action"  />
-
-                </group>
-
-                <group col="3" colspan="2">
-                    <separator colspan="3" string="Contacts" />
-                    <field name="partner_id"
-                        on_change="onchange_partner_id(partner_id, email_from)" />
-                    <button string="Create a Partner"
-                        icon="terp-partner"
-                        name="%(action_crm_phonecall2partner)d"
-                        type="action"
-                        attrs="{'invisible':[('partner_id','!=',False)]}"
-                        groups="base.group_partner_manager" />
-                    <newline/>
-                    <field name="partner_address_id"
-                        on_change="onchange_partner_address_id(partner_address_id, email_from)" />
-                    <newline/>
-                    <field name="partner_mobile" />
-                </group>
-                <group col="2" colspan="2">
-                    <separator colspan="2" string="Categorization" />
-                    <field name="categ_id" widget="selection"
-                        domain="[('object_id.model', '=', 'crm.phonecall')]"
-                        string="Type" />
-                    <field name="priority"/>
-                    <field name="opportunity_id"/>
-                </group>
-                <separator string="Description" colspan="4" />
-                <field name="description" nolabel="1" colspan="4" />
-                <separator colspan="4" />
-                <group col="8" colspan="4">
-                    <field name="state" select="1" />
-                    <button name="case_cancel" string="Cancel"
-                        states="draft,open,pending" type="object"
-                        icon="gtk-cancel" />
-                    <button name="case_open" string="Open"
-                        states="draft,pending" type="object"
-                        icon="gtk-go-forward" />
-                    <button name="case_pending" string="Not Held"
-                        states="open" type="object" icon="gtk-media-pause" />
-                    <button name="case_close" string="Held"
-                        states="open,draft,pending" type="object"
-                        icon="gtk-jump-to" />
-                    <button name="case_reset" string="Reset to Draft"
-                        states="done,cancel" type="object"
-                        icon="gtk-convert" />
-                </group>
-            </form>
-                        
                     </field>
                 </page>
             </field>
diff --git a/addons/crm/test/test_crm_meeting.yml b/addons/crm/test/test_crm_meeting.yml
index ae52a747bf2..9b89fff697b 100644
--- a/addons/crm/test/test_crm_meeting.yml
+++ b/addons/crm/test/test_crm_meeting.yml
@@ -57,7 +57,7 @@
   !python {model: crm.meeting}: |
      import time
      from datetime import datetime, date, timedelta
-     ids = self.search(cr, uid, [('date', '>=', time.strftime('%Y-%m-%d 00:00:00')), ('date', '<=', (datetime.now()+timedelta(31)).strftime('%Y-%m-%d 00:00:00')), ('name', '=', 'Regarding Presentation')] )
+     ids = self.search(cr, uid, [('date', '>=', time.strftime('%Y-%m-%d 00:00:00')), ('date', '<=', (datetime.now()+timedelta(31)).strftime('%Y-%m-%d 00:00:00')), ('name', '=', 'Regarding Presentation')], context={'virtual_id': True})
      assert len(ids) == 10      
 
 - |
diff --git a/addons/crm/test/test_crm_recurrent_meeting_case2.yml b/addons/crm/test/test_crm_recurrent_meeting_case2.yml
new file mode 100644
index 00000000000..585c6af73ae
--- /dev/null
+++ b/addons/crm/test/test_crm_recurrent_meeting_case2.yml
@@ -0,0 +1,98 @@
+-
+  In order to test recurrent meetings in OpenERP, I create meetings with different recurrency using different test cases.
+-
+  I create a recurrent meeting with daily recurrency and fixed amount of time.
+- 
+  !record {model: crm.meeting, id: crm_meeting_testmeeting0}:
+    count: 5
+    date: '2011-04-13 11:04:00'
+    date_deadline: '2011-04-13 12:04:00'
+    day: 0.0
+    duration: 1.0
+    name: Test Meeting
+    recurrency: true
+    recurrent_uid: 0.0
+    rrule_type: daily
+    sequence: 0.0
+-
+  I search for all the recurrent meetings.
+-
+  !python {model: crm.meeting}: |
+     meeting_ids = self.search(cr, uid, [('id', 'in', [ref('crm_meeting_testmeeting0')]),('date','>=','2011-03-13'), ('date_deadline', '<=', '2011-05-13')], context={'virtual_id': True})
+     assert len(meeting_ids) == 5, 'Recurrent daily meetings are not created !'
+-
+  Now I create a weekly meeting till a particular end date.
+-
+  !record {model: crm.meeting, id: crm_meeting_reviewcodewithprogrammer0}:
+    date: '2011-04-18 11:47:00'
+    date_deadline: '2011-04-18 12:47:00'
+    day: 0.0
+    duration: 1.0
+    end_date: '2011-04-30'
+    end_type: end_date
+    fr: true
+    mo: true
+    th: true
+    tu: true
+    we: true
+    name: Review code with programmer
+    recurrency: true
+    recurrent_uid: 0.0
+    rrule_type: weekly
+    sequence: 0.0
+-
+  I search for all the recurrent weekly meetings.
+-
+  !python {model: crm.meeting}: |
+     meeting_ids = self.search(cr, uid, [('id', 'in', [ref('crm_meeting_reviewcodewithprogrammer0')]),('date','>=','2011-03-13'), ('date_deadline', '<=', '2011-05-13')], context={'virtual_id': True})
+     assert len(meeting_ids) == 10, 'Recurrent weekly meetings are not created !'
+-
+  I want to schedule a meeting every month for Sprint review.
+- 
+  !record {model: crm.meeting, id: crm_meeting_sprintreview0}:
+    count: 12
+    date: '2011-04-01 12:01:00'
+    date_deadline: '2011-04-01 13:01:00'
+    day: 1
+    duration: 1.0
+    name: Sprint Review
+    recurrency: true
+    recurrent_uid: 0.0
+    rrule_type: monthly
+    sequence: 0.0
+-
+  I search for all the recurrent monthly meetings.
+-
+  !python {model: crm.meeting}: |
+     meeting_ids = self.search(cr, uid, [('id', 'in', [ref('crm_meeting_sprintreview0')]),('date','>=','2011-03-01'), ('date_deadline', '<=', '2012-05-13')], context={'virtual_id': True})
+     assert len(meeting_ids) == 12, 'Recurrent monthly meetings are not created !'
+-
+  I change name of my monthly Sprint Review meeting.
+-
+  !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})
+-
+  I check whether all the records are edited or not.
+-
+  !python {model: crm.meeting}: |
+     meeting_ids = self.search(cr, uid, [('id', 'in', [ref('crm_meeting_sprintreview0')]),('date','>=','2011-03-01'), ('date_deadline', '<=', '2012-05-13')], context={'virtual_id': True})
+     meetings = self.browse(cr, uid, meeting_ids, context)
+     for meeting in meetings:
+        assert meeting.name == 'Sprint Review for google modules', 'Name not changed for id: %s' %meeting.id
+-
+  I change description of my weekly meeting Review code with programmer.
+-
+  !python {model: crm.meeting}: |
+     from base_calendar import base_calendar
+     base_cal_id = base_calendar.real_id2base_calendar_id(ref('crm_meeting_reviewcodewithprogrammer0'), '2011-04-25 12:47:00')
+     self.write(cr, uid, [base_cal_id], {'description': 'Review code of the module: sync_google_calendar.'})
+-
+  I check whether the record is edited perfectly or not.
+-
+  !python {model: crm.meeting}: |
+     meeting_ids = self.search(cr, uid, [('recurrent_uid', '=', ref('crm_meeting_reviewcodewithprogrammer0')), ('recurrent_id','=','2011-04-25 12:47:00')], context)
+     assert meeting_ids, 'Meeting is not edited !'
+
+     
\ No newline at end of file
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 5dc7e489f26..790c6222de6 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -149,7 +149,6 @@ class crm_lead2partner(osv.osv_memory):
         contact_obj = self.pool.get('res.partner.address')
         partner_ids = []
         partner_id = False
-        contact_id = False
         rec_ids = context and context.get('active_ids', [])
 
         for data in self.browse(cr, uid, ids, context=context):
@@ -160,7 +159,7 @@ class crm_lead2partner(osv.osv_memory):
                         'user_id': lead.user_id.id,
                         'comment': lead.description,
                     })
-                    contact_id = contact_obj.create(cr, uid, {
+                    contact_obj.create(cr, uid, {
                         'partner_id': partner_id,
                         'name': lead.contact_name,
                         'phone': lead.phone,
@@ -180,7 +179,6 @@ class crm_lead2partner(osv.osv_memory):
                 else:
                     if data.partner_id:
                         partner_id = data.partner_id.id
-                        contact_id = partner_obj.address_get(cr, uid, [partner_id])['default']
                 self.assign_partner(cr, uid, lead.id, partner_id)
                 partner_ids.append(partner_id)
         return partner_ids
diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index 248bff2e0e4..57620f8c016 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
@@ -67,6 +66,8 @@ class crm_merge_opportunity(osv.osv_memory):
             ids = list(set(ids) - set(context.get('lead_ids', False)) )
         lead_obj = self.pool.get('crm.lead')
         op_id = lead_obj.search(cr, uid, [('id', 'in', ids)], order='create_date' , context=context)
+        if not op_id:
+            return False
         opps = lead_obj.browse(cr, uid, [op_id[0]], context=context)
         return opps[0]
         
@@ -139,7 +140,7 @@ class crm_merge_opportunity(osv.osv_memory):
             attach_ids = self.get_attachments(cr, uid, opp, context=context)
             self.set_attachements_res_id(cr, uid, first_opportunity.id, attach_ids)
             for history in opp.message_ids:
-                new_history = message_obj.write(cr, uid, history.id, {'res_id': first_opportunity.id, 'name' : _("From %s : %s") % (opp.name, history.name) }, context=context)
+                message_obj.write(cr, uid, history.id, {'res_id': first_opportunity.id, 'name' : _("From %s : %s") % (opp.name, history.name) }, context=context)
 
         #Notification about loss of information
         details = []
@@ -182,8 +183,6 @@ class crm_merge_opportunity(osv.osv_memory):
 
 
         # Get Opportunity views
-        result = models_data._get_id(
-            cr, uid, 'crm', 'view_crm_case_opportunities_filter')
         opportunity_view_form = models_data._get_id(
             cr, uid, 'crm', 'crm_case_form_view_oppor')
         opportunity_view_tree = models_data._get_id(
@@ -227,7 +226,7 @@ class crm_merge_opportunity(osv.osv_memory):
         This function gets default values
         @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 uid: the current users ID for security checks,
         @param fields: List of fields for default value
         @param context: A standard dictionary for contextual values
 
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index 8fc7ffb310d..714376766f6 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -21,6 +21,10 @@
 
 from osv import osv, fields
 from tools.translate import _
+import pprint
+pp = pprint.PrettyPrinter(indent=4)
+
+import time
 
 class crm_opportunity2phonecall(osv.osv_memory):
     """Converts Opportunity to Phonecall"""
@@ -31,11 +35,13 @@ class crm_opportunity2phonecall(osv.osv_memory):
     _columns = {
         'name' : fields.char('Call summary', size=64, required=True, select=1),
         'user_id' : fields.many2one('res.users', "Assign To"),
-        'date': fields.datetime('Date' , required=True),
+        'partner_id' : fields.many2one('res.partner', "Partner"),
+        'date': fields.datetime('Date'),
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'categ_id': fields.many2one('crm.case.categ', 'Category', required=True, \
+        'categ_id': fields.many2one('crm.case.categ', 'Category',  \
                         domain="['|',('section_id','=',False),('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.phonecall')]"), 
+                        ('object_id.model', '=', 'crm.phonecall')]"),
+        'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True), 
     }
 
     def default_get(self, cr, uid, fields, context=None):
@@ -58,6 +64,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
 
         record_ids = context and context.get('active_ids', []) or []
         res = super(crm_opportunity2phonecall, self).default_get(cr, uid, fields, context=context)
+        res.update({'action': 'schedule', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
         for opp in opp_obj.browse(cr, uid, record_ids, context=context):
             if 'name' in fields:
                 res.update({'name': opp.name})
@@ -67,6 +74,8 @@ class crm_opportunity2phonecall(osv.osv_memory):
                 res.update({'section_id': opp.section_id and opp.section_id.id or False})
             if 'categ_id' in fields:
                 res.update({'categ_id': categ_id})
+            if 'partner_id' in fields:
+                res.update({'partner_id': opp.partner_id and opp.partner_id.id or False})
         return res
 
     def action_cancel(self, cr, uid, ids, context=None):
@@ -112,23 +121,27 @@ class crm_opportunity2phonecall(osv.osv_memory):
 
         for this in self.browse(cr, uid, ids, context=context):
             for opp in opp_obj.browse(cr, uid, record_ids, context=context):
-                new_case = phonecall_obj.create(cr, uid, {
+                vals = {
                         'name' : opp.name,
-                        'case_id' : opp.id ,
+                        'case_id' : opp.id,
                         'user_id' : this.user_id and this.user_id.id or False,
                         'categ_id' : this.categ_id.id,
                         'description' : opp.description or False,
                         'date' : this.date,
-                        'section_id' : this.section_id.id or opp.section_id.id or False,
+                        'section_id' : this.section_id.id or False,
                         'partner_id': opp.partner_id and opp.partner_id.id or False,
                         'partner_address_id': opp.partner_address_id and opp.partner_address_id.id or False,
                         'partner_phone' : opp.phone or (opp.partner_address_id and opp.partner_address_id.phone or False),
                         'partner_mobile' : opp.partner_address_id and opp.partner_address_id.mobile or False,
                         'priority': opp.priority,
-                        'opportunity_id': opp.id
-                }, context=context)
-
-                phonecall_obj.case_open(cr, uid, [new_case])
+                        'opportunity_id': opp.id,
+                        'date_open': time.strftime('%Y-%m-%d %H:%M:%S')
+                }
+                
+                new_case = phonecall_obj.create(cr, uid, vals, context=context)
+               
+                if this.action == 'log':
+                    phonecall_obj.case_close(cr, uid, [new_case])
 
             value = {
                 'name': _('Phone Call'),
@@ -139,7 +152,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
                 'res_id' : new_case,
                 'views': [(id3, 'form'), (id2, 'tree'), (False, 'calendar')],
                 'type': 'ir.actions.act_window',
-                'search_view_id': res['res_id']
+                'search_view_id': res['res_id'],
             }
         return value
 
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 9a623d2eaab..764648a877b 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -9,19 +9,22 @@
             <field name="model">crm.opportunity2phonecall</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Schedule a PhoneCall">
-                    <separator string="Schedule a PhoneCall" colspan="4"/>
+                <form string="Schedule/Log a call">
+                 	<separator string="Schedule/Log a call" colspan="4"/>
+                    <field name="action"/>
+                    <separator string="Call Details" colspan="4"/>
                     <field name="name"/>
-                    <field name="date" string="Planned Date"/>
+                    <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
                     <newline/>
-                    <field name="user_id" />
+                    <field name="partner_id" readonly="True"/>
+                    <field name="user_id" />                    
                     <field name="section_id" widget="selection" />
                     <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                     <separator string="" colspan="4"/>
-                    <group colspan="4">
-                        <label string ="" colspan="2"/>
+                    <group colspan="4" col="3">
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="action_apply" type="object" string="_Schedule Call" icon="gtk-ok" />
+                       	<button name="action_apply" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
+                        <button name="action_apply" type="object" string="Schedule call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
                     </group>
                 </form>
             </field>
@@ -30,7 +33,7 @@
 		<!-- Opportunity to Phonecall action -->
 
  		<record model="ir.actions.act_window" id="opportunity2phonecall_act">
-            <field name="name">Schedule Call</field>
+            <field name="name">Schedule/Log Call</field>
             <field name="res_model">crm.opportunity2phonecall</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity.py b/addons/crm/wizard/crm_phonecall_to_opportunity.py
index 32810d2f15e..549afa0559b 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity.py
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity.py
@@ -31,43 +31,14 @@ class crm_phonecall2opportunity(osv.osv_memory):
     def action_cancel(self, cr, uid, ids, context=None):
         """
         Closes Phonecall to Opportunity form
-        @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 Phonecall to Opportunity's IDs
-        @param context: A standard dictionary for contextual values
         """
 
         return {'type':'ir.actions.act_window_close'}
 
-    def view_init(self, cr, uid, fields, context=None):
-        """
-        This function checks for precondition before wizard executes
-        @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 fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
-
-        """
-        phonecall_obj = self.pool.get('crm.phonecall')
-        record_id = context and context.get('active_id', False) or False
-        case = phonecall_obj.browse(cr, uid, record_id, context=context)
-        if case.state in ['done', 'cancel']:
-                raise osv.except_osv(_("Warning"), _("Closed/Cancelled Phone \
-Call can not be converted into Opportunity"))
-
 
     def action_apply(self, cr, uid, ids, context=None):
         """
         This converts Phonecall to Opportunity and opens Phonecall view
-        @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 Phonecall to Opportunity IDs
-        @param context: A standard dictionary for contextual values
-
-        @return : Dictionary value for created Opportunity form
         """
         record_id = context and context.get('active_id', False) or False
         if record_id:
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall.py b/addons/crm/wizard/crm_phonecall_to_phonecall.py
index aaba8e082c5..2872acad4eb 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall.py
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall.py
@@ -22,6 +22,8 @@
 from osv import osv, fields
 from tools.translate import _
 
+import time
+
 class crm_phonecall2phonecall(osv.osv_memory):
     """ Converts Phonecall to Phonecall"""
 
@@ -84,6 +86,10 @@ class crm_phonecall2phonecall(osv.osv_memory):
                         'date': this.date
                           }
                 phonecall_id = phonecall_obj.create(cr, uid, values, context=context)
+                if this.action == 'schedule':
+                    phonecall_obj.case_open(cr, uid, [phonecall_id])
+                elif this.action == 'log':
+                    phonecall_obj.case_close(cr, uid, [phonecall_id])
             
             res = {
                 'name': _('Phone Call'),
@@ -102,11 +108,13 @@ class crm_phonecall2phonecall(osv.osv_memory):
     _columns = {
                 'name' : fields.char('Call summary', size=64, required=True, select=1),
                 'user_id' : fields.many2one('res.users',"Assign To"),
-                'categ_id': fields.many2one('crm.case.categ', 'Category', required=True, \
+                'categ_id': fields.many2one('crm.case.categ', 'Category', \
                         domain="['|',('section_id','=',False),('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.phonecall')]"), 
-                'date': fields.datetime('Date', required=True),
+                'date': fields.datetime('Date'),
                 'section_id':fields.many2one('crm.case.section','Sales Team'),
+                'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True),
+                'partner_id' : fields.many2one('res.partner', "Partner"),
                 }
 
     def default_get(self, cr, uid, fields, context=None):
@@ -122,7 +130,7 @@ class crm_phonecall2phonecall(osv.osv_memory):
         """
         res = super(crm_phonecall2phonecall, self).default_get(cr, uid, fields, context=context)
         record_id = context and context.get('active_id', False) or False
-        
+        res.update({'action': 'schedule', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
         if record_id:
             phonecall = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
 
@@ -142,6 +150,8 @@ class crm_phonecall2phonecall(osv.osv_memory):
                 res.update({'section_id': phonecall.section_id and phonecall.section_id.id or False})
             if 'categ_id' in fields:
                 res.update({'categ_id': categ_id})
+            if 'partner_id' in fields:
+                res.update({'partner_id': phonecall.partner_id and phonecall.partner_id.id or False})
         return res
 
 crm_phonecall2phonecall()
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index 82c3191a17b..794634da4f1 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -9,18 +9,21 @@
             <field name="model">crm.phonecall2phonecall</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Schedule Other Call">
-                        <separator string="Schedule Other Call" colspan="4"/>
+                <form string="Schedule/Log a call">
+                        <separator string="Schedule/Log a call" colspan="4"/>
+                        <field name="action"/>
+                        <separator string="Call Details" colspan="4"/>
                         <field name="name"/>
-                        <field name="date" string="Planned Date"/>
+                        <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
+                        <field name="partner_id" readonly="True"/>
                         <field name="user_id" />
                         <field name="section_id"/>
                         <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                         <separator string=" " colspan="4"/>
                         <group colspan="4" col="3" >
-                            <label string=" " />
                             <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                            <button name="action_apply" type="object" string="_Schedule" icon="gtk-go-forward" />
+                            <button name="action_apply" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
+                            <button name="action_apply" type="object" string="Schedule call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
                         </group>
                 </form>
             </field>
diff --git a/addons/crm_caldav/crm_caldav_view.xml b/addons/crm_caldav/crm_caldav_view.xml
index b8b0ffdea03..a610095d6a6 100644
--- a/addons/crm_caldav/crm_caldav_view.xml
+++ b/addons/crm_caldav/crm_caldav_view.xml
@@ -5,7 +5,7 @@
             <field name="name">Caldav Browse</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">user.preference</field>
-            <field name="view_id" ref="caldav.user_prefernce_form"/>
+            <field name="view_id" ref="caldav.host_prefernce_form"/>
             <field name="context">{'cal_name' : 'Meetings'}</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 05634d564b8..c5755085216 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -181,7 +181,7 @@ class crm_claim(crm.crm_case, osv.osv):
         """
         mailgate_pool = self.pool.get('email.server.tools')
 
-        subject = msg.get('subject')
+        subject = msg.get('subject') or _("No Subject")
         body = msg.get('body')
         msg_from = msg.get('from')
         priority = msg.get('priority')
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index ec842a2c791..842ede252df 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -306,41 +306,41 @@
             </field>
         </record>
 
-		<record id="base.view_crm_partner_info_History1" model="ir.ui.view">
-			<field name="name">res.partner.crm.history.inherit1</field>
-			<field name="model">res.partner</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="base.view_partner_form"/>
-			<field name="arch" type="xml">
-				<xpath expr="/form/notebook/page[@string='History']" position="attributes">
-					<attribute name="invisible">False</attribute>
-				</xpath>
-			</field>
-		</record>	
-		<record id="view_claim_partner_info_form1" model="ir.ui.view">
-			<field name="name">res.partner.claim.info.form</field>
-			<field name="model">res.partner</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="base.view_partner_form"/>
-			<field name="priority">20</field>
-			<field name="arch" type="xml">
-				<data>
-					<xpath expr="/form/notebook/page[@string='History']" position="inside">
-						<field name="claims_ids" colspan="4" nolabel="1">
-							<tree string="Partners Claim" editable="bottom">
-								<field name="name"/>
-							</tree>
-						</field>
-					</xpath>
-				</data>
-			</field>
-		</record>		
+        <record id="base.view_crm_partner_info_History1" model="ir.ui.view">
+            <field name="name">res.partner.crm.history.inherit1</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page[@string='History']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+            </field>
+        </record>    
+        <record id="view_claim_partner_info_form1" model="ir.ui.view">
+            <field name="name">res.partner.claim.info.form</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="priority">20</field>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="/form/notebook/page[@string='History']" position="inside">
+                        <field name="claims_ids" colspan="4" nolabel="1">
+                            <tree string="Partners Claim" editable="bottom">
+                                <field name="name"/>
+                            </tree>
+                        </field>
+                    </xpath>
+                </data>
+            </field>
+        </record>        
 
         <act_window
             context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
             id="act_claim_partner"
-            name="Report a Claim"
-            view_mode="form,tree"
+            name="Claims"
+            view_mode="tree,form"
             res_model="crm.claim"
             src_model="res.partner"/>
 
@@ -349,8 +349,8 @@
             domain="[('partner_address_id', '=', active_id)]"
             context="{'default_partner_id': partner_id}"
             id="act_claim_partner_address"
-            name="Report a Claim"
-            view_mode="form,tree"
+            name="Claims"
+            view_mode="tree,form"
             res_model="crm.claim"
             src_model="res.partner.address"/>
 
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 30a2af63512..5d02ec12369 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -24,6 +24,7 @@ from osv import fields, osv
 import time
 import binascii
 import tools
+from tools.translate import _
 
 CRM_HELPDESK_STATES = (
     crm.AVAILABLE_STATES[2][0], # Cancelled
@@ -104,7 +105,7 @@ class crm_helpdesk(crm.crm_case, osv.osv):
         """
         mailgate_pool = self.pool.get('email.server.tools')
 
-        subject = msg.get('subject')
+        subject = msg.get('subject') or _("No Subject")
         body = msg.get('body')
         msg_from = msg.get('from')
         priority = msg.get('priority')
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 348492cc308..38536289bb5 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -180,7 +180,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Helpdesk Support Tree"
-                    colors="black:state=='open';blue:state=='pending';gray:state in ('cancel','close')">
+                    colors="black:state=='open';blue:state=='pending';gray:state in ('cancel','done')">
                     <field name="name" string="Query" />
                     <field name="partner_id" string="Partner"/>
                     <field name="date" string="Date"/>
diff --git a/addons/crm_helpdesk/i18n/fi.po b/addons/crm_helpdesk/i18n/fi.po
new file mode 100644
index 00000000000..82c5bfc5a41
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/fi.po
@@ -0,0 +1,695 @@
+# Finnish 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-06-28 09:47+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-29 04:43+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to Close"
+msgstr "Sulkemisen viive"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr "Tapausten määrä"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr "Ryhmittely.."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Today"
+msgstr "Tänään"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr "Maaliskuu"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr "Yritys"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr "Seuraajien Sähköpostit"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr "Korkein"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr "Päivä"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Add Internal Note"
+msgstr "Lisää sisäinen huomautus"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr "Huomautukset"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr "Viestit"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr "Peruttu"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Kumppanin Yhteystiedot"
+
+#. 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 "Helpdeskin analyysi"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_closed:0
+msgid "Close Date"
+msgstr "Sulkemispäivä"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "   Month   "
+msgstr "   Kuukausi   "
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr "Viite"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr "Seuraava Toimenpide"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr "Helpdesk tukee"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr "Lisätiedot"
+
+#. 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 "Kumppani"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr "Arviot"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr "Osa"
+
+#. 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 "Prioriteetti"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send New Email"
+msgstr "Lähetä uusi sähköposti"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Won"
+msgstr "Voitettu"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Ylitetty aikaraja"
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr "Helpdesk raportti jälkimarkkinointipalveluista"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr "Sähköposti"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,canal_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,canal_id:0
+msgid "Channel"
+msgstr "Kanava"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr "Alin"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "# Mails"
+msgstr "Sähköpostien määrä"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+#: field:crm.helpdesk.report,create_date:0
+msgid "Creation Date"
+msgstr "Luontipäivämäärä"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr "Palauta luonnokseksi"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr "Odottava"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr "Määräaika"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr "Heinäkuu"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr "Helpdesk kategoriat"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr "Kategoriat"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History Information"
+msgstr "Historiatiedot"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr "Päivämäärät"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "    Month-1    "
+msgstr "    Kuukausi-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 "Viitteet"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr "Syyskuu"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr "Viestintä"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr "Kuukausi"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr "Kohota"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr "Päivityksen päiväys"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr "Kysely"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Salesman"
+msgstr "Myyjä"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr "Viittaus 2"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+#: field:crm.helpdesk.report,categ_id:0
+msgid "Category"
+msgstr "Kategoria"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "  Year  "
+msgstr "  Vuosi  "
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr "Helpdeskin tuki"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+#: field:crm.helpdesk.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "Suunnitellut kulut"
+
+#. module: crm_helpdesk
+#: model:ir.module.module,description:crm_helpdesk.module_meta_information
+msgid "Helpdesk Management"
+msgstr "Helpdeskin hallinta"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr "Hae helpdeskiä"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr "Luonnos"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr "Matala"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr "Suljettu"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "7 Days"
+msgstr "7 päivää"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication & History"
+msgstr "Kommunikaatio ja historia"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr "Elokuu"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr "Tavallinen"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Global CC"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr "Kesäkuu"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Suunniteltu liikevaihto"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr "Käyttäjä"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr "Aktiivinen"
+
+#. 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 "Laajennetut Suotimet..."
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr "Helpdesk pyynnöt"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr "Etsi"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr "Lokakuu"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr "Tammikuu"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "These people will receive email."
+msgstr "Nämä henkilöt vastaanottavat sähköpostin."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr "Päiväys"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr "Marraskuu"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History"
+msgstr "Historia"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Attachments"
+msgstr "Liitteet"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr "Sekalaiset"
+
+#. 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 "Tila"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr "Yleinen"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send Reminder"
+msgstr "Lähetä muistutus"
+
+#. 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 ""
+"Myyntitiili mille tapaus kuuluu. Määrittele vastuuhenkilö ja "
+"sähköpostiosoite sähköpostin välityspalvelimelle"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Done"
+msgstr "Valmis"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr "Joulukuu"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr "Peruuta"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr "Sulje"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr "Avaa"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr "Helpdeskin tukipuu"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr "Kategorisointi"
+
+#. 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 "Vastuuhenkilö"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Current"
+msgstr "Nykyinen"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Details"
+msgstr "Yksityiskohdat"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reply"
+msgstr "Vastaa"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr "Kuvaus"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr "Toukokuu"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr "Todennäköisyys (%)"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,email:0
+msgid "# Emails"
+msgstr "Sähköpostien määrä"
+
+#. 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 ""
+"Kanavat kuvaavat erilaisia kommunikaatiomuotoja joiden kautta voidaan "
+"viestiä asiakkaan kanssa."
+
+#. 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 ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr "Helmikuu"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr "Nimi"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Lost"
+msgstr "Hävitty"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr "Helpdesk ja tuki"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr "Huhtikuu"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Case(s)"
+msgstr "Omat tapaukset"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,id:0
+msgid "ID"
+msgstr ""
+
+#. 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 "Korkea"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+#: view:crm.helpdesk.report:0
+msgid "Sales Team"
+msgstr "Myyntitiimi"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr "Viimeisin tapahtuma"
+
+#. 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 "Vuosi"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr "Kesto"
diff --git a/addons/crm_helpdesk/i18n/gl.po b/addons/crm_helpdesk/i18n/gl.po
new file mode 100644
index 00000000000..104dd6a38a5
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/gl.po
@@ -0,0 +1,714 @@
+# Galician 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-06-08 16:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@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-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to Close"
+msgstr "Atraso para pechar"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr "Nº de casos"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Today"
+msgstr "Hoxe"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr "Destinatarios de correos electrónicos (CC)"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr "A máis alta"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Add Internal Note"
+msgstr "Engadir nota interna"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr "Mensaxes"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr "Anulado"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contacto"
+
+#. 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 "Análise Helpdesk"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_closed:0
+msgid "Close Date"
+msgstr "Data de peche"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr "Seguinte acción"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr "Asistencia técnica"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr "Información adicional"
+
+#. 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 "Socio"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr "Estimacións"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr "Sección"
+
+#. 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 "Prioridade"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send New Email"
+msgstr "Enviar novo email"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Won"
+msgstr "Ganado"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Data límite excedida"
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr "Informe Helpdesk despois do servizo de vendas"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr "E-mail"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,canal_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,canal_id:0
+msgid "Channel"
+msgstr "Canle"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr "A máis baixa"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "# Mails"
+msgstr "Nº de emails"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+#: field:crm.helpdesk.report,create_date:0
+msgid "Creation Date"
+msgstr "Data de creación"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr "Cambiar a modo Borrador"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr "Pendente"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr "Data límite"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr "Xullo"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr "Categorías Helpdesk"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History Information"
+msgstr "Información histórica"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr "Datas"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "#Helpdesk"
+msgstr "nº Helpdesk"
+
+#. 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 ""
+"Estes enderezos de correo engadiranse ó campo CC para tódolos correos "
+"entrantes e saíntes deste rexistro antes de ser enviados. Separe os "
+"diferentes enderezos de correo cunha coma."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr "Escalar"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr "Data de actualización"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr "Consulta"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Salesman"
+msgstr "Vendedor"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr "Referencia 2"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+#: field:crm.helpdesk.report,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "  Year  "
+msgstr "  Ano  "
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr "Asistencia técnica"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+#: field:crm.helpdesk.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "Custos planeados"
+
+#. module: crm_helpdesk
+#: model:ir.module.module,description:crm_helpdesk.module_meta_information
+msgid "Helpdesk Management"
+msgstr "Gestión do Helpdesk"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr "Buscar Helpdesk"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr "Proxecto"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr "Baixo"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr "Pechado"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "7 Days"
+msgstr "7 días"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication & History"
+msgstr "Comunicación e historial"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Global CC"
+msgstr "CC global"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr "Xuño"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Ingresos previstos"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: crm_helpdesk
+#: model:ir.module.module,shortdesc:crm_helpdesk.module_meta_information
+msgid "CRM Helpdesk"
+msgstr "CRM Helpdesk"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr "Solicitudes Helpdesk"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr "Xaneiro"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "These people will receive email."
+msgstr "Estas persoas recibirán un e-mail."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr "Novembro"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History"
+msgstr "Historial"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Attachments"
+msgstr "Anexos"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr "Varios"
+
+#. 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 "Estado"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr "Xeral"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send Reminder"
+msgstr "Enviar recordatorio"
+
+#. 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 ""
+"Equipo de vendas ó cal pertence o caso. Defina un usuario responsable e o "
+"seu email para o mail gateway"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Done"
+msgstr "Feito"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr "Decembro"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr "Anular"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr "Pechar"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr "Árbore de soporte técnico"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr "Categorización"
+
+#. 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 "Asistencia técnica"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reply"
+msgstr "Resposta"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr "Descrición"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr "Maio"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr "Probabilidade (%)"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,email:0
+msgid "# Emails"
+msgstr "Nº de emails"
+
+#. 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 ""
+"Teña unha visión xeral de tódalas peticións de soporte ordeándoas por "
+"criterios específicos como o tempo de proceso, número de peticións "
+"respondidas, correos electrónicos enviados e custos."
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,canal_id:0
+msgid ""
+"The channels represent the different communication  modes available with the "
+"customer."
+msgstr ""
+"As canles representan os diferentes modos de comunicación dispoñibles co "
+"cliente"
+
+#. 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 ""
+"O estado configúrase como \"Borrador\", cando se crea un caso. Se o caso "
+"está en curso, o estado configúrase como \"Aberto\". Cando se pecha o caso, "
+"o estado configúrase como \"Realizado\". Se cómpre revisar o caso, o estado "
+"configúrase como \"Pendente\"."
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr "Febreiro"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Lost"
+msgstr "Perdido"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr "Asistencia técnica"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Case(s)"
+msgstr "O(s) meu(s) caso(s)"
+
+#. 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 ""
+"Crear e xestionar as categorías da asistencia técnica para mellorar a "
+"xestión e a clasificación das súas peticións de axuda"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "High"
+msgstr "Alto"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+#: view:crm.helpdesk.report:0
+msgid "Sales Team"
+msgstr "Equipo de vendas"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr "Última acción"
+
+#. 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 ""
+"Asistencia técnica permítelle realizar o seguimento das súas intervencións. "
+"Seleccione un cliente, engada notas e clasifique as intervencións con "
+"terceiros se é necesario. Pode asignar un nivel de prioridade. Utilice o "
+"sistema de incidencias de OpenERP para xestionar as súas actividades de "
+"asistencia. Pódense conectar Incidencias coa pasarela de correo: os correos "
+"novos poderán crear incidencias, cada unha das cales se encherá "
+"automaticamente co historial de conversación co cliente."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,name:0
+msgid "Year"
+msgstr "Ano"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr "Duración"
diff --git a/addons/crm_partner_assign/i18n/gl.po b/addons/crm_partner_assign/i18n/gl.po
new file mode 100644
index 00000000000..9ab4ec4d059
--- /dev/null
+++ b/addons/crm_partner_assign/i18n/gl.po
@@ -0,0 +1,720 @@
+# Galician 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-06-09 08:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@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-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,name:0
+msgid "Send to"
+msgstr "Enviar a"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_close:0
+msgid "Delay to Close"
+msgstr "Atraso para pechar"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Ingresos previstos"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,nbr:0
+msgid "# of Cases"
+msgstr "Nº de casos"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+#: view:crm.lead.forward.to.partner:0
+msgid "Forward"
+msgstr "Reenviar"
+
+#. 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 "\"Responder a\" do equipo de vendas definido neste caso"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localize"
+msgstr "Xeolocalizar"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Lead"
+msgstr "Posible cliente"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to close"
+msgstr "Demora peche"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Whole Story"
+msgstr "Historial completo"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. 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 ""
+"Non se pode conectar cos servidores de xeolocalización, por favor asegúrese "
+"de ter conexión a internet (%s)"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,partner_date:0
+msgid "Partner Date"
+msgstr "Data empresa"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Highest"
+msgstr "A máis alta"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Latest email"
+msgstr "Último email"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_latitude:0
+#: field:res.partner,partner_latitude:0
+msgid "Geo Latitude"
+msgstr "Xeolatitude"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Cancelled"
+msgstr "Anulado"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assignation"
+msgstr "Xeoasignación"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_closed:0
+msgid "Close Date"
+msgstr "Data de peche"
+
+#. 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 ""
+"Indica a probabilidade de asignar unha iniciativa a esta empresa. (0 "
+"significa ningunha asignación)"
+
+#. 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 ""
+"\n"
+"Este é o módulo utilizado por OpenERP SA para redirixir clientes ós seus "
+"partners ou asesores, baseándose na xeolocalización.\n"
+"    "
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Pending"
+msgstr "Pendente"
+
+#. 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 "Socio"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability:0
+msgid "Avg Probability"
+msgstr "Probabilidade media"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Previous"
+msgstr "Previo"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:40
+#, python-format
+msgid "Network error"
+msgstr "Erro de rede"
+
+#. 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 ""
+"Estes enderezos recibirán unha copia deste correo electrónico. Para "
+"modificar a lista CC permanente, edite o campo CC global deste caso."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_from:0
+msgid "From"
+msgstr "Desde"
+
+#. 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 "Nivel empresa"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Section"
+msgstr "Sección"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Next"
+msgstr "Seguinte"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,priority:0
+msgid "Priority"
+msgstr "Prioridade"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Data límite excedida"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,html:0
+msgid "HTML formatting?"
+msgstr "Formato HTML?"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: crm_partner_assign
+#: help:crm.lead,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr "Empresa á que se reenviou/asignou este caso"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Lowest"
+msgstr "A máis baixa"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Leads Analysis"
+msgstr "Análise de posibles clientes"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,creation_date:0
+msgid "Creation Date"
+msgstr "Data de creación"
+
+#. 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 "Seleccione esta opción se desexa enviar e-mails con formato HTML"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "7 Days"
+msgstr "7 días"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Partner Assignation"
+msgstr "Asignación empresa"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "Utilízase Tipo para separar iniciativas e oportunidades"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "July"
+msgstr "Xullo"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,stage_id:0
+msgid "Stage"
+msgstr "Fase"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:271
+#, python-format
+msgid "Fwd"
+msgstr "Reenvío"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localization"
+msgstr "Xeolocalización"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Opportunities Assignment Analysis"
+msgstr "Análise de asignación de oportunidades"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Cancel"
+msgstr "Anular"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,history:0
+msgid "Send history"
+msgstr "Enviar historial"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Contact"
+msgstr "Contactar"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Close"
+msgstr "Pechar"
+
+#. 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 "Análise de asignación de op."
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "Número de días para pechar o caso"
+
+#. module: crm_partner_assign
+#: field:res.partner,partner_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to open"
+msgstr "Atraso de apertura"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,grade_id:0
+msgid "Grade"
+msgstr "Grao"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "December"
+msgstr "Decembro"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,opening_date:0
+msgid "Opening Date"
+msgstr "Data de apertura"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subject:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Salesman"
+msgstr "Vendedor"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,reply_to:0
+msgid "Reply To"
+msgstr "Responder a"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "#Opportunities"
+msgstr "Nº oportunidades"
+
+#. module: crm_partner_assign
+#: model:ir.module.module,shortdesc:crm_partner_assign.module_meta_information
+msgid "Partner Geo-Localisation"
+msgstr "Xeolocalización da empresa"
+
+#. module: crm_partner_assign
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Erro! Non pode crear membros asociados recorrentes."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Draft"
+msgstr "Proxecto"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Low"
+msgstr "Baixo"
+
+#. 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 "Pechado"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+#: field:res.partner,opportunity_assigned_ids:0
+msgid "Assigned Opportunities"
+msgstr "Oportunidades asignadas"
+
+#. module: crm_partner_assign
+#: field:crm.lead,date_assign:0
+msgid "Assignation Date"
+msgstr "Data de asignación"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability_max:0
+msgid "Max Probability"
+msgstr "Probabilidade máx."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Escalate"
+msgstr "Escalar"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,attachment_ids:0
+msgid "unknown"
+msgstr "descoñecido"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "June"
+msgstr "Xuño"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_open:0
+msgid "Number of Days to open the case"
+msgstr "Número de días para abrir o caso"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_open:0
+msgid "Delay to Open"
+msgstr "Atraso de apertura"
+
+#. 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 "Usuario"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "November"
+msgstr "Novembro"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_longitude:0
+#: field:res.partner,partner_longitude:0
+msgid "Geo Longitude"
+msgstr "Lonxitude Xeo"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Lead Assign"
+msgstr "Asignar posible cliente"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Assignation"
+msgstr "Asignación"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_cc:0
+msgid "CC"
+msgstr "CC"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "January"
+msgstr "Xaneiro"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Planned Revenues"
+msgstr "Beneficio previsto"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+msgid "res.partner.grade"
+msgstr "res.empresa.nivel"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+msgid "Unchanged"
+msgstr "Sen cambios"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Last 30 Days"
+msgstr "Últimos 30 días"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,name:0
+msgid "Grade Name"
+msgstr "Nome de nivel"
+
+#. module: crm_partner_assign
+#: help:crm.lead,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr "Última data na que este caso foi reenviado/asignado a unha empresa"
+
+#. 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 "Abrir"
+
+#. module: crm_partner_assign
+#: field:res.partner,date_localization:0
+msgid "Geo Localization Date"
+msgstr "Data xeolocalización"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_to:0
+msgid "To"
+msgstr "Para"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+msgid "Send new email"
+msgstr "Enviar novo e-mail"
+
+#. 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 "Reenviar a empresa"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "May"
+msgstr "Maio"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probable_revenue:0
+msgid "Probable Revenue"
+msgstr "Ingreso estimado"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr "Empresa asignada"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,address_id:0
+msgid "Address"
+msgstr "Enderezo"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Opportunity"
+msgstr "Oportunidade"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "February"
+msgstr "Febreiro"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,name:0
+msgid "Email Address"
+msgstr "Enderezo de correo electrónico"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,country_id:0
+msgid "Country"
+msgstr "País"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr "Convertir en oportunidade"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assign"
+msgstr "Xeo asignar"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.iniciativa"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+msgid "CRM Lead Report"
+msgstr "Informe de iniciativas CRM"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Case Information"
+msgstr "Información do caso"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body:0
+msgid "Message Body"
+msgstr "Corpo da mensaxe"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "High"
+msgstr "Alto"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,section_id:0
+msgid "Sales Team"
+msgstr "Equipo de vendas"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,create_date:0
+msgid "Create Date"
+msgstr "Crear data"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,state:0
+msgid "Set New State To"
+msgstr "Establecer novo estado a"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,name:0
+msgid "Year"
+msgstr "Ano"
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index f531165e942..544dbd1ee7b 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -20,11 +20,9 @@
 #
 ##############################################################################
 
-import base64
 import time
 import re
 from osv import osv, fields
-import tools
 from tools.translate import _
 
 class crm_lead_forward_to_partner(osv.osv_memory):
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index bf5413ebcae..258de2e4e2d 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -118,7 +118,7 @@
             <field name="name" select="1" />
             <newline/>
             <separator string="Avalaible answers" colspan="4"/>
-            <field name="answers_ids" colspan="4" nolabel="1" editable="bottom">
+            <field name="answers_ids" colspan="4" nolabel="1">
               <tree string="Answers" editable="bottom">
                 <field name="name" select="1"/>
               </tree>
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index aceee36e0a2..d70af4b4d1e 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -40,6 +40,7 @@ class delivery_carrier(osv.osv):
             currency = order.pricelist_id.currency_id.name or ''
             res = [(r['id'], r['name']+' ('+(str(r['price']))+' '+currency+')') for r in self.read(cr, uid, ids, ['name', 'price'], context)]
         return res
+
     def get_price(self, cr, uid, ids, field_name, arg=None, context=None):
         res={}
         if context is None:
@@ -58,17 +59,26 @@ class delivery_carrier(osv.osv):
                   price = 0.0
             res[carrier.id]=price
         return res
+
     _columns = {
         'name': fields.char('Carrier', size=64, required=True),
         'partner_id': fields.many2one('res.partner', 'Carrier Partner', required=True),
         'product_id': fields.many2one('product.product', 'Delivery Product', required=True),
         'grids_id': fields.one2many('delivery.grid', 'carrier_id', 'Delivery Grids'),
-        'price' : fields.function(get_price, method=True,string='Price'),
-        'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the delivery carrier without removing it.")
+        'price' : fields.function(get_price, string='Price'),
+        'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the delivery carrier without removing it."),
+        'normal_price': fields.float('Normal Price'),
+        'free_if_more_than': fields.boolean('Free If More Than'),
+        'amount': fields.float('Amount'),
+        'use_detailed_pricelist': fields.boolean('Use Detailed Pricelist'),
+        'pricelist_ids': fields.one2many('delivery.grid', 'carrier_id', 'Price List'),
     }
+
     _defaults = {
-        'active': lambda *args:1
+        'active': 1,
+        'free_if_more_than': False,
     }
+
     def grid_get(self, cr, uid, ids, contact_id, context=None):
         contact = self.pool.get('res.partner.address').browse(cr, uid, contact_id, context=context)
         for carrier in self.browse(cr, uid, ids, context=context):
@@ -86,6 +96,63 @@ class delivery_carrier(osv.osv):
                     continue
                 return grid.id
         return False
+
+    def create_grid_lines(self, cr, uid, ids, vals, context=None):
+        if context == None:
+            context = {}
+        grid_line_pool = self.pool.get('delivery.grid.line')
+        grid_pool = self.pool.get('delivery.grid')
+        for record in self.browse(cr, uid, ids, context=context):
+            grid_id = grid_pool.search(cr, uid, [('carrier_id', '=', record.id)], context=context)
+            if not grid_id:
+                record_data = {
+                    'name': vals.get('name', False),
+                    'carrier_id': record.id,
+                    'seqeunce': 10,
+                }
+                new_grid_id = grid_pool.create(cr, uid, record_data, context=context)
+                grid_id = [new_grid_id]
+
+            #delete all existing grid lines
+            grid_lines = [line.id for line in grid_pool.browse(cr, uid, grid_id[0]).line_ids if line.type == 'price']
+            grid_line_pool.unlink(cr, uid, grid_lines, context=context)
+
+            #create the grid lines
+            if record.free_if_more_than:
+                data = {
+                    'grid_id': grid_id and grid_id[0],
+                    'name': _('Free if more than %d') % record.amount,
+                    'type': 'price',
+                    'operator': '>=',
+                    'max_value': record.amount,
+                    'standard_price': 0.0,
+                    'list_price': 0.0,
+                }
+                grid_line_pool.create(cr, uid, data, context=context)
+
+            if record.normal_price:
+                default_data = {
+                    'grid_id': grid_id and grid_id[0],
+                    'name': _('Default price'),
+                    'type': 'price',
+                    'operator': '>=',
+                    'max_value': 0.0,
+                    'standard_price': record.normal_price,
+                    'list_price': record.normal_price,
+                }
+                grid_line_pool.create(cr, uid, default_data, context=context)
+        return True
+
+    def write(self, cr, uid, ids, vals, context=None):
+        res_id = super(delivery_carrier, self).write(cr, uid, ids, vals, context=context)
+        self.create_grid_lines(cr, uid, ids, vals, context=context)
+        return res_id
+
+    def create(self, cr, uid, vals, context=None):
+        res_id = super(delivery_carrier, self).create(cr, uid, vals, context=context)
+        self.create_grid_lines(cr, uid, [res_id], vals, context=context)
+        return res_id
+
 delivery_carrier()
 
 class delivery_grid(osv.osv):
@@ -151,7 +218,9 @@ class delivery_grid_line(osv.osv):
     _columns = {
         'name': fields.char('Name', size=32, required=True),
         'grid_id': fields.many2one('delivery.grid', 'Grid',required=True),
-        'type': fields.selection([('weight','Weight'),('volume','Volume'),('wv','Weight * Volume'), ('price','Price')], 'Variable', required=True),
+        'type': fields.selection([('weight','Weight'),('volume','Volume'),\
+                                  ('wv','Weight * Volume'), ('price','Price')],\
+                                  'Variable', required=True),
         'operator': fields.selection([('==','='),('<=','<='),('>=','>=')], 'Operator', required=True),
         'max_value': fields.float('Maximum Value', required=True),
         'price_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Price Type', required=True),
@@ -167,7 +236,6 @@ class delivery_grid_line(osv.osv):
     }
     _order = 'list_price'
 
-
 delivery_grid_line()
 
 
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 1e3fb6b2a1d..e0dd12e0038 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -4,9 +4,6 @@
         <!-- Delivery Carriers -->
         <menuitem id="menu_delivery" name="Delivery" parent="stock.menu_stock_configuration" sequence="4"/>
 
-
-
-
         <record id="view_delivery_carrier_tree" model="ir.ui.view">
             <field name="name">delivery.carrier.tree</field>
             <field name="model">delivery.carrier</field>
@@ -25,10 +22,46 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Carrier">
-                    <field name="name" select="1"/>
-                    <field name="active" select="1"/>
-                    <field name="partner_id" select="1"/>
-                    <field name="product_id" select="1"/>
+                    <group colspan="4" col="4" name="general">
+                        <field name="name" select="1"/>
+                        <field name="active" select="1"/>
+                        <field name="partner_id" select="1"/>
+                        <field name="product_id" select="1"/>
+                        <separator string="Pricing Information" colspan="6"/>
+                        <group colspan="2" col="4">
+                            <field name="normal_price" select="1" colspan="4"/>
+                            <newline/>
+                            <field name="free_if_more_than"/>
+                            <field name="amount" attrs="{'invisible':[('free_if_more_than','=',False)]}"/>
+                        </group>
+                        <newline/>
+                        <field name="use_detailed_pricelist" />
+                    </group>
+                        <field name="pricelist_ids" nolabel="1" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form">
+                         <tree string="Delivery grids">
+                              <field name="sequence"/>
+                              <field name="carrier_id"/>
+                              <field name="name"/>
+                         </tree>
+                        <form string="Delivery grids">
+                             <field name="name" select="1"/>
+                             <field name="active" select="1"/>
+                             <field name="sequence" groups="base.group_extended" select="1"/>
+                             <notebook colspan="4">
+                               <page string="Grid definition">
+                                  <field colspan="4" name="line_ids" nolabel="1" select="1"/>
+                               </page>
+                               <page string="Destination">
+                                   <separator colspan="4" string="Countries"/>
+                                   <field colspan="4" name="country_ids" nolabel="1"/>
+                                   <separator colspan="4" string="States"/>
+                                   <field colspan="4" name="state_ids" nolabel="1"/>
+                                   <field name="zip_from"/>
+                                   <field name="zip_to"/>
+                               </page>
+                             </notebook>
+                       </form>
+                   </field>
                 </form>
             </field>
         </record>
@@ -38,8 +71,18 @@
             <field name="res_model">delivery.carrier</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="help">Create and manage the delivery methods you need for your sales activities. Each delivery method can be assigned to a price list which computes the price of the delivery according to the products sold or delivered.</field>
+            <field name="help">Define the delivery methods you are using and their pricing in order to reinvoice the delivery costs when you are doing invoicing based on delivery orders</field>
         </record>
+
+        <record id="action_delivery_carrier_form1" model="ir.actions.act_window">
+            <field name="name">Delivery Method</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">delivery.carrier</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="help">Define the delivery methods you are using and their pricing in order to reinvoice the delivery costs when you are doing invoicing based on delivery orders</field>
+        </record>
+
         <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery" groups="base.group_extended"/>
 
         <!-- Delivery Grids -->
@@ -98,13 +141,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Grid Lines">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="type" string="Condition"/>
-                    <field name="operator" nolabel="1"/>
-                    <field name="max_value" nolabel="1"/>
+                    <group colspan="5" col="5">
+                        <field colspan="4" name="name" select="1"/>
+                        <newline/>
+                        <field name="type" string="Condition"/>
+                        <field name="operator" nolabel="1" />
+                        <field name="max_value" nolabel="1"/>
+                    </group>
+                    <newline/>
                     <field name="list_price"/>
                     <field name="standard_price" groups="base.group_extended"/>
-                    <field name="price_type"  />
+                    <field name="price_type"/>
                     <field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}"/>
                 </form>
             </field>
@@ -118,7 +165,7 @@
                     <field name="name"/>
                     <field name="type"/>
                     <field name="operator"/>
-                    <field name="max_value"/>
+                    <field name="max_value" nolabel="1"/>
                     <field name="list_price"/>
                     <field name="standard_price" groups="base.group_extended"/>
                 </tree>
@@ -286,6 +333,12 @@
             </field>
         </record>
 
+       <record id="delivery_method_form_view_todo" model="ir.actions.todo">
+           <field name="action_id" ref="action_delivery_carrier_form1"/>
+           <field name="sequence">10</field>
+           <field name="type">normal</field>
+           <field name="state">skip</field>
+       </record>
 
     </data>
 </openerp>
diff --git a/addons/delivery/partner.py b/addons/delivery/partner.py
index 386e9d08139..62008c2c7cf 100644
--- a/addons/delivery/partner.py
+++ b/addons/delivery/partner.py
@@ -29,7 +29,6 @@ class res_partner(osv.osv):
           type='many2one',
           relation='delivery.carrier',
           string="Delivery Method",
-          method=True,
           view_load=True,
           help="This delivery method will be used when invoicing from picking."),
     }
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index d1ffb7ba968..05074268220 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -54,12 +54,12 @@ class stock_picking(osv.osv):
     _columns = {
         'carrier_id':fields.many2one("delivery.carrier","Carrier"),
         'volume': fields.float('Volume'),
-        'weight': fields.function(_cal_weight, method=True, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
+        'weight': fields.function(_cal_weight, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
                   store={
                  'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
                  'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
                  }),
-        'weight_net': fields.function(_cal_weight, method=True, type='float', string='Net Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
+        'weight_net': fields.function(_cal_weight, type='float', string='Net Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
                   store={
                  'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
                  'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
@@ -158,11 +158,11 @@ class stock_move(osv.osv):
         return res
 
     _columns = {
-        'weight': fields.function(_cal_move_weight, method=True, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_move_weight',
+        'weight': fields.function(_cal_move_weight, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_move_weight',
                   store={
                  'stock.move': (lambda self, cr, uid, ids, c=None: ids, ['product_id', 'product_qty', 'product_uom'], 20),
                  }),
-        'weight_net': fields.function(_cal_move_weight, method=True, type='float', string='Net weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_move_weight',
+        'weight_net': fields.function(_cal_move_weight, type='float', string='Net weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_move_weight',
                   store={
                  'stock.move': (lambda self, cr, uid, ids, c=None: ids, ['product_id', 'product_qty', 'product_uom'], 20),
                  }),
diff --git a/addons/document/directory_report.py b/addons/document/directory_report.py
index 1665a7abf68..2726fcd5462 100644
--- a/addons/document/directory_report.py
+++ b/addons/document/directory_report.py
@@ -56,7 +56,7 @@ class ir_action_report_xml(osv.osv):
         return [('id','in',report_id)]
 
     _columns={
-        'model_id' : fields.function(_model_get, fnct_search=_model_search, method=True, string='Model Id'),
+        'model_id' : fields.function(_model_get, fnct_search=_model_search, string='Model Id'),
     }
 
 ir_action_report_xml()
diff --git a/addons/document/document.py b/addons/document/document.py
index 90f57438ce8..69e123b87eb 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -117,7 +117,7 @@ class document_file(osv.osv):
         # If ir.attachment contained any data before document is installed, preserve
         # the data, don't drop the column!
         'db_datas': fields.binary('Data', oldname='datas'),
-        'datas': fields.function(_data_get, method=True, fnct_inv=_data_set, string='File Content', type="binary", nodrop=True),
+        'datas': fields.function(_data_get, fnct_inv=_data_set, string='File Content', type="binary", nodrop=True),
 
         # Fields of document:
         'user_id': fields.many2one('res.users', 'Owner', select=1),
diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml
index f46aa1b47a3..ac7a174b05f 100644
--- a/addons/document/document_data.xml
+++ b/addons/document/document_data.xml
@@ -24,7 +24,7 @@
     </record>
 </data>
 
-<data noupdate="0">
+<data noupdate="1">
     <record model="document.directory.content.type" id="pdf">
         <field name="code">.pdf</field>
         <field name="name">PDF Report</field>
diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po
index ef799bfc907..3f181875348 100644
--- a/addons/document/i18n/tr.po
+++ b/addons/document/i18n/tr.po
@@ -7,44 +7,44 @@ 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-09-09 07:09+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-06-10 19:43+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-11 04:56+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
 msgid "Parent Directory"
-msgstr ""
+msgstr "Ana Dizin"
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Auto Directory Configuration"
-msgstr ""
+msgstr "Otomatik Klasör Yapılandırması"
 
 #. module: document
 #: field:document.directory,resource_field:0
 msgid "Name field"
-msgstr ""
+msgstr "Ad alanı"
 
 #. module: document
 #: view:board.board:0
 msgid "Document board"
-msgstr ""
+msgstr "Döküman Paneli"
 
 #. module: document
 #: model:ir.model,name:document.model_process_node
 msgid "Process Node"
-msgstr ""
+msgstr "İşlem Düğümü"
 
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
-msgstr ""
+msgstr "Döküman Klasörünü Ara"
 
 #. module: document
 #: help:document.directory,resource_field:0
@@ -52,18 +52,19 @@ msgid ""
 "Field to be used as name on resource directories. If empty, the \"name\" "
 "will be used."
 msgstr ""
+"Kaynak klasörleri adı olarak kullanılacak alan. Boşsa \"ad\" kullanılacaktır."
 
 #. module: document
 #: code:addons/document/document_directory.py:276
 #, python-format
 msgid "Directory name contains special characters!"
-msgstr ""
+msgstr "Klasör adında özel karakterler var!"
 
 #. module: document
 #: view:document.directory:0
 #: view:document.storage:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruplandır..."
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
@@ -73,13 +74,13 @@ msgstr "Klasör İçerik Tipi"
 #. module: document
 #: view:document.directory:0
 msgid "Resources"
-msgstr ""
+msgstr "Kaynaklar"
 
 #. module: document
 #: field:document.directory,file_ids:0
 #: view:report.document.user:0
 msgid "Files"
-msgstr ""
+msgstr "Dosyalar"
 
 #. module: document
 #: view:report.files.partner:0
@@ -90,18 +91,18 @@ msgstr "Aylık Dosyalar"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "March"
-msgstr ""
+msgstr "Mart"
 
 #. module: document
 #: view:document.configuration:0
 msgid "title"
-msgstr ""
+msgstr "unvan"
 
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content
@@ -111,12 +112,12 @@ msgstr "Klasör İçeriği"
 #. module: document
 #: view:document.directory:0
 msgid "Dynamic context"
-msgstr ""
+msgstr "Dinamik İçerik"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
 msgid "Document Management"
-msgstr "Döküman Yönetimi"
+msgstr "Belge Yönetimi"
 
 #. module: document
 #: help:document.directory.dctx,expr:0
@@ -125,29 +126,32 @@ msgid ""
 "You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
 "to the current record, in dynamic folders"
 msgstr ""
+"Bu alanı değerlendirmek için bir python ifadesi kullanın.\n"
+"Geçerli klasör için 'dir_id', Dinamik dosyalardaki geçerli kayıta referans "
+"olarak 'res_id', 'res_model' i kullan"
 
 #. module: document
 #: view:report.document.user:0
 msgid "This Year"
-msgstr ""
+msgstr "Bu Yıl"
 
 #. module: document
 #: field:document.storage,path:0
 msgid "Path"
-msgstr ""
+msgstr "Yol"
 
 #. module: document
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #, python-format
 msgid "Directory name must be unique!"
-msgstr ""
+msgstr "Klasör adı eşsiz olmalı !"
 
 #. module: document
 #: view:ir.attachment:0
 #: field:ir.attachment,index_content:0
 msgid "Indexed Content"
-msgstr "İndexlenen İçerik"
+msgstr "İndekslenen İçerik"
 
 #. module: document
 #: help:document.directory,resource_find_all:0
@@ -155,6 +159,8 @@ msgid ""
 "If true, all attachments that match this resource will  be located. If "
 "false, only ones that have this as parent."
 msgstr ""
+"Doğruysa, bu kaynakla eşlenen bütün ekler bulunacaktır. Yanlışsa, bu ana "
+"kaynağ sahip olanlar bulunacaktır."
 
 #. module: document
 #: view:document.directory:0
@@ -162,91 +168,91 @@ msgstr ""
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
-msgstr "Klasörler"
+msgstr "Dizinler"
 
 #. module: document
 #: field:document.configuration,sale_order:0
 msgid "Sale Order"
-msgstr ""
+msgstr "Satış Siparişi"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_user
 msgid "Files details by Users"
-msgstr ""
+msgstr "Kullanıcıya göre dosya ayrıntıları"
 
 #. module: document
 #: field:document.configuration,project:0
 msgid "Project"
-msgstr ""
+msgstr "Proje"
 
 #. module: document
 #: code:addons/document/document_storage.py:573
 #: code:addons/document/document_storage.py:601
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Hata!"
 
 #. module: document
 #: help:document.configuration,product:0
 msgid "Auto directory configuration for Products."
-msgstr ""
+msgstr "Ürünler için otomatik dizin yapılandırması"
 
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
-msgstr ""
+msgstr "Bütün kaynakları bul"
 
 #. module: document
 #: selection:document.directory,type:0
 msgid "Folders per resource"
-msgstr ""
+msgstr "Her kaynağın klasörü"
 
 #. module: document
 #: field:document.directory.content,suffix:0
 msgid "Suffix"
-msgstr "Son Ek"
+msgstr "Sonek"
 
 #. module: document
 #: field:report.document.user,change_date:0
 msgid "Modified Date"
-msgstr "Değiştirme Tarihi"
+msgstr "Değiştirilme Tarihi"
 
 #. module: document
 #: view:document.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "Bilgi Birikimi Uygulama Ayarları"
 
 #. module: document
 #: view:ir.attachment:0
 #: field:ir.attachment,partner_id:0
 #: field:report.files.partner,partner:0
 msgid "Partner"
-msgstr "Ortak"
+msgstr "Paydaş"
 
 #. module: document
 #: view:board.board:0
 msgid "Files by Users"
-msgstr ""
+msgstr "Kullanıcıya göre Dosyalar"
 
 #. module: document
 #: field:process.node,directory_id:0
 msgid "Document directory"
-msgstr "Belge Klasörü"
+msgstr "Belge Dizini"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
 #, python-format
 msgid "ValidateError"
-msgstr ""
+msgstr "DoğrulamaHatası"
 
 #. module: document
 #: model:ir.model,name:document.model_ir_actions_report_xml
 msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.actions.report.xml"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_file_form
@@ -254,23 +260,23 @@ msgstr ""
 #: model:ir.ui.menu,name:document.menu_document_doc
 #: model:ir.ui.menu,name:document.menu_document_files
 msgid "Documents"
-msgstr ""
+msgstr "Belgeler"
 
 #. module: document
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "Hata! Yinelenen Dizinler oluşturamazsınız."
 
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,storage_id:0
 msgid "Storage"
-msgstr ""
+msgstr "Saklama"
 
 #. module: document
 #: view:document.configuration:0
 msgid "Configure Resource Directory"
-msgstr ""
+msgstr "Kaynak Dizini Yapılandırması"
 
 #. module: document
 #: field:ir.attachment,file_size:0
@@ -284,7 +290,7 @@ msgstr "Dosya Boyutu"
 #: field:document.directory.content.type,name:0
 #: field:ir.attachment,file_type:0
 msgid "Content Type"
-msgstr ""
+msgstr "İçerik Türü"
 
 #. module: document
 #: view:document.directory:0
@@ -292,7 +298,7 @@ msgstr ""
 #: view:document.storage:0
 #: field:document.storage,type:0
 msgid "Type"
-msgstr "Tipi"
+msgstr "Tür"
 
 #. module: document
 #: help:document.directory,ressource_type_id:0
@@ -300,65 +306,69 @@ msgid ""
 "Select an object here and there will be one folder per record of that "
 "resource."
 msgstr ""
+"Burada bir nesne seçin ve o kaynağa ait her kayıt başına bir klasör "
+"olacaktır."
 
 #. module: document
 #: help:document.directory,domain:0
 msgid ""
 "Use a domain if you want to apply an automatic filter on visible resources."
 msgstr ""
+"Görünür kaynaklar için otomatik süzgeç uygulamak isterseniz bir alan adı "
+"(domain) kullanın."
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_files_by_partner
 msgid "Files Per Partner"
-msgstr ""
+msgstr "Paydaş başına Dosya"
 
 #. module: document
 #: field:document.directory,dctx_ids:0
 msgid "Context fields"
-msgstr ""
+msgstr "Bağlam Alanları"
 
 #. module: document
 #: field:ir.attachment,store_fname:0
 msgid "Stored Filename"
-msgstr ""
+msgstr "Saklanan Dosya adı"
 
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
-msgstr ""
+msgstr "Kaynak model"
 
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
 msgid "Directory Type"
-msgstr "Klasör Tipi"
+msgstr "Dizin Türü"
 
 #. module: document
 #: field:document.directory.content,report_id:0
 msgid "Report"
-msgstr ""
+msgstr "Rapor"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "July"
-msgstr ""
+msgstr "Temmuz"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.open_board_document_manager
 #: model:ir.ui.menu,name:document.menu_reports_document_manager
 msgid "Document Dashboard"
-msgstr ""
+msgstr "Belge Paneli"
 
 #. module: document
 #: field:document.directory.content.type,code:0
 msgid "Extension"
-msgstr "İç Hat"
+msgstr "Uzantı"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Created"
-msgstr ""
+msgstr "Oluşturulma"
 
 #. module: document
 #: field:document.directory,content_ids:0
@@ -368,18 +378,18 @@ msgstr "Sanal Dosyalar"
 #. module: document
 #: view:ir.attachment:0
 msgid "Modified"
-msgstr ""
+msgstr "Değiştirilmiş"
 
 #. module: document
 #: code:addons/document/document_storage.py:639
 #, python-format
 msgid "Error at doc write!"
-msgstr ""
+msgstr "Belge yazımında hata !"
 
 #. module: document
 #: view:document.directory:0
 msgid "Generated Files"
-msgstr ""
+msgstr "Oluşturulan Dosyalar"
 
 #. module: document
 #: field:document.directory.content,directory_id:0
@@ -390,85 +400,85 @@ msgstr ""
 #: model:ir.model,name:document.model_document_directory
 #: field:report.document.user,directory:0
 msgid "Directory"
-msgstr "Klasör"
+msgstr "Dizin"
 
 #. module: document
 #: view:board.board:0
 msgid "Files by Partner"
-msgstr ""
+msgstr "Paydaşa göre Dosyalar"
 
 #. module: document
 #: field:document.directory,write_uid:0
 #: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
-msgstr "Son Düzenleyen Kullanıcı"
+msgstr "Son Değiştiren Kullanıcı"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.act_res_partner_document
 #: model:ir.actions.act_window,name:document.zoom_directory
 msgid "Related Documents"
-msgstr ""
+msgstr "İlgili Belgeler"
 
 #. module: document
 #: field:document.configuration,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Yapılandırma Gelişimi"
 
 #. module: document
 #: field:document.directory,domain:0
 msgid "Domain"
-msgstr ""
+msgstr "Etki alanı"
 
 #. module: document
 #: field:document.directory,write_date:0
 #: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
-msgstr "Düzenlenen Tarih"
+msgstr "Değiştirilme Tarihi"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_file
 msgid "Files details by Directory"
-msgstr ""
+msgstr "Dizine göre dosya ayrıntıları"
 
 #. module: document
 #: view:report.document.user:0
 msgid "All users files"
-msgstr ""
+msgstr "Tüm kullanıcıların Dosyaları"
 
 #. module: document
 #: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_size_month
 #: view:report.document.file:0
 msgid "File Size by Month"
-msgstr "Ay Bazında Dosya Boyutu"
+msgstr "Aya göre Dosya Boyutu"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "December"
-msgstr ""
+msgstr "Aralık"
 
 #. module: document
 #: field:document.configuration,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Resim"
 
 #. module: document
 #: selection:document.directory,type:0
 msgid "Static Directory"
-msgstr "Statik Klasör"
+msgstr "Statik Dizin"
 
 #. module: document
 #: field:document.directory,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Alt öğeler"
 
 #. module: document
 #: view:document.directory:0
 msgid "Define words in the context, for all child directories and files"
-msgstr ""
+msgstr "Bütün alt dizinler ve dosyalar için içerik kelimelerini tanımla"
 
 #. module: document
 #: model:ir.module.module,description:document.module_meta_information
@@ -490,12 +500,27 @@ msgid ""
 "database,\n"
 "      but in the servers rootpad like /server/bin/filestore.\n"
 msgstr ""
+"Bu bir tam belge yönetim sistemidir:\n"
+"    * Kullanıcı doğrulanması\n"
+"    *Belge indekslenmesi :- .pptx ve .docx dosyaları windows ortamında "
+"desteklenmez.\n"
+"    * Belge için Kontrol Paneli şunları içerir:\n"
+"        * Yeni Dosyalar (liste)\n"
+"        * Kaynak Türüne göre Dosyalar (grafik)\n"
+"        * Paydaşa göre Dosyalar (grafik)\n"
+"        * Aya göre Dosya (grafik)\n"
+"    DİKKAT:\n"
+"    - Bu modülü, halihazırda veritabanında saklı PDF dosyaları olan "
+"çalışılmakta olan firmaya kurarsanız,\n"
+"      hepsini silinir ve kaybedersiniz.\n"
+"    - Bu modül kurulduktan sonra PDF ler artık bu veritabanında saklanmaz,\n"
+"      ama /server/bin/filestore gibi kök tamponda saklanır.\n"
 
 #. module: document
 #: help:document.storage,online:0
 msgid ""
 "If not checked, media is currently offline and its contents not available"
-msgstr ""
+msgstr "Eğer işaretlenmediyse, ortam kapalı durumdadır ve içeriği görülmez"
 
 #. module: document
 #: view:document.directory:0
@@ -511,19 +536,19 @@ msgstr "Sahibi"
 #. module: document
 #: view:document.directory:0
 msgid "PDF Report"
-msgstr ""
+msgstr "PDF Raporu"
 
 #. module: document
 #: view:document.directory:0
 msgid "Contents"
-msgstr ""
+msgstr "İçindekiler"
 
 #. module: document
 #: field:document.directory,create_date:0
 #: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
-msgstr "Oluşturulan Tarih"
+msgstr "Oluşturulma Tarihi"
 
 #. module: document
 #: help:document.directory.content,include_name:0
@@ -532,31 +557,33 @@ msgid ""
 "name.\n"
 "If set, the directory will have to be a resource one."
 msgstr ""
+"Dosya adının kayıt adını içermesini istiyorsanız bu alanı işaretleyin.\n"
+"Eğer ayarlandıysa, dizin kaynak olandan olmalı."
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
 msgid "Auto Configure Directory"
-msgstr ""
+msgstr "Dizini Otomatik Yapılandır"
 
 #. module: document
 #: field:document.directory.content,include_name:0
 msgid "Include Record Name"
-msgstr "Kayıt Adı Dahil"
+msgstr "Kayıt Adı İçerilsin"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Attachment"
-msgstr ""
+msgstr "Ek"
 
 #. module: document
 #: field:ir.actions.report.xml,model_id:0
 msgid "Model Id"
-msgstr ""
+msgstr "Model No"
 
 #. module: document
 #: field:document.storage,online:0
 msgid "Online"
-msgstr ""
+msgstr "Çevrimiçi"
 
 #. module: document
 #: help:document.directory,ressource_tree:0
@@ -564,6 +591,8 @@ msgid ""
 "Check this if you want to use the same tree structure as the object selected "
 "in the system."
 msgstr ""
+"Sistemde seçilen nesne ile aynı ağaç yapısını kullanmak isterseniz bunu "
+"işaretleyin."
 
 #. module: document
 #: view:document.directory:0
@@ -576,23 +605,25 @@ msgid ""
 "Along with Parent Model, this ID attaches this folder to a specific record "
 "of Parent Model."
 msgstr ""
+"Ana Model ile birlikte, bu ID bu dosyaya Ana Modelin özel bir kaydı olarak "
+"eklenir."
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "August"
-msgstr ""
+msgstr "Ağustos"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "Dizin kendisinin anası olamaz!"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "June"
-msgstr ""
+msgstr "Haziran"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -609,19 +640,19 @@ msgstr "Gruplar"
 #. module: document
 #: field:document.directory.content.type,active:0
 msgid "Active"
-msgstr ""
+msgstr "Etkin"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "November"
-msgstr ""
+msgstr "Kasım"
 
 #. module: document
 #: view:ir.attachment:0
 #: field:ir.attachment,db_datas:0
 msgid "Data"
-msgstr ""
+msgstr "Veri"
 
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
@@ -631,106 +662,109 @@ msgid ""
 "record, just like attachments. Don't put a parent directory if you select a "
 "parent model."
 msgstr ""
+"Buraya bir nesne koyarsanız, bu dizin şablonu bütün bu nesnelerin altında "
+"görünecektir. Böyle dizinler, ekler gibi, özel modele ve kayıta "
+"\"eklenecektir\". Ana bir model seçerseniz ana dizin koymayın."
 
 #. module: document
 #: view:document.directory:0
 msgid "Definition"
-msgstr ""
+msgstr "Tanım"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "October"
-msgstr ""
+msgstr "Ekim"
 
 #. module: document
 #: view:document.directory:0
 msgid "Seq."
-msgstr "Sıra"
+msgstr "Dizi"
 
 #. module: document
 #: selection:document.storage,type:0
 msgid "Database"
-msgstr ""
+msgstr "Veritabanı"
 
 #. module: document
 #: help:document.configuration,project:0
 msgid "Auto directory configuration for Projects."
-msgstr ""
+msgstr "Projelerin Otomatik Dizin yapılandırması"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Related to"
-msgstr ""
+msgstr "Bağlı olduğu"
 
 #. module: document
 #: model:ir.module.module,shortdesc:document.module_meta_information
 msgid "Integrated Document Management System"
-msgstr "Entegre Edilen Döküman Yönetim Sistemi"
+msgstr "Entegre Edilen BelgeYönetim Sistemi"
 
 #. module: document
 #: view:document.configuration:0
 msgid "Choose the following Resouces to auto directory configuration."
-msgstr ""
+msgstr "Aşağıdaki kaynakları otomatik dizin yapılandırması için seçin."
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Attached To"
-msgstr ""
+msgstr "Ekli Olduğu"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reports_document
 msgid "Dashboard"
-msgstr ""
+msgstr "Kontrol paneli"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_user_graph
 msgid "Files By Users"
-msgstr ""
+msgstr "Kullanıcıya göre Dosyalar"
 
 #. module: document
 #: field:document.storage,readonly:0
 msgid "Read Only"
-msgstr ""
+msgstr "Salt Okunur"
 
 #. module: document
 #: field:document.directory.dctx,expr:0
 msgid "Expression"
-msgstr ""
+msgstr "Anlatım"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
-msgstr ""
+msgstr "Dizin adı eşsiz olmalı"
 
 #. module: document
 #: field:document.directory,create_uid:0
 #: field:document.storage,create_uid:0
 msgid "Creator"
-msgstr ""
+msgstr "Oluşturan"
 
 #. module: document
 #: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
-msgstr "Ay Bazında Dosyalar"
+msgstr "Aya göre Dosyalar"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "September"
-msgstr ""
+msgstr "Eylül"
 
 #. module: document
 #: field:document.directory.content,prefix:0
 msgid "Prefix"
-msgstr ""
+msgstr "Önek"
 
 #. module: document
 #: field:report.document.wall,last:0
 msgid "Last Posted Time"
-msgstr "Son Gönderilen Zaman"
+msgstr "Son İşleme Zamanı"
 
 #. module: document
 #: field:report.document.user,datas_fname:0
@@ -740,54 +774,54 @@ msgstr "Dosya Adı"
 #. module: document
 #: view:document.configuration:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: document
 #: field:document.directory,ressource_id:0
 msgid "Resource ID"
-msgstr "Kaynak ID"
+msgstr "Kaynak Kimliği"
 
 #. module: document
 #: selection:document.storage,type:0
 msgid "External file storage"
-msgstr ""
+msgstr "Dış dosya saklama"
 
 #. module: document
 #: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_wall
 #: view:report.document.wall:0
 msgid "Wall of Shame"
-msgstr ""
+msgstr "Utanç Duvarı"
 
 #. module: document
 #: help:document.storage,path:0
 msgid "For file storage, the root path of the storage"
-msgstr ""
+msgstr "Dosya saklamak için, saklama için kök yoldur."
 
 #. module: document
 #: model:ir.model,name:document.model_report_files_partner
 msgid "Files details by Partners"
-msgstr "Cari Detaylı Dosyaları"
+msgstr "Paydaşa göre Dosya Ayrıntıları"
 
 #. module: document
 #: field:document.directory.dctx,field:0
 msgid "Field"
-msgstr ""
+msgstr "Alan"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_dctx
 msgid "Directory Dynamic Context"
-msgstr ""
+msgstr "Dizin Dinamik İçeriği"
 
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
 msgid "Parent Model"
-msgstr ""
+msgstr "Ana Model"
 
 #. module: document
 #: view:report.document.user:0
 msgid "Files by users"
-msgstr ""
+msgstr "Kullanıcıya göre dosyalar"
 
 #. module: document
 #: field:report.document.file,month:0
@@ -806,28 +840,28 @@ msgstr "Raporlama"
 #. module: document
 #: field:document.configuration,product:0
 msgid "Product"
-msgstr ""
+msgstr "Ürün"
 
 #. module: document
 #: field:document.directory,ressource_tree:0
 msgid "Tree Structure"
-msgstr ""
+msgstr "Ağaç Yapısı"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayıs"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree1
 msgid "All Users files"
-msgstr "Tüm Kullancı Dosyaları"
+msgstr "Tüm Kullancı dosyaları"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
-msgstr ""
+msgstr "Bir aydan beri dosya eklemeyen kullanıcılar"
 
 #. module: document
 #: model:ir.actions.act_window,help:document.action_document_file_form
@@ -835,37 +869,39 @@ msgid ""
 "The Documents repository gives you access to all attachments, such as mails, "
 "project documents, invoices etc."
 msgstr ""
+"Belge havuzu bütün eklere, postalar, proje belgeleri, faturalar, vb. gibi, "
+"erişmenizi sağlar."
 
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
-msgstr ""
+msgstr "Burada her giriş için bu dizindeki sanal dosyalar görünecektir."
 
 #. module: document
 #: model:ir.model,name:document.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: document
 #: view:board.board:0
 msgid "New Files"
-msgstr ""
+msgstr "Yeni Dosyalar"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "January"
-msgstr ""
+msgstr "Ocak"
 
 #. module: document
 #: view:document.directory:0
 msgid "Static"
-msgstr ""
+msgstr "Durağan"
 
 #. module: document
 #: view:report.files.partner:0
 msgid "Files By Partner"
-msgstr "Cariye Bazında Dosyalar"
+msgstr "Paydaşa göre Dosyalar"
 
 #. module: document
 #: help:document.directory.dctx,field:0
@@ -873,6 +909,7 @@ msgid ""
 "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
 "what is typed here."
 msgstr ""
+"Alanın adı. \"dctx_\" önekinin burada yazılanın ekleneceğine dikkat edin."
 
 #. module: document
 #: view:report.document.user:0
@@ -889,6 +926,7 @@ msgstr "Notlar"
 msgid ""
 "Auto directory configuration for Sale Orders and Quotation with report."
 msgstr ""
+"Bu rapordaki Satış Siparişleri ve Tekliflerin otomatik dizin yapılandırması."
 
 #. module: document
 #: help:document.directory,type:0
@@ -904,13 +942,13 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "February"
-msgstr ""
+msgstr "Şubat"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.open_board_document_manager1
 #: model:ir.ui.menu,name:document.menu_reports_document_manager1
 msgid "Statistics by User"
-msgstr ""
+msgstr "Kullanıcıya göre İstatistikler"
 
 #. module: document
 #: field:document.directory,name:0
@@ -921,23 +959,23 @@ msgstr "Adı"
 #. module: document
 #: sql_constraint:document.storage:0
 msgid "The storage path must be unique!"
-msgstr ""
+msgstr "Saklama yolu eşsiz olmalı!"
 
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
-msgstr ""
+msgstr "Alanlar"
 
 #. module: document
 #: help:document.storage,readonly:0
 msgid "If set, media is for reading only"
-msgstr ""
+msgstr "Ayarlandıysa, ortam salt okunurdur"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "April"
-msgstr ""
+msgstr "Nisan"
 
 #. module: document
 #: field:report.document.file,nbr:0
@@ -951,7 +989,7 @@ msgstr "Dosya Sayısı"
 msgid ""
 "Only members of these groups will have access to this directory and its "
 "files."
-msgstr ""
+msgstr "Bu dizine ve dosyalarına, yalnızca bu grubun üyeleri erişebilirler."
 
 #. module: document
 #: view:document.directory:0
@@ -959,74 +997,75 @@ msgid ""
 "These groups, however, do NOT apply to children directories, which must "
 "define their own groups."
 msgstr ""
+"Bu gruplar, alt dizinlere değil de sadece kendi gruplarını tanımlamalıdırlar."
 
 #. module: document
 #: field:document.directory.content.type,mimetype:0
 msgid "Mime Type"
-msgstr ""
+msgstr "Mime Türü"
 
 #. module: document
 #: field:document.directory.content,sequence:0
 msgid "Sequence"
-msgstr "Sıra No"
+msgstr "Dizi"
 
 #. module: document
 #: field:document.directory.content,name:0
 msgid "Content Name"
-msgstr ""
+msgstr "İçerik Adı"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
-msgstr ""
+msgstr "Dosya adı eşsiz olmalı !"
 
 #. module: document
 #: selection:document.storage,type:0
 msgid "Internal File storage"
-msgstr ""
+msgstr "İç Dosya saklama"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "Dizin ana ya da saklama dizini olmalıdır"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_tree
 #: model:ir.ui.menu,name:document.menu_document_directories_tree
 msgid "Directories' Structure"
-msgstr ""
+msgstr "Dizinlerin Yapısı"
 
 #. module: document
 #: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
 #: view:report.document.user:0
 msgid "Files by Resource Type"
-msgstr "Kaynak Tipine göre Dosyalar"
+msgstr "Kaynak Türüne göre Dosyalar"
 
 #. module: document
 #: field:report.document.user,name:0
 #: field:report.files.partner,name:0
 msgid "Year"
-msgstr ""
+msgstr "Yıl"
 
 #. module: document
 #: view:document.storage:0
 #: model:ir.model,name:document.model_document_storage
 #: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
-msgstr ""
+msgstr "Saklama Ortamı"
 
 #. module: document
 #: view:document.storage:0
 msgid "Search Document storage"
-msgstr ""
+msgstr "Dosya saklama Ara"
 
 #. module: document
 #: field:document.directory.content,extension:0
 msgid "Document Type"
-msgstr "Döküman Tipi"
+msgstr "Belge Türü"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index 156af432b0e..c2bf3245afb 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -41,12 +41,18 @@
         <field name="view_mode">form</field>
         <field name="target">new</field>
     </record>
+    
+    <record id="category_knowledge_mgmt_config" model="ir.actions.todo.category">
+        <field name="name">Knowledge Management</field>
+        <field name="sequence">5</field>
+    </record>    
 
     <record model="ir.actions.todo" id="config_auto_directory">
         <field name="action_id" ref="action_config_auto_directory"/>
+        <field name="category_id" ref="category_knowledge_mgmt_config"/>
         <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
-        <field name="state" eval="'skip'" />
-        <field name="restart" eval="'onskip'" />
+        <field name="type">special</field>
+        <field name="state">skip</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 7580a8831cf..b8ce97a7017 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -68,7 +68,7 @@ class abstracted_fs(object):
             db, cr = None, None
             try:
                 try:
-                    db = pooler.get_db_only(db_name)
+                    db = pooler.get_db(db_name)
                     cr = db.cursor()
                     cr.execute("SELECT 1 FROM pg_class WHERE relkind = 'r' AND relname = 'ir_module_module'")
                     if not cr.fetchone():
diff --git a/addons/document_ftp/i18n/fi.po b/addons/document_ftp/i18n/fi.po
new file mode 100644
index 00000000000..7dd3b90d649
--- /dev/null
+++ b/addons/document_ftp/i18n/fi.po
@@ -0,0 +1,138 @@
+# Finnish 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-06-27 06:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_configuration
+msgid "Auto Directory Configuration"
+msgstr "Automaattinen hakemistojen konfigurointi"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid ""
+"Indicate the network address on which your OpenERP server should be "
+"reachable for end-users. This depends on your network topology and "
+"configuration, and will only affect the links displayed to the users. The "
+"format is HOST:PORT and the default host (localhost) is only suitable for "
+"access from the server machine itself.."
+msgstr ""
+
+#. module: document_ftp
+#: field:document.ftp.configuration,progress:0
+msgid "Configuration Progress"
+msgstr "Konfiguraation eteneminen"
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "Selaa tiedostoja"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "Kuva"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,host:0
+msgid "Address"
+msgstr "Osoite"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "FTP-palvelin"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "FTP palvelimen konfiguraatio"
+
+#. module: document_ftp
+#: model:ir.module.module,description:document_ftp.module_meta_information
+msgid ""
+"This is a support FTP Interface with document management system.\n"
+"    With this module you would not only be able to access documents through "
+"OpenERP\n"
+"    but you would also be able to connect with them through the file system "
+"using the\n"
+"    FTP client.\n"
+msgstr ""
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "Selaa"
+
+#. module: document_ftp
+#: help:document.ftp.configuration,host:0
+msgid ""
+"Server address or IP and port to which users should connect to for DMS access"
+msgstr ""
+"Palvelimen osoite tai IP ja portti mihin käyttäjien tulisi ottaa yhteyttä "
+"DMS:n käyttöä varten"
+
+#. module: document_ftp
+#: model:ir.ui.menu,name:document_ftp.menu_document_browse
+msgid "Shared Repository (FTP)"
+msgstr "Jaettu tietolähde (FTP)"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Cancel"
+msgstr "_Peruuta"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr "Konfiguroi FTP palvelin"
+
+#. module: document_ftp
+#: model:ir.module.module,shortdesc:document_ftp.module_meta_information
+msgid "Integrated FTP Server with Document Management System"
+msgstr ""
+"Integroitu FTP palvelin dokumenttienhallintajärjestelmällä varustettuna"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "otsikko"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr "Dokumenttien FTP selailu"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "Tiedonhallintaohjelmiston konfiguraatio"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
+msgstr "Dokumenttien selailu"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "Browse Document"
+msgstr "Selaa dokumenttia"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
+msgstr ""
diff --git a/addons/document_ftp/i18n/tr.po b/addons/document_ftp/i18n/tr.po
new file mode 100644
index 00000000000..d629d255754
--- /dev/null
+++ b/addons/document_ftp/i18n/tr.po
@@ -0,0 +1,145 @@
+# Turkish 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-06-23 19:32+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"Language-Team: Turkish <tr@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-06-24 05:00+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_configuration
+msgid "Auto Directory Configuration"
+msgstr "Otomatik Klasör Yapılandırması"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid ""
+"Indicate the network address on which your OpenERP server should be "
+"reachable for end-users. This depends on your network topology and "
+"configuration, and will only affect the links displayed to the users. The "
+"format is HOST:PORT and the default host (localhost) is only suitable for "
+"access from the server machine itself.."
+msgstr ""
+"OpenERP sunucusunda son kullanıcıların erişebileceği ağ adresini belirtir. "
+"Bu, ağ yapınıza ve yapılandırmasına bağlıdır ve yalnızca kullanıcılara "
+"gösterilen ağları etkiler. Formatı HOST:PORT şeklindedir ve varsayılan "
+"sunucu (localhost) yalnızca sunucu cihazından erişim için uygundur."
+
+#. module: document_ftp
+#: field:document.ftp.configuration,progress:0
+msgid "Configuration Progress"
+msgstr "Yapılandırma Gelişimi"
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "Dosyalara Gözat"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "Resim"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,host:0
+msgid "Address"
+msgstr "Adres"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "FTP Sunucusu"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "FTP Sunucusu Yapılandırması"
+
+#. module: document_ftp
+#: model:ir.module.module,description:document_ftp.module_meta_information
+msgid ""
+"This is a support FTP Interface with document management system.\n"
+"    With this module you would not only be able to access documents through "
+"OpenERP\n"
+"    but you would also be able to connect with them through the file system "
+"using the\n"
+"    FTP client.\n"
+msgstr ""
+"Bu bir belge yönetim sistemli destek FTP Arayüzüdür.\n"
+"    Bu modül ile yalnızca OpenERP nin içinden belgelere erişmekle kalmayıp \n"
+"    FTP istemcisini kullanarak dosya sistemi içinden de \n"
+"    bağlanabileceksiniz.\n"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "_Gözat"
+
+#. module: document_ftp
+#: help:document.ftp.configuration,host:0
+msgid ""
+"Server address or IP and port to which users should connect to for DMS access"
+msgstr ""
+"DMS erişimi için kullanıcıların bağlanacağı sunucu adresi ya da IP ve "
+"bağlantı noktasıdır."
+
+#. module: document_ftp
+#: model:ir.ui.menu,name:document_ftp.menu_document_browse
+msgid "Shared Repository (FTP)"
+msgstr "Paylaşılan Havuz (FTP)"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Cancel"
+msgstr "_Vazgeç"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr "FTP Sunucusunu Yapılandır"
+
+#. module: document_ftp
+#: model:ir.module.module,shortdesc:document_ftp.module_meta_information
+msgid "Integrated FTP Server with Document Management System"
+msgstr "Belge Yönetim Sistemi ile entegre FTP Sunucusu"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "unvan"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr "FTP BelgeTaraması"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "Bilgi Birikimi Uygulama Ayarları"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
+msgstr "Belge Tarama"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "Browse Document"
+msgstr "Belge Tara"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index 151e2ce49c6..9943fa6d177 100644
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ b/addons/document_ftp/wizard/ftp_configuration_view.xml
@@ -44,10 +44,12 @@
         <field name="view_mode">form</field>
         <field name="target">new</field>
     </record>
-
+    
     <record model="ir.actions.todo" id="config_auto_directory">
         <field name="action_id" ref="action_config_auto_directory"/>
+        <field name="category_id" ref="document.category_knowledge_mgmt_config"/>
         <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
+        <field name="state">skip</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/document_ics/document_ics_config_wizard.xml b/addons/document_ics/document_ics_config_wizard.xml
index e338765e97d..efa232a0a0d 100644
--- a/addons/document_ics/document_ics_config_wizard.xml
+++ b/addons/document_ics/document_ics_config_wizard.xml
@@ -55,7 +55,9 @@
          
         <record id="config_wizard_step_case_section_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_view_document_ics_config_directories"/>
-            <field name="restart">always</field>
+            <field name="category_id" ref="document.category_knowledge_mgmt_config"/>
+            <field name="type">special</field>
+            <field name="state">skip</field>
         </record>
      </data>
 </openerp>
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 8c606e4cca0..5e01bf6a66c 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -361,7 +361,7 @@ class openerp_dav_handler(dav_interface):
         for db_name in result:
             cr = None
             try:
-                db = pooler.get_db_only(db_name)
+                db = pooler.get_db(db_name)
                 cr = db.cursor()
                 cr.execute("SELECT id FROM ir_module_module WHERE name = 'document' AND state='installed' ")
                 res=cr.fetchone()
diff --git a/addons/email_template/i18n/sv.po b/addons/email_template/i18n/sv.po
index 49d87218919..2d628f0c74e 100644
--- a/addons/email_template/i18n/sv.po
+++ b/addons/email_template/i18n/sv.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-12-15 11:06+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-06-03 14:08+0000\n"
+"Last-Translator: Jan-Eric Lindh <jelindh@gmail.com>\n"
 "Language-Team: Swedish <sv@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-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-04 04:53+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -919,7 +919,7 @@ msgid "Close"
 msgstr "Stäng"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr ""
@@ -1007,7 +1007,7 @@ msgid "Email Mailbox"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: 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"
@@ -1075,7 +1075,7 @@ msgstr ""
 #. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
-msgstr ""
+msgstr "Mallspråk"
 
 #. module: email_template
 #: field:email.template,def_cc:0
@@ -1115,7 +1115,9 @@ 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 "E-post"
 
diff --git a/addons/email_template/i18n/tr.po b/addons/email_template/i18n/tr.po
index b76641ce7e0..2862a96cba3 100644
--- a/addons/email_template/i18n/tr.po
+++ b/addons/email_template/i18n/tr.po
@@ -8,30 +8,30 @@ 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-13 23:13+0000\n"
-"Last-Translator: Arif Aydogmus <arifaydogmus@gmail.com>\n"
+"PO-Revision-Date: 2011-06-27 18:17+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <tr@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-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr "Gönderdikten sonra e-postayı sil."
+msgstr "Gönderdikten sonra epostaları kalıcı olarak sil."
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Email Account Configuration"
-msgstr "E-posta Hesapları Yapılandırma"
+msgstr "Eposta Hesapları Yapılandırma"
 
 #. 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 "Çoklu öğeler için e-postalar giden kutusuna kaydedildi."
+msgstr "Çoklu öğeler için epostalar giden kutusuna kaydedildi."
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:59
@@ -54,22 +54,22 @@ msgstr "Kişisel E-postalar"
 #. module: email_template
 #: field:email.template,file_name:0
 msgid "Report Filename"
-msgstr "Rapor dosyasının adı"
+msgstr "Rapor Dosyasının adı"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Email Content  "
-msgstr "E-posta içeriği  "
+msgstr "Eposta İçeriği  "
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Send mail Wizard"
-msgstr "E-Posta Gönderim Sihirbazı"
+msgstr "Posta Gönderim Sihirbazı"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Plain Text & HTML with no attachments"
-msgstr "Salt Metin ve Eklentisiz HTML"
+msgstr "Düz Metin ve Eklentisiz HTML"
 
 #. module: email_template
 #: help:email.template,model_object_field:0
@@ -81,7 +81,7 @@ msgid ""
 msgstr ""
 "Kullanmak istediğiniz modelden alanı seçiniz.\n"
 "Eğer ilintili bir alansa içiçe değerleri aşağıdaki kutudan seçebilirsiniz.\n"
-"(Not: Eğer herhangi bir değer yoksa mutlaka doğru modeli seçiniz)"
+"(Not: Eğer herhangi bir değer yoksa doğru modeli seçtiğinizden emin olun)"
 
 #. module: email_template
 #: field:email_template.preview,body_html:0
@@ -89,13 +89,13 @@ msgstr ""
 #: field:email_template.send.wizard,body_html:0
 #: field:email_template.send.wizard,body_text:0
 msgid "Body"
-msgstr "İleti metni"
+msgstr "Gövde"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Deletion of Record failed"
-msgstr "Kayıt silinemedi"
+msgstr "Kayıt Silinemedi"
 
 #. module: email_template
 #: help:email_template.account,company:0
@@ -103,8 +103,8 @@ msgid ""
 "Select if this mail account does not belong to specific user but to the "
 "organization as a whole. eg: info@companydomain.com"
 msgstr ""
-"Bu e-posta hesabı belirli bir kullanıcıya ait değilde birçok kişinin üyesi "
-"olduğu bir grup hesabı ise seçin. Ör: info@companydomain.com"
+"Bu posta hesabı belirli bir kullanıcıya ait değilde bir kurumun geneline "
+"aitse seçin. Ör: info@companydomain.com"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
@@ -114,19 +114,19 @@ msgstr "Şimdi gönder"
 #. module: email_template
 #: selection:email_template.mailbox,state:0
 msgid "Not Applicable"
-msgstr "Uygun Değil"
+msgstr "Uygulanabilir Değil"
 
 #. 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 "E-posta Hesapları"
+msgstr "Eposta Hesapları"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Send all mails"
-msgstr "Tüm E-Postaları gönder"
+msgstr "Tüm postaları gönder"
 
 #. module: email_template
 #: help:email_template.account,smtpuname:0
@@ -134,13 +134,13 @@ msgid ""
 "Specify the username if your SMTP server requires authentication, otherwise "
 "leave it empty."
 msgstr ""
-"SMTP sunucunuz kimlik doğrulama gerektiriyorsa kullanıcı adınızı yazınız "
+"SMTP sunucunuz kimlik doğrulama gerektiriyorsa kullanıcı adınızı yazınız, "
 "gerektirmiyorsa boş bırakınız."
 
 #. module: email_template
 #: field:email_template.mailbox,server_ref:0
 msgid "Server Reference of mail"
-msgstr "E-Posta Sunucu Referansı"
+msgstr "Posta Sunucu Referansı"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -154,8 +154,8 @@ msgid ""
 "Carbon Copy address(es), comma-separated. Placeholders can be used here. "
 "e.g. ${object.email_cc}"
 msgstr ""
-"Kopya alıcıları virgülle ayrılır. Yertutucular kullanılabilir. Ör: "
-"${object.email_cc}"
+"Karbon Kopya adres(ler) virgülle ayrılı. Yertutucular burada kullanılabilir. "
+"Örn. ${object.email_cc}"
 
 #. module: email_template
 #: view:email.template:0
@@ -183,13 +183,13 @@ msgstr ""
 #. module: email_template
 #: field:email.template,from_account:0
 msgid "Email Account"
-msgstr "E-Posta Hesabı"
+msgstr "Eposta Hesabı"
 
 #. 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 "Bir ya da daha çok nesne için e-posta gönderimi başarısız."
+msgstr "Bir ya da daha çok nesne için eposta gönderimi başarısız."
 
 #. module: email_template
 #: view:email_template.send.wizard:0
@@ -197,7 +197,7 @@ msgid ""
 "Add here all attachments of the current document you want to include in the "
 "Email."
 msgstr ""
-"E-postada yer almasını istediğiniz dökümana ait tüm ekleri buraya ekleyiniz."
+"Epostada yer almasını istediğiniz dökümana ait tüm ekleri buraya ekleyiniz."
 
 #. module: email_template
 #: help:email.template,lang:0
@@ -205,7 +205,7 @@ msgid ""
 "The default language for the email. Placeholders can be used here. eg. "
 "${object.partner_id.lang}"
 msgstr ""
-"E-Posta için öntanımlı dil. Burada yer tutucular kullanılabilir. Örneğin, "
+"Eposta için varsayılan dil. Burada yertutucular kullanılabilir. Örneğin, "
 "${object.partner_id.lang}"
 
 #. module: email_template
@@ -214,7 +214,7 @@ msgid ""
 "When you choose relationship fields this field will specify the sub value "
 "you can use."
 msgstr ""
-"İlintili alanlar seçtiğinizde bu alan kullanabileceğiniz alt değeri "
+"İlişkili alanları seçtiğinizde bu alan kullanabileceğiniz alt değeri "
 "belirtecektir"
 
 #. module: email_template
@@ -951,7 +951,7 @@ msgid "Close"
 msgstr "Kapat"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr "İleti gönderiminde hata: %s"
@@ -1043,7 +1043,7 @@ msgid "Email Mailbox"
 msgstr "E-Posta Kutusu"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: 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"
@@ -1158,7 +1158,9 @@ 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 "E-postalar"
 
@@ -1213,6 +1215,10 @@ msgid ""
 "emails.\n"
 "    "
 msgstr ""
+"\n"
+"    Eposta Şablonu, temel olarak epostaların gönderimi için Power Epostanın "
+"özüdür.\n"
+"    "
 
 #. module: email_template
 #: view:email_template.send.wizard:0
diff --git a/addons/event/event.py b/addons/event/event.py
index 4d392689bba..0fc28c7c193 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -207,9 +207,9 @@ class event_event(osv.osv):
         'type': fields.many2one('event.type', 'Type', help="Type of Event like Seminar, Exhibition, Conference, Training.", readonly=False, states={'done': [('readonly', True)]}),
         'register_max': fields.integer('Maximum Registrations', help="Provide Maximum Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}),
         'register_min': fields.integer('Minimum Registrations', help="Provide Minimum Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}),
-        'register_current': fields.function(_get_register, method=True, string='Confirmed Registrations', multi='register_current',
+        'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_current',
             help="Total of Open and Done Registrations"),
-        'register_prospect': fields.function(_get_register, method=True, string='Unconfirmed Registrations', multi='register_prospect',
+        'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_prospect',
             help="Total of Prospect Registrations"),
         'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
         'date_begin': fields.datetime('Beginning date', required=True, help="Beginning Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
@@ -301,7 +301,7 @@ class event_registration(osv.osv):
         "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
         "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, method=True, string='Subtotal', digits_compute=dp.get_precision('Sale Price'), store=True),
+        '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)]}),
         "event_product": fields.char("Invoice Name", size=128, readonly=True, states={'draft': [('readonly', False)]}),
         "tobe_invoiced": fields.boolean("To be Invoiced", readonly=True, states={'draft': [('readonly', False)]}),
diff --git a/addons/event/i18n/sv.po b/addons/event/i18n/sv.po
index d3643d4c140..c3eb171c8d2 100644
--- a/addons/event/i18n/sv.po
+++ b/addons/event/i18n/sv.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-22 02:01+0000\n"
-"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2011-06-03 14:09+0000\n"
+"Last-Translator: Stefan Lind <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-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-04 04:53+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: event
 #: view:event.event:0
@@ -72,7 +72,7 @@ msgstr "Skapa fakturor"
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Registration Date"
-msgstr ""
+msgstr "Registreringsdatum"
 
 #. module: event
 #: help:event.event,main_speaker_id:0
diff --git a/addons/event_project/i18n/ca.po b/addons/event_project/i18n/ca.po
index 6c4960e2758..67a5acb6679 100644
--- a/addons/event_project/i18n/ca.po
+++ b/addons/event_project/i18n/ca.po
@@ -7,30 +7,29 @@ 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 03:57+0000\n"
-"Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
-"<resteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-05-26 05:07+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-27 04:46+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
 msgid "Event Project"
-msgstr ""
+msgstr "Projecte d'esdeveniment"
 
 #. module: event_project
 #: field:event.project,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Data final"
 
 #. module: event_project
 #: view:event.project:0
 msgid "Ok"
-msgstr "Ok"
+msgstr "D'acord"
 
 #. module: event_project
 #: model:ir.module.module,description:event_project.module_meta_information
@@ -40,6 +39,10 @@ msgid ""
 "    This module allows you to create retro planning for managing your "
 "events.\n"
 msgstr ""
+"Organització i gestió d'esdeveniments.\n"
+"\n"
+"    Aquest mòdul us permet crear retro planificacions per gestionar els "
+"esdeveniments.\n"
 
 #. module: event_project
 #: help:event.project,project_id:0
@@ -48,17 +51,20 @@ msgid ""
 "After click on  'Create Retro-planning', New Project will be duplicated from "
 "this template project."
 msgstr ""
+"Aquesta és la plantilla del projecte. El projecte d'esdeveniment és un "
+"duplicat d'aquesta plantilla. Després de fer clic a 'Crea retro-"
+"planificació', el projecte nou serà duplicat a partir d'aquesta plantilla."
 
 #. module: event_project
 #: view:event.project:0
 #: model:ir.actions.act_window,name:event_project.action_event_project
 msgid "Retro-Planning"
-msgstr ""
+msgstr "Retro-planificació"
 
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Error! La data de tancament no es pot definir abans de la d'inici."
 
 #. module: event_project
 #: field:event.event,project_id:0
@@ -74,22 +80,24 @@ msgstr "Tasques"
 #. module: event_project
 #: view:event.event:0
 msgid "All tasks"
-msgstr ""
+msgstr "Totes les tasques"
 
 #. module: event_project
 #: model:ir.module.module,shortdesc:event_project.module_meta_information
 msgid "Event Project - Create Retro-Planning to manage your Events"
 msgstr ""
+"Projecte d'esdeveniment - Crea retro-planificació per gestionar els "
+"esdeveniments"
 
 #. module: event_project
 #: field:event.project,project_id:0
 msgid "Template of Project"
-msgstr ""
+msgstr "Plantilla de projecte"
 
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "Error! No podeu crear esdeveniments recursius."
 
 #. module: event_project
 #: field:event.event,task_ids:0
@@ -99,12 +107,12 @@ msgstr "Tasques del projecte"
 #. module: event_project
 #: view:event.project:0
 msgid "Close"
-msgstr ""
+msgstr "Tanca"
 
 #. module: event_project
 #: field:event.project,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: event_project
 #: view:event.event:0
diff --git a/addons/event_project/i18n/fi.po b/addons/event_project/i18n/fi.po
new file mode 100644
index 00000000000..0e94e838766
--- /dev/null
+++ b/addons/event_project/i18n/fi.po
@@ -0,0 +1,122 @@
+# Finnish 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-06-29 07:23+0000\n"
+"Last-Translator: Jussi Mikkola <Unknown>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-30 04:34+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: event_project
+#: model:ir.model,name:event_project.model_event_project
+msgid "Event Project"
+msgstr "Tapahtumaprojekti"
+
+#. module: event_project
+#: field:event.project,date:0
+msgid "Date End"
+msgstr "Loppupäiväys"
+
+#. module: event_project
+#: view:event.project:0
+msgid "Ok"
+msgstr "OK"
+
+#. module: event_project
+#: model:ir.module.module,description:event_project.module_meta_information
+msgid ""
+"Organization and management of events.\n"
+"\n"
+"    This module allows you to create retro planning for managing your "
+"events.\n"
+msgstr ""
+
+#. module: event_project
+#: help:event.project,project_id:0
+msgid ""
+"This is Template Project. Project of event is a duplicate of this Template. "
+"After click on  'Create Retro-planning', New Project will be duplicated from "
+"this template project."
+msgstr ""
+
+#. module: event_project
+#: view:event.project:0
+#: model:ir.actions.act_window,name:event_project.action_event_project
+msgid "Retro-Planning"
+msgstr "Retro suunnittelu"
+
+#. module: event_project
+#: constraint:event.event:0
+msgid "Error ! Closing Date cannot be set before Beginning Date."
+msgstr "Virhe ! Päättymispäivä ei voi olla aikaisempi kuin alkupäivä"
+
+#. module: event_project
+#: field:event.event,project_id:0
+msgid "Project"
+msgstr "Projekti"
+
+#. module: event_project
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event_project.act_event_task
+msgid "Tasks"
+msgstr "Tehtävät"
+
+#. module: event_project
+#: view:event.event:0
+msgid "All tasks"
+msgstr "Kaikki tehtävät"
+
+#. module: event_project
+#: model:ir.module.module,shortdesc:event_project.module_meta_information
+msgid "Event Project - Create Retro-Planning to manage your Events"
+msgstr "Tapahtumaprojekti - luo retro suunitelma tapahtumien hallintaan"
+
+#. module: event_project
+#: field:event.project,project_id:0
+msgid "Template of Project"
+msgstr "Projektin mallipohja"
+
+#. module: event_project
+#: constraint:event.event:0
+msgid "Error ! You cannot create recursive event."
+msgstr "Virhe ! et voi luoda rekursiivisia tapahtumia."
+
+#. module: event_project
+#: field:event.event,task_ids:0
+msgid "Project tasks"
+msgstr "Projektin tehtävät"
+
+#. module: event_project
+#: view:event.project:0
+msgid "Close"
+msgstr "Sulje"
+
+#. module: event_project
+#: field:event.project,date_start:0
+msgid "Date Start"
+msgstr "Aloituspäivämäärä"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Create Retro-Planning"
+msgstr "Luo retrosuunnitelma"
+
+#. module: event_project
+#: model:ir.model,name:event_project.model_event_event
+msgid "Event"
+msgstr "Tapahtuma"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Tasks management"
+msgstr "Tehtävienhallinta"
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 9950502b4dd..d2694fdb958 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -41,6 +41,7 @@ Fetch email from POP / IMAP servers.
         "fetchmail_view.xml",
         "fetchmail_data.xml",
         'security/ir.model.access.csv',
+        'fetchmail_installer_view.xml'
     ],
     'demo_xml': [
 
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 41f84cfdedd..9817f0d6633 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -59,9 +59,9 @@ class email_server(osv.osv):
         'password' : fields.char('Password', size=1024, invisible=True, required=True, readonly=True, states={'draft':[('readonly', False)]}),
         'note': fields.text('Description'),
         'action_id':fields.many2one('ir.actions.server', 'Email Server Action', required=False, domain="[('state','=','email')]", help="An Email Server Action. It will be run whenever an e-mail is fetched from server."),
-        'object_id': fields.many2one('ir.model', "Model", required=True, help="OpenObject Model. Generates a record of this model.\nSelect Object with message_new attrbutes."),
+        'object_id': fields.many2one('ir.model', "Object To Create", required=True, help="Whenever an email arrives, it automatically creates the object of this type with all the information attached."),
         'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Priority between 0 to 10, select define the order of Processing"),
-        'user_id':fields.many2one('res.users', 'User', required=False),
+        'user_id':fields.many2one('res.users', 'User', required=False,  help="This is the user that runs the cron"),
         'message_ids': fields.one2many('mailgate.message', 'server_id', 'Messages', readonly=True),
     }
     _defaults = {
@@ -116,7 +116,7 @@ class email_server(osv.osv):
         if context is None:
             context = {}
         for server in self.browse(cr, uid, ids, context=context):
-            logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name))
+            logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name))
             context.update({'server_id': server.id, 'server_type': server.type})
             try:
                 if server.type == 'imap':
@@ -199,7 +199,7 @@ class email_server(osv.osv):
 
                     pop_server.quit()
 
-                    logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name))
+                    logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name))
 
             except Exception, e:
                 logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e)))
diff --git a/addons/fetchmail/fetchmail_installer_view.xml b/addons/fetchmail/fetchmail_installer_view.xml
new file mode 100644
index 00000000000..48c9a174998
--- /dev/null
+++ b/addons/fetchmail/fetchmail_installer_view.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+	 <record model="ir.actions.act_window" id="view_email_server_form_installer">
+	        <field name="name">Setup Your Mail server</field>
+	        <field name="type">ir.actions.act_window</field>
+	        <field name="res_model">email.server</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">tree,form</field>
+	        <field name="view_id" ref="fetchmail.view_email_server_form"/>
+	    </record>
+
+	    <record id="view_email_server_form_installer_todo" model="ir.actions.todo">
+	        <field name="action_id" ref="view_email_server_form_installer"/>
+	        <field name="category_id" ref="base.category_sales_management_config"/>
+	        <field name="sequence">4</field>
+	        <field name="type">normal</field>
+	        <field name="state">skip</field>
+	    </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 096a83bfa4e..99f421ac4a5 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -61,9 +61,9 @@
                     </notebook>
                     <group col="6" colspan="4">
                         <field name="state" select="1"/>
-                        <button string="Confirm" type="object" name="button_confirm_login" states="draft"/>
+                        <button string="Confirm" type="object" name="button_confirm_login" states="draft" icon="gtk-apply"/>
                         <button string="Fetch Emails" type="object" name="button_fetch_mail" states="done"/>
-                        <button string="Set to Draft" type="object" name="set_draft"/>
+                        <button string="Set to Draft" type="object" name="set_draft" icon="gtk-convert"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/google_base_account/__init__.py b/addons/google_base_account/__init__.py
new file mode 100644
index 00000000000..e1a476431af
--- /dev/null
+++ b/addons/google_base_account/__init__.py
@@ -0,0 +1,26 @@
+# -*- 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 google_base_account
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/google_base_account/__openerp__.py b/addons/google_base_account/__openerp__.py
new file mode 100644
index 00000000000..409ca205c74
--- /dev/null
+++ b/addons/google_base_account/__openerp__.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Google user',
+    'version': '1.0',
+    'category': 'Generic Modules/Others',
+    'description': """The module adds google user  in res user""",
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['base'],
+    'init_xml': [],
+    'update_xml': [
+                  'google_base_account_view.xml',
+                  'wizard/google_login_view.xml',
+                   ],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+    'certificate': '',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/google_base_account/google_base_account.py b/addons/google_base_account/google_base_account.py
new file mode 100644
index 00000000000..c860ec84374
--- /dev/null
+++ b/addons/google_base_account/google_base_account.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields,osv
+    
+class res_users(osv.osv):
+    _inherit = "res.users"
+    _columns = {
+        'gmail_user': fields.char('Username', size=64,),
+        'gmail_password': fields.char('Password', size=64),
+    }
+res_users()    
+
+# vim:expandtab:smartindent:toabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/google_base_account/google_base_account_view.xml b/addons/google_base_account/google_base_account_view.xml
new file mode 100644
index 00000000000..9296ba135c0
--- /dev/null
+++ b/addons/google_base_account/google_base_account_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+		<record id="view_users_gogole_form" model="ir.ui.view">
+        <field name="name">res.users.google.form1</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="//notebook[last()]" position="inside">
+                     <page string=" Synchronization ">
+                     	<separator string="Google Account" colspan="4" />
+						<field name="gmail_user"/>
+                      <field name="gmail_password" password="True"/>
+					</page>
+              </xpath>
+          </field>
+     </record>
+    </data>
+</openerp>
diff --git a/addons/google_base_account/wizard/__init__.py b/addons/google_base_account/wizard/__init__.py
new file mode 100644
index 00000000000..a6b9c644a1e
--- /dev/null
+++ b/addons/google_base_account/wizard/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import google_login
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/google_base_account/wizard/google_login.py b/addons/google_base_account/wizard/google_login.py
new file mode 100644
index 00000000000..78f27e51da4
--- /dev/null
+++ b/addons/google_base_account/wizard/google_login.py
@@ -0,0 +1,84 @@
+# -*- 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 _
+try:
+    import gdata.contacts.service
+    import gdata.contacts.client
+    import gdata.calendar.service
+except ImportError:
+    raise osv.except_osv(_('Google Contacts Import Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list'))
+
+class google_login(osv.osv_memory):
+    _description ='Google Contact'
+    _name = 'google.login'
+    _columns = {
+        'user': fields.char('Google Username', size=64, required=True),
+        'password': fields.char('Google Password', size=64),
+    }
+
+    def google_login(self, user, password, type='', context=None):
+        if type == 'group': 
+            gd_client = gdata.contacts.client.ContactsClient(source='OpenERP')
+        if type == 'contact' :   
+            gd_client = gdata.contacts.service.ContactsService()
+        if type == 'calendar':
+            gd_client = gdata.calendar.service.CalendarService()
+        else:
+            gd_client = gdata.contacts.service.ContactsService()     
+        try:    
+            gd_client.ClientLogin(user, password,gd_client.source)
+        except Exception:
+            return False
+        return gd_client
+
+
+    def default_get(self, cr, uid, fields, context=None):
+        res = super(google_login, self).default_get(cr, uid, fields, context=context)
+        user_obj = self.pool.get('res.users').browse(cr, uid, uid)
+        if 'user' in fields:
+            res.update({'user': user_obj.gmail_user})
+        if 'password' in fields:
+            res.update({'password': user_obj.gmail_password})
+        return res
+    
+    def login(self, cr, uid, ids, context=None):
+        data = self.read(cr, uid, ids)[0]
+        user = data['user']
+        password = data['password']
+        if self.google_login(user, password):
+            res = {
+                   'gmail_user': user,
+                   'gmail_password': password
+            }
+            self.pool.get('res.users').write(cr, uid, uid, res, context=context)
+        else:
+            raise osv.except_osv(_('Error'), _("Authentication fail check the user and password !"))
+
+        return self._get_next_action(cr, uid, context=context)
+
+    def _get_next_action(self, cr, uid, context=None):
+        return {'type': 'ir.actions.act_window_close'}
+
+google_login()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/google_base_account/wizard/google_login_view.xml b/addons/google_base_account/wizard/google_login_view.xml
new file mode 100644
index 00000000000..9c5c93c613e
--- /dev/null
+++ b/addons/google_base_account/wizard/google_login_view.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_google_login_form">
+            <field name="name">google.login.form</field>
+            <field name="model">google.login</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Google login" >
+                    <group colspan="4" col="4" width="300">
+                        <field name="user" />
+                        <newline/>
+                        <label string="ex: user@gmail.com" align="1.0" colspan="2"/>
+                        <newline/>
+                        <field name="password" password="True"/>
+                    </group>
+                    <separator string="" colspan="4"/>
+                    <group colspan="4" col="4">
+                        <group colspan="2"/>
+                        <group colspan="2">  
+                            <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                            <button name="login" string="_Login" type="object" icon="terp-check"/>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        <!-- 
+            Login Action 
+        -->
+        <record model="ir.actions.act_window" id="act_google_login_form">
+          <field name="name">Google Login</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">google.login</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+          <field name="view_id" ref="view_google_login_form" />
+        </record>
+    </data>
+</openerp>
diff --git a/addons/google_map/i18n/ar.po b/addons/google_map/i18n/ar.po
index eedf2b8b77b..a9962ed7e5a 100644
--- a/addons/google_map/i18n/ar.po
+++ b/addons/google_map/i18n/ar.po
@@ -7,31 +7,31 @@ 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-08 16:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-06-18 11:13+0000\n"
+"Last-Translator: kifcaliph <kifcaliph@hotmail.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-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-19 04:36+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: google_map
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Map"
-msgstr ""
+msgstr "خريطة جوجل"
 
 #. module: google_map
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Street2 : "
-msgstr ""
+msgstr "شارع 2: "
 
 #. module: google_map
 #: model:ir.actions.wizard,name:google_map.wizard_google_map
 msgid "Launch Google Map"
-msgstr ""
+msgstr "فتح خريطة جوجل"
 
 #. module: google_map
 #: model:ir.module.module,description:google_map.module_meta_information
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 59e4129fec7..dbd3b393345 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -45,7 +45,7 @@ class hr_employee_category(osv.osv):
     _description = "Employee Category"
     _columns = {
         'name': fields.char("Category", size=64, required=True),
-        'complete_name': fields.function(_name_get_fnc, method=True, type="char", string='Name'),
+        'complete_name': fields.function(_name_get_fnc, type="char", string='Name'),
         'parent_id': fields.many2one('hr.employee.category', 'Parent Category', select=True),
         'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories')
     }
@@ -92,8 +92,8 @@ class hr_job(osv.osv):
     _description = "Job Description"
     _columns = {
         'name': fields.char('Job Name', size=128, required=True, select=True),
-        'expected_employees': fields.function(_no_of_employee, method=True, string='Expected Employees', help='Required number of Employees in total for that job.', multi="no_of_employee"),
-        'no_of_employee': fields.function(_no_of_employee, method=True, string="No of Employee", help='Number of employee with that job.', multi="no_of_employee"),
+        'expected_employees': fields.function(_no_of_employee, string='Expected Employees', help='Required number of Employees in total for that job.', multi="no_of_employee", store=True),
+        'no_of_employee': fields.function(_no_of_employee, string="No of Employee", help='Number of employee with that job.', multi="no_of_employee", store=True),
         'no_of_recruitment': fields.float('Expected in Recruitment'),
         'employee_ids': fields.one2many('hr.employee', 'job_id', 'Employees'),
         'description': fields.text('Job Description'),
@@ -241,16 +241,19 @@ class res_users(osv.osv):
 
     def create(self, cr, uid, data, context=None):
         user_id = super(res_users, self).create(cr, uid, data, context=context)
-        data_obj = self.pool.get('ir.model.data')
-        try:
-            data_id = data_obj._get_id(cr, uid, 'hr', 'ir_ui_view_sc_employee')
-            view_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
-            self.pool.get('ir.ui.view_sc').copy(cr, uid, view_id, default = {
-                                        'user_id': user_id}, context=context)
-        except:
-            # Tolerate a missing shortcut. See product/product.py for similar code.
-            logging.getLogger('orm').debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
-
+        
+        # add shortcut unless 'noshortcut' is True in context
+        if not(context and context.get('noshortcut', False)):
+            data_obj = self.pool.get('ir.model.data')
+            try:
+                data_id = data_obj._get_id(cr, uid, 'hr', 'ir_ui_view_sc_employee')
+                view_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
+                self.pool.get('ir.ui.view_sc').copy(cr, uid, view_id, default = {
+                                            'user_id': user_id}, context=context)
+            except:
+                # Tolerate a missing shortcut. See product/product.py for similar code.
+                logging.getLogger('orm').debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
+        
         return user_id
 
 res_users()
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index c885fdf30bd..3332207cb17 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -44,7 +44,7 @@ class hr_department(osv.osv):
     _name = "hr.department"
     _columns = {
         'name': fields.char('Department Name', size=64, required=True),
-        'complete_name': fields.function(_dept_name_get_fnc, method=True, type="char", string='Name'),
+        'complete_name': fields.function(_dept_name_get_fnc, type="char", string='Name'),
         'company_id': fields.many2one('res.company', 'Company', select=True, required=False),
         'parent_id': fields.many2one('hr.department', 'Parent Department', select=True),
         'child_ids': fields.one2many('hr.department', 'parent_id', 'Child Departments'),
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 5ccbaefa3f5..483f6f870dd 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -4,56 +4,50 @@
 
     <record id="view_hr_installer" model="ir.ui.view">
       <field name="name">hr.installer.view</field>
-      <field name="model">hr.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-            <form position="attributes">
-                <attribute name="string">Human Resources Application Configuration</attribute>
-            </form>
-            <separator string="title" position="attributes">
-                <attribute name="string">Configure Your Human Resources Application</attribute>
-            </separator>
-            <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                <attribute name='string'></attribute>
-            </xpath>
-            <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">You can enhance the base HR Application by installing few HR-related functionalities.</attribute>
-            </xpath>
-          <group colspan="8">
+           <xpath expr="//group[@name='hr']" position="replace">
+            <newline/>
+            <separator  string="Human Resources Features" colspan="4" />
             <field name="hr_holidays"/>
-            <field name="hr_expense"/>
-            <field name="hr_recruitment"/>
-            <field name="hr_timesheet_sheet"/>
-            <field name="hr_contract"/>
-            <field name="hr_attendance"/>
-            <field name="hr_evaluation" groups="base.group_extended"/>
-            <field name="hr_payroll" groups="base.group_extended"/>
-            <field name="hr_payroll_account" groups="base.group_extended"/>
-          </group>
-          <xpath expr="//button[@string='Install Modules']" position="attributes">
-              <attribute name="string">Configure</attribute>
-          </xpath>
+            <field name="hr_expense" />
+            <field name="hr_recruitment" />
+            <field name="hr_timesheet_sheet" />
+            <field name="hr_contract" />
+            <field name="hr_attendance" />
+            <field name="hr_evaluation" />
+            <field name="hr_payroll" />
+            <field name="hr_payroll_account" groups="base.group_extended" />
+           </xpath>
         </data>
       </field>
     </record>
-
-    <record id="action_hr_installer" model="ir.actions.act_window">
-      <field name="name">Human Resources Application Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">hr.installer</field>
-      <field name="view_id" ref="view_hr_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
+    
+    <record id="category_hr_management_config" model="ir.actions.todo.category">
+        <field name="name">HR Management</field>
+        <field name="sequence">5</field>
     </record>
 
-    <record id="hr_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_hr_installer"/>
-      <field name="sequence">3</field>
-            <field name="restart">always</field>
+    <!-- employee configure  action -->
+    <record id="action_create_hr_employee_installer" model="ir.actions.act_window">
+        <field name="name">Create your employees</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">hr.employee</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_employee_form"/>
     </record>
 
+    <record id="config_wizard_action_create_hr_employee_installer" model="ir.actions.todo">
+        <field name="action_id" ref="action_create_hr_employee_installer"/>
+        <field name="category_id" ref="category_hr_management_config"/>
+        <field name="type">normal</field>
+        <field name="target">current</field>
+        <field name="state">skip</field>
+    </record>            
+
   </data>
 </openerp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 75cbd88e64d..deabaff540d 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -63,7 +63,7 @@
                                 <field name="work_location"/>
                             </group>
                             <group col="2" colspan="2">
-                                <separator string="Position" colspan="2"/>
+                                <separator string="Job Information" colspan="2"/>
                                 <field name="job_id" domain="[('state','!=','old')]"/>
                                 <field name="coach_id" />
                             </group>
@@ -157,12 +157,12 @@
 
         <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
 
-	    <record id="ir_ui_view_sc_employee" model="ir.ui.view_sc">
-	        <field name="name">Employees</field>
-	        <field name="resource">ir.ui.menu</field>
-	        <field name="user_id" ref="base.user_root"/>
-	        <field name="res_id" ref="hr.menu_open_view_employee_list_my"/>
-	    </record>
+        <record id="ir_ui_view_sc_employee" model="ir.ui.view_sc">
+            <field name="name">Employees</field>
+            <field name="resource">ir.ui.menu</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="res_id" ref="hr.menu_open_view_employee_list_my"/>
+        </record>
 
         <!--
         =======================
@@ -216,6 +216,7 @@
             <field name="model">hr.employee</field>
             <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
+            <field eval="20" name="priority"/>
             <field name="arch" type="xml">
                 <tree string="Employees">
                     <field name="name"/>
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index 001db4b97d7..0e3c61d5515 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/i18n/pt_BR.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-26 12:19+0000\n"
-"Last-Translator: Vinicius Dittgen - Proge.com.br <vinicius@gnucode.com>\n"
+"PO-Revision-Date: 2011-06-22 23:24+0000\n"
+"Last-Translator: Gustavo T <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-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-24 04:59+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -562,6 +562,13 @@ msgid ""
 "    * HR Jobs\n"
 "    "
 msgstr ""
+"\n"
+"    Módulo de gestão de recursos humanos. Você pode gerenciar:\n"
+"    * Funcionários e hierarquias: você pode definir seu funcionário com um "
+"usuário e exibir hierarquias\n"
+"    * Departamentos de RH\n"
+"    * Cargos de RH\n"
+"    "
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -569,6 +576,8 @@ msgid ""
 "In the Employee form, there are different kind of information like Contact "
 "information."
 msgstr ""
+"No formulário de empregado, existem diferentes tipos de informação, como "
+"contato, por exemplo."
 
 #. module: hr
 #: help:hr.job,expected_employees:0
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index 5e0866fdf56..bc8f7f0427d 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/i18n/tr.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-10-30 12:04+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-06-23 19:33+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-24 04:59+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -25,17 +25,17 @@ msgstr "Openerp kullanıcısı"
 #: view:hr.job:0
 #: field:hr.job,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "Gereksinimler"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
-msgstr ""
+msgstr "Hata! Yinelenen bölümler oluşturamazsınız."
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr ""
+msgstr "Personeli danışmaya bağla"
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -55,7 +55,7 @@ msgstr "İnsan Kaynakları"
 #: view:hr.employee:0
 #: view:hr.job:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruplandır..."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -66,6 +66,11 @@ msgid ""
 "will be used in the recruitment process to evaluate the applicants for this "
 "job position."
 msgstr ""
+"İş Durumları, işlerin ve gereksinimlerinin tanımlanması için kullanılır. Her "
+"iş durumunda kullanılan personel sayısını ve gelecekte kaç personel "
+"beklediğinizin kayıtlarını tutabilirsiniz. Bu iş durumu için başvuranların "
+"değerlendirilmesi için seçme işleminde kullanmak üzere bir anket de "
+"ekleyebilirsiniz."
 
 #. module: hr
 #: view:hr.employee:0
@@ -79,27 +84,27 @@ msgstr "Bölüm"
 #. module: hr
 #: help:hr.installer,hr_attendance:0
 msgid "Simplifies the management of employee's attendances."
-msgstr ""
+msgstr "Personelin devam durumunu yönetmeyi basitleştirir."
 
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr ""
+msgstr "Eski olarak İşaretle"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr ""
+msgstr "İşler"
 
 #. module: hr
 #: view:hr.job:0
 msgid "In Recruitment"
-msgstr ""
+msgstr "Seçme İşleminde"
 
 #. module: hr
 #: view:hr.installer:0
 msgid "title"
-msgstr ""
+msgstr "unvan"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -112,22 +117,22 @@ msgstr "Firma"
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Expected in Recruitment"
-msgstr ""
+msgstr "Seçim için Bekleniyor"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Holidays"
-msgstr ""
+msgstr "Tatiller"
 
 #. module: hr
 #: help:hr.installer,hr_holidays:0
 msgid "Tracks employee leaves, allocation requests and planning."
-msgstr ""
+msgstr "Personel izinlerini, tahsis istekleri ve planlamalrı izler"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_employee_marital_status
 msgid "Employee Marital Status"
-msgstr ""
+msgstr "Personel Medeni Durumu"
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -135,42 +140,44 @@ msgid ""
 "Partner that is related to the current employee. Accounting transaction will "
 "be written on this partner belongs to employee."
 msgstr ""
+"Geçerli personelle ilgili Paydaştır. Muhasebe işlemi personelle ilişkili bu "
+"paydaşa yazılacaktır."
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Link a user to an employee"
-msgstr ""
+msgstr "Kullanıcıyı bir personele bağla"
 
 #. module: hr
 #: field:hr.installer,hr_contract:0
 msgid "Employee's Contracts"
-msgstr ""
+msgstr "Personel Sözleşmeleri"
 
 #. module: hr
 #: help:hr.installer,hr_payroll:0
 msgid "Generic Payroll system."
-msgstr ""
+msgstr "Genel Bordro Sistemi"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "My Departments Employee"
-msgstr ""
+msgstr "Bölümümdeki Personel"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
 msgid "Married"
-msgstr ""
+msgstr "Evli"
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "Hata ! Personelin müdür olduğu bir bölümü seçemezsiniz."
 
 #. module: hr
 #: help:hr.employee,passport_id:0
 msgid "Employee Passport Information"
-msgstr ""
+msgstr "Personel Pasaport Bilgisi"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -179,16 +186,19 @@ msgid ""
 "to employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
+"Firmanızın Bölüm Yapısı, bölümlere göre personelle ilgili belgelerin "
+"yönetilmesinde kullanılır: giderler, zaman çizelgesi onayları, izin "
+"yönetimi, seçme işlemlemleri, v.b"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Position"
-msgstr ""
+msgstr "Durum"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr "Personel Hiyerarşisi"
+msgstr "Personel Sıradüzeni"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -196,43 +206,47 @@ msgid ""
 "The Related user field on the Employee form allows to link the OpenERP user "
 "(and her rights) to the employee."
 msgstr ""
+"Personel formundaki İlişkili Kullanıcı alanı OpenERP kullanıcısının "
+"personele bağlanmasını sağlar."
 
 #. module: hr
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Recruitement"
-msgstr ""
+msgstr "Seçim durumunda"
 
 #. module: hr
 #: field:hr.employee,identification_id:0
 msgid "Identification No"
-msgstr ""
+msgstr "Kimlik No"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "No of Employee"
-msgstr ""
+msgstr "Personel No"
 
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Female"
-msgstr "Bayan"
+msgstr "Kadın"
 
 #. module: hr
 #: help:hr.installer,hr_timesheet_sheet:0
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
 msgstr ""
+"Personelin zaman çizelgeleri ve devamlılıkları onaylamasını ve "
+"şifrelendirmesini sağlar."
 
 #. module: hr
 #: field:hr.installer,hr_evaluation:0
 msgid "Periodic Evaluations"
-msgstr ""
+msgstr "Süreli Değerlendirmeler"
 
 #. module: hr
 #: field:hr.installer,hr_timesheet_sheet:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Zaman Çizelgeleri"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
@@ -247,12 +261,12 @@ msgstr "SGK Bilgisi"
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employee with that job."
-msgstr ""
+msgstr "O işteki personel sayısı"
 
 #. module: hr
 #: field:hr.employee,work_phone:0
 msgid "Work Phone"
-msgstr "İş Telefon No."
+msgstr "İş Telefonu"
 
 #. module: hr
 #: field:hr.employee.category,child_ids:0
@@ -264,12 +278,12 @@ msgstr "Alt Kategoriler"
 #: field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr ""
+msgstr "İş Tanımı"
 
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
-msgstr "Ofis Lokasyonu"
+msgstr "Ofis Konumu"
 
 #. module: hr
 #: view:hr.employee:0
@@ -282,12 +296,12 @@ msgstr "Personel"
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr ""
+msgstr "Diğer Bilgiler"
 
 #. module: hr
 #: field:hr.employee,work_email:0
 msgid "Work E-mail"
-msgstr ""
+msgstr "İş E-postası"
 
 #. module: hr
 #: field:hr.department,complete_name:0
@@ -298,7 +312,7 @@ msgstr "Adı"
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
-msgstr ""
+msgstr "Doğum Tarihi"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
@@ -308,19 +322,19 @@ msgstr "Raporlama"
 #. module: hr
 #: model:ir.model,name:hr.model_ir_actions_act_window
 msgid "ir.actions.act_window"
-msgstr ""
+msgstr "ir.actions.act_window"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr
 msgid "Human Resources Dashboard"
-msgstr ""
+msgstr "İnsan Kaynakları Kontrol Paneli"
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,job_id:0
 #: view:hr.job:0
 msgid "Job"
-msgstr ""
+msgstr "İş"
 
 #. module: hr
 #: view:hr.department:0
@@ -331,7 +345,7 @@ msgstr "Üyeler"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
 msgid "Configuration"
-msgstr "Ayarlar"
+msgstr "Yapılandırma"
 
 #. module: hr
 #: view:hr.installer:0
@@ -339,21 +353,23 @@ msgid ""
 "You can enhance the base HR Application by installing few HR-related "
 "functionalities."
 msgstr ""
+"Bir kaç İK-ilişkili işlevsellik kurarak temel İK Uygulamasını "
+"geliştirebilirsiniz."
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategoriler"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Expected Employees"
-msgstr ""
+msgstr "Beklenen Personel"
 
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
-msgstr ""
+msgstr "Sosyal Sigorta Numarası"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_divorced
@@ -368,7 +384,7 @@ msgstr "Ana Kategori"
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error ! You cannot create recursive Categories."
-msgstr ""
+msgstr "Hata ! Yinelenen Kategoriler oluşturamazsınız."
 
 #. module: hr
 #: view:hr.department:0
@@ -377,7 +393,7 @@ msgstr ""
 #: view:res.users:0
 #: field:res.users,context_department_id:0
 msgid "Departments"
-msgstr "Departmanlar"
+msgstr "Bölümler"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
@@ -387,23 +403,23 @@ msgstr "Personel İletişimi"
 #. module: hr
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Kontrol Panelim"
 
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Male"
-msgstr "Bay"
+msgstr "Erkek"
 
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Yapılandırma İşlemi"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_form
 msgid "Categories of Employee"
-msgstr "Personel Kategorisi"
+msgstr "Personel Kategorileri"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -414,12 +430,12 @@ msgstr "Personel Kategorisi"
 #. module: hr
 #: field:hr.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Resim"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract"
-msgstr ""
+msgstr "Personel Sözleşmesi"
 
 #. module: hr
 #: help:hr.installer,hr_evaluation:0
@@ -427,21 +443,23 @@ msgid ""
 "Lets you create and manage the periodic evaluation and performance review of "
 "employees."
 msgstr ""
+"Çalışanlarınızın süreli değerlendirme ve verimlilik incelemelerini "
+"oluşturmanızı ve yönetmenizi sağlar."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
 msgid "hr.department"
-msgstr ""
+msgstr "ik.bölümü"
 
 #. module: hr
 #: help:hr.employee,parent_id:0
 msgid "It is linked with manager of Department"
-msgstr ""
+msgstr "Bölümün Müdürüne bağlanmıştır"
 
 #. module: hr
 #: field:hr.installer,hr_recruitment:0
 msgid "Recruitment Process"
-msgstr ""
+msgstr "Seçme İşlemi"
 
 #. module: hr
 #: field:hr.employee,category_ids:0
@@ -463,11 +481,22 @@ msgid ""
 "they will be able to enter time through the system. In the note tab, you can "
 "enter text data that should be recorded for a specific employee."
 msgstr ""
+"Burada, çalışanlar oluşturarak ve onları sistemde belirli niteliklere "
+"atayarak iş gücünüzü yönetebilirsiniz. Çalışanlarınızla ilgili bilgileri "
+"elde edin ve onlarla ilgili kayıt edilmesi gereken her şeyin kaydını tutun. "
+"Personel bilgisi sekmesi, personelin kimlik bilgilerini elde etmenizi "
+"sağlar. Kategori sekmesi, şirket içindeki durumlarına ve etkinliklerine "
+"bağlı olarak personelinizi ilgili çaşıan kategorisine atamanıza fırsat "
+"sağlar. Bir kategori şirket içinde veya bir bölümde bir kıdemlilik "
+"kategorisi olabilir. Zaman Çizelgesi sekmesi onların sistemden zaman "
+"girişlerini yapabilecekleri, belirli bir zaman çizelgesine ve analitik "
+"yevmiyeye atamanızı  sağlar. Not sekmesinde, belirli bir çalışan için kayıt "
+"etmeniz gereken bir metin girmenizi sağlar."
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr ""
+msgstr "Personel maaş banka hesabı"
 
 #. module: hr
 #: field:hr.department,note:0
@@ -477,7 +506,7 @@ msgstr "Not"
 #. module: hr
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Seçilen firma bu kullanıcı için izin verilen şirketler arasında yok"
 
 #. module: hr
 #: view:hr.employee:0
@@ -492,7 +521,7 @@ msgstr "İş Adresi"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
 msgid "HR Manager Dashboard"
-msgstr ""
+msgstr "İK Yönetici Kontrol Paneli"
 
 #. module: hr
 #: view:hr.employee:0
@@ -502,7 +531,7 @@ msgstr "Durum"
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Yapılandırma"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -513,12 +542,12 @@ msgstr "Kategori Yapısı"
 #. module: hr
 #: field:hr.employee,partner_id:0
 msgid "unknown"
-msgstr ""
+msgstr "bilinmeyen"
 
 #. module: hr
 #: field:hr.installer,hr_holidays:0
 msgid "Holidays / Leaves Management"
-msgstr ""
+msgstr "Tatil / İzin Yöneticisi"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -528,12 +557,12 @@ msgstr "SGK No"
 #. module: hr
 #: view:hr.employee:0
 msgid "Active"
-msgstr "Aktif"
+msgstr "Etkin"
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "Hata ! You cannot create recursive Hierarchy of Employees."
+msgstr "Hata ! Yinelemeli Personel Sıradizini yaratamazsınız."
 
 #. module: hr
 #: view:hr.department:0
@@ -551,39 +580,46 @@ msgid ""
 "    * HR Jobs\n"
 "    "
 msgstr ""
+"\n"
+"    İnsan kaynakları yönetimi modülü. Şunları yönetebilirsiniz:\n"
+"    * Çalışanlar ve sıradüzeni : Çalışanlarınızı Kullanıcı ve sıradüzenleri "
+"ile birlikte tanımlayabilirsiniz\n"
+"    * İK Bölümleri\n"
+"    * İK İşleri\n"
+"    "
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
 msgid ""
 "In the Employee form, there are different kind of information like Contact "
 "information."
-msgstr ""
+msgstr "Personel formunda sözleşme bilgileri gibi farklı bilgiler vardır."
 
 #. module: hr
 #: help:hr.job,expected_employees:0
 msgid "Required number of Employees in total for that job."
-msgstr ""
+msgstr "O iş için gerekli toplam Personel sayısı"
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Old"
-msgstr ""
+msgstr "Eski"
 
 #. module: hr
 #: field:hr.employee.marital.status,description:0
 msgid "Status Description"
-msgstr ""
+msgstr "Durum Açıklaması"
 
 #. module: hr
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Aynı kullanıcı adı ile iki kullanıcı oluşturamazsınız !"
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
 msgid "State"
-msgstr ""
+msgstr "Durum"
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -597,42 +633,42 @@ msgstr "Medeni Durumu"
 #. module: hr
 #: help:hr.installer,hr_recruitment:0
 msgid "Helps you manage and streamline your recruitment process."
-msgstr ""
+msgstr "Eleman seçme işleminizi yönetmenizi ve yürütmenizi sağlar."
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr ""
+msgstr "Personel formu ve yapısı"
 
 #. module: hr
 #: field:hr.employee,photo:0
 msgid "Photo"
-msgstr ""
+msgstr "Fotoğraf"
 
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: hr
 #: field:hr.installer,hr_payroll_account:0
 msgid "Payroll Accounting"
-msgstr ""
+msgstr "Bordro Muhasebesi"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Personal Information"
-msgstr "Personel Bilgileri"
+msgstr "Kişisel Bilgiler"
 
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport No"
-msgstr ""
+msgstr "Pasaport No"
 
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Güncel Etkinlik"
 
 #. module: hr
 #: help:hr.installer,hr_expense:0
@@ -640,21 +676,23 @@ msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
 msgstr ""
+"Personel harcamalarını izler ve yönetir, ve eğer harcamalar projeyle ilgili "
+"ise müşteriler otomatik olarak yeniden faturalandırılabilir."
 
 #. module: hr
 #: view:hr.job:0
 msgid "Current"
-msgstr ""
+msgstr "Geçerli"
 
 #. module: hr
 #: field:hr.department,parent_id:0
 msgid "Parent Department"
-msgstr ""
+msgstr "Ana Bölüm"
 
 #. module: hr
 #: view:hr.employee.category:0
 msgid "Employees Categories"
-msgstr "Personel Kategorisi"
+msgstr "Personel Kategorileri"
 
 #. module: hr
 #: field:hr.employee,address_home_id:0
@@ -665,54 +703,54 @@ msgstr "Ev Adresi"
 #: field:hr.installer,hr_attendance:0
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendances"
-msgstr ""
+msgstr "Devamlılık"
 
 #. module: hr
 #: view:hr.employee.marital.status:0
 #: view:hr.job:0
 msgid "Description"
-msgstr ""
+msgstr "Açıklama"
 
 #. module: hr
 #: help:hr.installer,hr_contract:0
 msgid "Extends employee profiles to help manage their contracts."
-msgstr ""
+msgstr "Sözleşmelerinin yönetimi için personel profillerini açar."
 
 #. module: hr
 #: field:hr.installer,hr_payroll:0
 msgid "Payroll"
-msgstr ""
+msgstr "Bordro"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
 msgid "Single"
-msgstr ""
+msgstr "Bekar"
 
 #. module: hr
 #: field:hr.job,name:0
 msgid "Job Name"
-msgstr ""
+msgstr "İş Adı"
 
 #. module: hr
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Position"
-msgstr ""
+msgstr "Durumunda"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Mobile"
-msgstr ""
+msgstr "Cep"
 
 #. module: hr
 #: view:hr.department:0
 msgid "department"
-msgstr ""
+msgstr "bölüm"
 
 #. module: hr
 #: field:hr.employee,country_id:0
 msgid "Nationality"
-msgstr "Uyruk"
+msgstr "Uyruğu"
 
 #. module: hr
 #: view:hr.department:0
@@ -724,23 +762,23 @@ msgstr "Notlar"
 #. module: hr
 #: model:ir.model,name:hr.model_hr_installer
 msgid "hr.installer"
-msgstr ""
+msgstr "ik.kurucu"
 
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr ""
+msgstr "İK Yönetim Paneli"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Kaynak"
 
 #. module: hr
 #: view:hr.installer:0
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
-msgstr ""
+msgstr "İnsan Kaynakları Uygulama Yapılandırması"
 
 #. module: hr
 #: field:hr.employee,gender:0
@@ -761,49 +799,49 @@ msgstr "Personeller"
 #. module: hr
 #: field:hr.employee,bank_account_id:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Banka Hesabı"
 
 #. module: hr
 #: field:hr.department,name:0
 msgid "Department Name"
-msgstr ""
+msgstr "Bölüm Adı"
 
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr ""
+msgstr "Sosyal Güvenlik Numarası"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Creation of a OpenERP user"
-msgstr ""
+msgstr "OpenERP kullanıcısı Oluşturma"
 
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr "Alt Departmanlar"
+msgstr "Alt Bölümler"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_job
 #: model:ir.ui.menu,name:hr.menu_hr_job
 msgid "Job Positions"
-msgstr ""
+msgstr "İş Durumları"
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,coach_id:0
 msgid "Coach"
-msgstr ""
+msgstr "Çalıştırıcı"
 
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure Your Human Resources Application"
-msgstr ""
+msgstr "İnsan Kaynakları Uygulamanızı yapılandırın"
 
 #. module: hr
 #: field:hr.installer,hr_expense:0
 msgid "Expenses"
-msgstr ""
+msgstr "Giderler"
 
 #. module: hr
 #: field:hr.department,manager_id:0
@@ -815,17 +853,17 @@ msgstr "Yönetici"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
 msgid "Widower"
-msgstr ""
+msgstr "Dul"
 
 #. module: hr
 #: help:hr.installer,hr_payroll_account:0
 msgid "Generic Payroll system Integrated with Accountings."
-msgstr ""
+msgstr "Muhasebe ile bütünleşik Genel Bordro sistemi."
 
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
-msgstr ""
+msgstr "Emrindekiler"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/hr/i18n/vi.po b/addons/hr/i18n/vi.po
index a9dceaca413..c866ce5a5c2 100644
--- a/addons/hr/i18n/vi.po
+++ b/addons/hr/i18n/vi.po
@@ -13,13 +13,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-05-04 19:00+0000\n"
+"PO-Revision-Date: 2011-05-25 15:08+0000\n"
 "Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-05 04:40+0000\n"
+"X-Launchpad-Export-Date: 2011-05-26 04:36+0000\n"
 "X-Generator: Launchpad (build 12959)\n"
 
 #. module: hr
@@ -217,7 +217,7 @@ msgstr "Số CMND"
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "No of Employee"
-msgstr ""
+msgstr "Số lượng nhân viên"
 
 #. module: hr
 #: selection:hr.employee,gender:0
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
index cdeb2ca77a3..93f920f3cb8 100644
--- a/addons/hr/installer.py
+++ b/addons/hr/installer.py
@@ -21,8 +21,7 @@
 from osv import fields, osv
 
 class hr_installer(osv.osv_memory):
-    _name = 'hr.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
     _columns = {
         # Human Resources Management
         'hr_holidays': fields.boolean('Holidays / Leaves Management',
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 8c5648a1040..a138d66a285 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -56,7 +56,7 @@ class hr_attendance(osv.osv):
         'action': fields.selection([('sign_in', 'Sign In'), ('sign_out', 'Sign Out'), ('action','Action')], 'Action', required=True),
         'action_desc': fields.many2one("hr.action.reason", "Action Reason", domain="[('action_type', '=', action)]", help='Specifies the reason for Signing In/Signing Out in case of extra hours.'),
         'employee_id': fields.many2one('hr.employee', "Employee's Name", required=True, select=True),
-        'day': fields.function(_day_compute, method=True, type='char', string='Day', store=True, select=1, size=32),
+        'day': fields.function(_day_compute, type='char', string='Day', store=True, select=1, size=32),
     }
     _defaults = {
         'name': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), #please don't remove the lambda, if you remove it then the current time will not change
@@ -110,7 +110,7 @@ class hr_employee(osv.osv):
         return result
 
     _columns = {
-       'state': fields.function(_state, method=True, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'),
+       'state': fields.function(_state, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'),
     }
 
     def _action_check(self, cr, uid, emp_id, dt=False, context=None):
diff --git a/addons/hr_attendance/hr_attendance_demo.xml b/addons/hr_attendance/hr_attendance_demo.xml
index 372e9112269..a1f42eb1004 100644
--- a/addons/hr_attendance/hr_attendance_demo.xml
+++ b/addons/hr_attendance/hr_attendance_demo.xml
@@ -121,6 +121,22 @@
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+        
+<!-- FIXME! Commented out to enable installation without creating conflicts
+     during the first days of a month. To be properly fixed, see
+     launchpad bug 791087!
 
+        <record id="attendance21" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-%d 10:00')" name="name"/>
+            <field name="action">sign_in</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        
+        <record id="attendance22" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-%d 18:00')" name="name"/>
+            <field name="action">sign_out</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+-->
     </data>
 </openerp>
diff --git a/addons/hr_attendance/i18n/vi.po b/addons/hr_attendance/i18n/vi.po
index 2cf5d58fe29..1dbfa21d97b 100644
--- a/addons/hr_attendance/i18n/vi.po
+++ b/addons/hr_attendance/i18n/vi.po
@@ -8,34 +8,34 @@ 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-08-02 14:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-06-04 22:45+0000\n"
+"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-06 04:37+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
 msgid "Time Tracking"
-msgstr ""
+msgstr "Theo dõi Thời gian"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Group By..."
-msgstr ""
+msgstr "Nhóm theo..."
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
-msgstr ""
+msgstr "Hôm nay"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
-msgstr ""
+msgstr "Tháng Ba"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -43,6 +43,8 @@ msgid ""
 "You did not sign out the last time. Please enter the date and time you "
 "signed out."
 msgstr ""
+"Bạn đã không đăng xuất lần trước. Xin vui lòng nhập ngày và thời gian bạn đã "
+"đăng xuất."
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -52,7 +54,7 @@ msgstr ""
 #. module: hr_attendance
 #: field:hr.action.reason,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Lý do"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -63,7 +65,7 @@ msgstr ""
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
 #, python-format
 msgid "The sign-out date must be in the past"
-msgstr ""
+msgstr "Ngày đăng xuất phải trong quá khứ"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -87,12 +89,12 @@ msgstr ""
 #: view:hr.attendance:0
 #: field:hr.attendance,day:0
 msgid "Day"
-msgstr ""
+msgstr "Ngày"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
 msgid "Present"
-msgstr ""
+msgstr "Có mặt"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask
@@ -108,7 +110,7 @@ msgstr ""
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
 msgid "Ok"
-msgstr ""
+msgstr "Đồng ý"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
@@ -119,7 +121,7 @@ msgstr ""
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "Lỗi ! Bạn không thể chọn phòng ban do nhân viên này quản lý."
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
@@ -130,7 +132,7 @@ msgstr ""
 #: field:hr.sign.in.out,name:0
 #: field:hr.sign.in.out.ask,name:0
 msgid "Employees name"
-msgstr ""
+msgstr "Tên các người lao động"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
@@ -145,13 +147,13 @@ msgstr ""
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "Lỗi người sử dụng"
 
 #. module: hr_attendance
 #: field:hr.attendance.error,end_date:0
 #: field:hr.attendance.week,end_date:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Ngày kết thúc"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -162,7 +164,7 @@ msgstr ""
 #: code:addons/hr_attendance/hr_attendance.py:136
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Cảnh báo"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
@@ -180,7 +182,7 @@ msgstr ""
 #: field:hr.employee,state:0
 #: model:ir.model,name:hr_attendance.model_hr_attendance
 msgid "Attendance"
-msgstr ""
+msgstr "Điểm danh"
 
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
@@ -191,7 +193,7 @@ msgstr ""
 #: view:hr.attendance.error:0
 #: view:hr.attendance.month:0
 msgid "Print"
-msgstr ""
+msgstr "In"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -216,7 +218,7 @@ msgstr ""
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "July"
-msgstr ""
+msgstr "Tháng Bảy"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_error
@@ -228,7 +230,7 @@ msgstr ""
 #: field:hr.attendance.error,init_date:0
 #: field:hr.attendance.week,init_date:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Ngày bắt đầu"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -239,33 +241,33 @@ msgstr ""
 #: selection:hr.attendance,action:0
 #: view:hr.employee:0
 msgid "Sign In"
-msgstr ""
+msgstr "Đăng nhập"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Operation"
-msgstr ""
+msgstr "Thao tác"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No Data Available"
-msgstr ""
+msgstr "Không có dữ liệu"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "September"
-msgstr ""
+msgstr "Tháng Chín"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "December"
-msgstr ""
+msgstr "Tháng Mười Hai"
 
 #. module: hr_attendance
 #: field:hr.attendance.month,month:0
 msgid "Month"
-msgstr ""
+msgstr "Tháng"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -303,12 +305,12 @@ msgstr ""
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 msgid "hr.sign.out.ask"
-msgstr ""
+msgstr "hr.sign.out.ask"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "August"
-msgstr ""
+msgstr "Tháng Tám"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
@@ -319,7 +321,7 @@ msgstr ""
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "June"
-msgstr ""
+msgstr "Tháng Sáu"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_error
@@ -334,22 +336,22 @@ msgstr ""
 #. module: hr_attendance
 #: field:hr.attendance,name:0
 msgid "Date"
-msgstr ""
+msgstr "Ngày"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "November"
-msgstr ""
+msgstr "Tháng Mười Một"
 
 #. module: hr_attendance
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Lỗi ! Bạn không thể tao cấu trúc đệ quy của nhân viên"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
-msgstr ""
+msgstr "Tháng Mười"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -359,14 +361,14 @@ msgstr ""
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "January"
-msgstr ""
+msgstr "Tháng Giêng"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
 #: view:hr.sign.in.out:0
 #: view:hr.sign.in.out.ask:0
 msgid "Sign in"
-msgstr ""
+msgstr "Đăng nhập"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -387,7 +389,7 @@ msgstr ""
 #: field:hr.attendance,action:0
 #: selection:hr.attendance,action:0
 msgid "Action"
-msgstr ""
+msgstr "Hành động"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
@@ -401,7 +403,7 @@ msgstr ""
 #. module: hr_attendance
 #: field:hr.sign.in.out,emp_id:0
 msgid "Employee ID"
-msgstr ""
+msgstr "Mã Nhân viên"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
@@ -411,7 +413,7 @@ msgstr ""
 #. module: hr_attendance
 #: field:hr.sign.in.out.ask,emp_id:0
 msgid "Empoyee ID"
-msgstr ""
+msgstr "Mã Nhân viên"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -419,7 +421,7 @@ msgstr ""
 #: view:hr.sign.in.out:0
 #: view:hr.sign.in.out.ask:0
 msgid "Cancel"
-msgstr ""
+msgstr "Hủy bỏ"
 
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
@@ -442,7 +444,7 @@ msgstr ""
 #: view:hr.sign.in.out:0
 #: view:hr.sign.in.out.ask:0
 msgid "Sign out"
-msgstr ""
+msgstr "Đăng xuất"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -453,7 +455,7 @@ msgstr ""
 #: view:hr.attendance:0
 #: model:ir.model,name:hr_attendance.model_hr_employee
 msgid "Employee"
-msgstr ""
+msgstr "Người lao động"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:136
@@ -472,7 +474,7 @@ msgstr ""
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Date Recorded"
-msgstr ""
+msgstr "Ngày Ghi nhận"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance
@@ -484,7 +486,7 @@ msgstr ""
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "May"
-msgstr ""
+msgstr "Tháng Năm"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -495,7 +497,7 @@ msgstr ""
 #: selection:hr.attendance,action:0
 #: view:hr.employee:0
 msgid "Sign Out"
-msgstr ""
+msgstr "Đăng xuất"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
@@ -509,17 +511,17 @@ msgstr ""
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Tên Người lao động"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
 msgid "Absent"
-msgstr ""
+msgstr "Vắng mặt"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "February"
-msgstr ""
+msgstr "Tháng Hai"
 
 #. module: hr_attendance
 #: field:hr.action.reason,action_type:0
@@ -534,12 +536,12 @@ msgstr ""
 #. module: hr_attendance
 #: field:hr.sign.in.out,state:0
 msgid "Current state"
-msgstr ""
+msgstr "Tình trạng hiện tại"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "April"
-msgstr ""
+msgstr "Tháng Tư"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -550,7 +552,7 @@ msgstr ""
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No records found for your selection!"
-msgstr ""
+msgstr "Không có bản ghi theo lựa chọn của bạn!"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -562,9 +564,9 @@ msgstr ""
 #. module: hr_attendance
 #: field:hr.attendance.month,year:0
 msgid "Year"
-msgstr ""
+msgstr "Năm"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 msgid "hr.sign.in.out.ask"
-msgstr ""
+msgstr "hr.sign.in.out.ask"
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 7ed2d16d6b7..21d15a4194b 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -46,7 +46,7 @@ class hr_employee(osv.osv):
         'vehicle': fields.char('Company Vehicle', size=64),
         'vehicle_distance': fields.integer('Home-Work Distance', help="In kilometers"),
         'contract_ids': fields.one2many('hr.contract', 'employee_id', 'Contracts'),
-        'contract_id':fields.function(_get_latest_contract, method=True, string='Contract', type='many2one', relation="hr.contract", help='Latest contract of the employee'),
+        'contract_id':fields.function(_get_latest_contract, string='Contract', type='many2one', relation="hr.contract", help='Latest contract of the employee'),
     }
 
 hr_employee()
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 524ef5f57f4..36b9be1ac30 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -94,8 +94,8 @@
         </record>
 
         <menuitem action="action_hr_contract_wage_type_period" id="hr_menu_contract_wage_type_period"
-                parent="hr_contract.next_id_56"/>
-
+                parent="hr_contract.next_id_56" sequence="8"/>
+        <menuitem action="resource.action_resource_calendar_form" name="Working Schedules" id="hr_menu_working_time_type" parent="hr_contract.next_id_56" sequence="9"/>
         <record id="hr_hr_employee_view_form2" model="ir.ui.view">
             <field name="name">hr.hr.employee.view.form2</field>
             <field name="model">hr.employee</field>
diff --git a/addons/hr_contract/i18n/ar.po b/addons/hr_contract/i18n/ar.po
index eeac51a03e0..452f4f7acd3 100644
--- a/addons/hr_contract/i18n/ar.po
+++ b/addons/hr_contract/i18n/ar.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:15+0000\n"
-"PO-Revision-Date: 2010-08-03 05:39+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-06-18 11:23+0000\n"
+"Last-Translator: kifcaliph <kifcaliph@hotmail.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-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-19 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Hourly cost computation"
-msgstr ""
+msgstr "حساب تكلفة الساعة"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Gross"
-msgstr ""
+msgstr "الإجمالي"
 
 #. module: hr_contract
 #: view:hr.contract:0
diff --git a/addons/hr_contract/i18n/ru.po b/addons/hr_contract/i18n/ru.po
index 4d125f3631f..81421433537 100644
--- a/addons/hr_contract/i18n/ru.po
+++ b/addons/hr_contract/i18n/ru.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-14 08:42+0000\n"
-"Last-Translator: Alexey Y. Fedotov <Unknown>\n"
+"PO-Revision-Date: 2011-06-27 05:15+0000\n"
+"Last-Translator: Stanislav Hanzhin <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-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -74,7 +74,7 @@ msgstr "Множитель стоимости часа"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Overpassed"
-msgstr ""
+msgstr "Переведён"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -145,7 +145,7 @@ msgstr "Поиск договора"
 #. module: hr_contract
 #: help:hr.employee,contract_id:0
 msgid "Latest contract of the employee"
-msgstr ""
+msgstr "Последний договор с сотрудником"
 
 #. module: hr_contract
 #: field:hr.contract,advantages_net:0
@@ -163,6 +163,13 @@ msgid ""
 "    You can assign several contracts per employee.\n"
 "    "
 msgstr ""
+"\n"
+"    Добавляйте информацию в форму сотрудника для управления договорами:\n"
+"    * Семейное положение,\n"
+"    * Номер свидетельства социального страхования,\n"
+"    * Место рождения, дата рождения, ...\n"
+"    Можно назначить несколько договоров одному сотруднику.\n"
+"    "
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -218,7 +225,7 @@ msgstr "Зарплата"
 #. module: hr_contract
 #: field:hr.contract,name:0
 msgid "Contract Reference"
-msgstr ""
+msgstr "Ссылка на договор"
 
 #. module: hr_contract
 #: help:hr.employee,vehicle_distance:0
@@ -259,7 +266,7 @@ msgstr "Тип договора"
 #. module: hr_contract
 #: view:hr.contract.wage.type.period:0
 msgid "Search Wage Period"
-msgstr ""
+msgstr "Поиск по периоду выплаты"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -303,7 +310,7 @@ msgstr ""
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Search Wage Type"
-msgstr ""
+msgstr "Поиск по типу выплаты"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,type:0
@@ -375,7 +382,7 @@ msgstr "Основные данные"
 #. module: hr_contract
 #: view:hr.contract.type:0
 msgid "Search Contract Type"
-msgstr ""
+msgstr "Поиск по типу договора"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/hr_contract/i18n/vi.po b/addons/hr_contract/i18n/vi.po
index e11b1e1531d..f1f429b359c 100644
--- a/addons/hr_contract/i18n/vi.po
+++ b/addons/hr_contract/i18n/vi.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-12-21 06:43+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-05-25 13:59+0000\n"
+"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-26 04:36+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -60,7 +60,7 @@ msgstr "Tên loại lương"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Linh tinh"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -75,17 +75,17 @@ msgstr ""
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Overpassed"
-msgstr ""
+msgstr "Quá hạn"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Wage Types"
-msgstr ""
+msgstr "Các loại tiền công"
 
 #. module: hr_contract
 #: field:hr.contract,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Phòng ban"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
@@ -102,7 +102,7 @@ msgstr "Người LĐ"
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Net"
-msgstr ""
+msgstr "Thuần"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -131,7 +131,7 @@ msgstr "Các hợp đồng"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Personal Info"
-msgstr ""
+msgstr "Thông tin cá nhân"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -199,7 +199,7 @@ msgstr "Các loại HĐ"
 #: model:ir.model,name:hr_contract.model_hr_contract_wage_type
 #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type
 msgid "Wage Type"
-msgstr ""
+msgstr "Loại tiền công"
 
 #. module: hr_contract
 #: constraint:hr.employee:0
@@ -209,17 +209,17 @@ msgstr ""
 #. module: hr_contract
 #: field:hr.contract,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Ngày kết thúc"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
 msgid "Wage"
-msgstr ""
+msgstr "Tiền công/tiền lương"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
 msgid "Contract Reference"
-msgstr ""
+msgstr "Tham chiếu HĐ"
 
 #. module: hr_contract
 #: help:hr.employee,vehicle_distance:0
@@ -230,7 +230,7 @@ msgstr ""
 #: view:hr.contract:0
 #: field:hr.contract,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Ghi chú"
 
 #. module: hr_contract
 #: constraint:hr.employee:0
@@ -244,7 +244,7 @@ msgstr ""
 #: model:ir.model,name:hr_contract.model_hr_contract
 #: model:ir.ui.menu,name:hr_contract.next_id_56
 msgid "Contract"
-msgstr ""
+msgstr "Hợp đồng"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -253,7 +253,7 @@ msgstr ""
 #: field:hr.contract.type,name:0
 #: model:ir.model,name:hr_contract.model_hr_contract_type
 msgid "Contract Type"
-msgstr ""
+msgstr "Loại HĐ"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type.period:0
@@ -269,19 +269,19 @@ msgstr "Thời gian làm việc"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Job Info"
-msgstr ""
+msgstr "Thông tin Công việc"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,period_id:0
 #: view:hr.contract.wage.type.period:0
 #: model:ir.model,name:hr_contract.model_hr_contract_wage_type_period
 msgid "Wage Period"
-msgstr ""
+msgstr "Chu kỳ Tiền công"
 
 #. module: hr_contract
 #: field:hr.contract,job_id:0
 msgid "Job Title"
-msgstr ""
+msgstr "Chức danh Công việc"
 
 #. module: hr_contract
 #: field:hr.employee,manager:0
@@ -291,7 +291,7 @@ msgstr "Có phải CBQL"
 #. module: hr_contract
 #: field:hr.contract,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Ngày bắt đầu"
 
 #. module: hr_contract
 #: constraint:hr.contract:0
@@ -301,17 +301,17 @@ msgstr ""
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Search Wage Type"
-msgstr ""
+msgstr "Tìm kiếm Loại Tiền công"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,type:0
 msgid "Type"
-msgstr ""
+msgstr "Loại"
 
 #. module: hr_contract
 #: field:hr.contract,trial_date_end:0
 msgid "Trial End Date"
-msgstr ""
+msgstr "Ngày Kết thúc Thử việc"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -322,12 +322,12 @@ msgstr "Nhóm theo..."
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,name:0
 msgid "Period Name"
-msgstr ""
+msgstr "Tên chu kỳ"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Period"
-msgstr ""
+msgstr "Chu kỳ"
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -338,7 +338,7 @@ msgstr "Nơi sinh"
 #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period
 #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type_period
 msgid "Wage period"
-msgstr ""
+msgstr "Chu kỳ Lương"
 
 #. module: hr_contract
 #: help:hr.contract.wage.type,factor_type:0
@@ -351,22 +351,22 @@ msgstr ""
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Duration"
-msgstr ""
+msgstr "Thời gian"
 
 #. module: hr_contract
 #: field:hr.employee,medic_exam:0
 msgid "Medical Examination Date"
-msgstr ""
+msgstr "Ngày Kiểm tra Sức khỏe"
 
 #. module: hr_contract
 #: field:hr.contract,advantages_gross:0
 msgid "Allowances"
-msgstr ""
+msgstr "Các khoản Phụ cấp"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Main Data"
-msgstr ""
+msgstr "Dữ liệu Chính"
 
 #. module: hr_contract
 #: view:hr.contract.type:0
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 3e45d38156e..607f41aa111 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -48,7 +48,7 @@ in the form of pdf file. Implements a dashboard for My Current Evaluations
         "hr_evaluation_view.xml",
         "report/hr_evaluation_report_view.xml",
         "board_hr_evaluation_view.xml",
-        "hr_evaluation_data.xml"
+        'hr_evaluation_installer_view.xml'
         ],
     "test": ["test/test_hr_evaluation.yml"],
     "active": False,
diff --git a/addons/hr_evaluation/hr_evaluation_installer_view.xml b/addons/hr_evaluation/hr_evaluation_installer_view.xml
new file mode 100644
index 00000000000..7eba2b40876
--- /dev/null
+++ b/addons/hr_evaluation/hr_evaluation_installer_view.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+ <record model="ir.actions.act_window" id="view_department_form_installer">
+           <field name="name">Define Your Department Structure</field>
+           <field name="type">ir.actions.act_window</field>
+           <field name="res_model">hr.department</field>
+           <field name="view_type">form</field>
+           <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="hr.view_department_tree"/>
+           <field name="help">Your Company's Department Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitments, etc.</field>
+       </record>
+
+       <record id="view_department_form_todo" model="ir.actions.todo">
+           <field name="action_id" ref="view_department_form_installer"/>
+           <field name="category_id" ref="hr.category_hr_management_config"/>
+           <field name="sequence">3</field>
+           <field name="type">normal</field>
+           <field name="state">skip</field>
+       </record>
+    </data>
+</openerp>
diff --git a/addons/hr_evaluation/i18n/ca.po b/addons/hr_evaluation/i18n/ca.po
index 5929d0fa6e6..11f4c1054e5 100644
--- a/addons/hr_evaluation/i18n/ca.po
+++ b/addons/hr_evaluation/i18n/ca.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-03-29 15:04+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-05-26 05:12+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-27 04:46+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -631,7 +631,7 @@ msgstr "Novembre"
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres extesos..."
 
 #. module: hr_evaluation
 #: constraint:hr.employee:0
@@ -673,7 +673,7 @@ msgstr "Plans d'avaluació"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -683,7 +683,7 @@ msgstr "Enquesta"
 #. module: hr_evaluation
 #: help:hr_evaluation.evaluation,rating:0
 msgid "This is the appreciation on that summarize the evaluation"
-msgstr ""
+msgstr "Aquesta és l'apreciació resumida de l'avaluació."
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
@@ -741,7 +741,7 @@ msgstr "Petición de evaluación de arriba a abajo"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "General"
-msgstr ""
+msgstr "General"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_employee:0
@@ -775,7 +775,7 @@ msgstr "Cancel·la"
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "In Progress"
-msgstr ""
+msgstr "En curs"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
@@ -797,7 +797,7 @@ msgstr "Fases d'avaluació"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
@@ -823,7 +823,7 @@ msgstr "Petició d'autoavaluació"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,email_subject:0
 msgid "char"
-msgstr ""
+msgstr "caràcter"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,survey_request_ids:0
@@ -929,13 +929,13 @@ msgstr "Petició d'entrevista"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Crea data"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
 
 #. module: hr_evaluation
 #: help:hr.employee,evaluation_date:0
@@ -943,3 +943,5 @@ msgid ""
 "The date of the next evaluation is computed by the evaluation plan's dates "
 "(first evaluation + periodicity)."
 msgstr ""
+"La data de la següent avaluació es calcula per les dates de planificació de "
+"l'avaluació (primera avaluació + periodicitat)."
diff --git a/addons/hr_evaluation/i18n/gl.po b/addons/hr_evaluation/i18n/gl.po
new file mode 100644
index 00000000000..c38030c6c8f
--- /dev/null
+++ b/addons/hr_evaluation/i18n/gl.po
@@ -0,0 +1,933 @@
+# Galician 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-06-09 09:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@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-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Plan In Progress"
+msgstr "Plan en proceso"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,wait:0
+msgid "Wait Previous Phases"
+msgstr "Esperar fases anteriores"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr.evaluation.report:0
+#: view:hr_evaluation.plan:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_evaluation
+#: field:hr.evaluation.interview,request_id:0
+#: field:hr.evaluation.report,request_id:0
+msgid "Request_id"
+msgstr "id_solicitude"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,progress_bar:0
+#: field:hr_evaluation.evaluation,progress:0
+msgid "Progress"
+msgstr "Progreso"
+
+#. module: hr_evaluation
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_evaluation.act_hr_evaluation_tree
+msgid "My Evaluation Remaining"
+msgstr "A miña avaliación restante"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Legend"
+msgstr "Lenda"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:311
+#, python-format
+msgid "You cannot start evaluation without Evaluation."
+msgstr "Non se pode iniciar a avaliación sen \"Avaliación\"."
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,delay_date:0
+msgid "Delay to Start"
+msgstr "Atraso ó inicio"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr_evaluation.evaluation,rating:0
+msgid "Appreciation"
+msgstr "Apreciación"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:242
+#: code:addons/hr_evaluation/hr_evaluation.py:311
+#, python-format
+msgid "Warning !"
+msgstr "Aviso!"
+
+#. 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 "Compañía"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
+msgid "Evaluation Interviews"
+msgstr "Entrevistas de avaliación"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,survey_id:0
+msgid "Appraisal Form"
+msgstr "Formulario de avaliación"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.interview,evaluation_id:0
+msgid "Evaluation Form"
+msgstr "Formulario de avaliación"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_anonymous_employee:0
+msgid "Send an anonymous summary to the employee"
+msgstr "Enviar resumo anónimo ó empregado."
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan,month_first:0
+msgid ""
+"This number of months will be used to schedule the first evaluation date of "
+"the employee when selecting an evaluation plan. "
+msgstr ""
+"Este número de meses úsase para programar a data da primeira avaliación do "
+"empregado cando seleccione un plan de avaliación. "
+
+#. module: hr_evaluation
+#: view:hr.employee:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Interview Request"
+msgstr "Solicitar entrevista"
+
+#. module: hr_evaluation
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+"Erro! Non pode seleccionar un departamento para o cal o empregado sexa o "
+"director."
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Mail Body"
+msgstr "Corpo do correo"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_report_all
+#: model:ir.ui.menu,name:hr_evaluation.menu_evaluation_report_all
+msgid "Evaluations Analysis"
+msgstr "Análise das avaliacións"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Cancelled"
+msgstr "Anulado"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_reminder
+msgid "Sends Reminders to employess to fill the evaluations"
+msgstr "Envía recordatorios ós empregados para encher as avaliacións"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Did not meet expectations"
+msgstr "Non cumpre as expectativas"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Appraisal"
+msgstr "Avaliación"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "July"
+msgstr "Xullo"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,month_next:0
+msgid "Periodicity of Evaluations (months)"
+msgstr "Prioridade da avaliación (meses)"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:242
+#, python-format
+msgid ""
+"You cannot change state, because some appraisal in waiting answer or draft "
+"state"
+msgstr ""
+"Non pode cambiar o estado porque algunha avaliación está a esperar resposta "
+"ou está en borrador"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date_close:0
+msgid "Ending Date"
+msgstr "Data de finalización"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,month_first:0
+msgid "First Evaluation in (months)"
+msgstr "Primeira avaliación en (meses)"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:81
+#, python-format
+msgid ""
+"\n"
+"Date: %(date)s\n"
+"\n"
+"Dear %(employee_name)s,\n"
+"\n"
+"I am doing an evaluation regarding %(eval_name)s.\n"
+"\n"
+"Kindly submit your response.\n"
+"\n"
+"\n"
+"Thanks,\n"
+"--\n"
+"%(user_signature)s\n"
+"\n"
+"        "
+msgstr ""
+"\n"
+"Data: %(date)sEstimado %(employee_name)s: Estou a facer unha avaliación "
+"acerca de %(eval_name)s. Por favor envíe a súa resposta. Grazas--"
+"%(user_signature)s\n"
+"\n"
+"        "
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Send to Employees"
+msgstr "Enviar a empregados"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,deadline:0
+msgid "Deadline"
+msgstr "Data límite"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid " Month "
+msgstr " Mes "
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan,month_next:0
+msgid ""
+"The number of month that depicts the delay between each evaluation of this "
+"plan (after the first one)."
+msgstr ""
+"O número de meses que representa o tempo transcorrido entre cada avaliación "
+"deste plan (despois da primeira)."
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
+msgid "Periodic Evaluations"
+msgstr "Avaliacións periódicas"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.reminder:0
+msgid "Send evaluation reminder"
+msgstr "Enviar recordatorio de avaliación"
+
+#. module: hr_evaluation
+#: model:ir.module.module,description:hr_evaluation.module_meta_information
+msgid ""
+"\n"
+"          Ability to create employees evaluation.\n"
+"          An evaluation can be created by employee for subordinates,\n"
+"          juniors as well as his manager.The evaluation is done under a "
+"plan\n"
+"          in which various surveys can be created and it can be defined "
+"which\n"
+"          level of employee hierarchy fills what and final review and "
+"evaluation\n"
+"          is done by the manager.Every evaluation filled by the employees "
+"can be viewed\n"
+"          in the form of.Implements a dashboard for My Current Evaluations\n"
+"         "
+msgstr ""
+"\n"
+"          Permite crear a avaliación dos empregados. Pode crear unha "
+"avaliación por empregado para os subordinados así como para o seu "
+"responsable. A avaliación realízase mediante un plan onde se poden crear "
+"diversas enquisas e definir que se debe encher en cada nivel da xerarquía "
+"dos empreados, e o responsable realiza a última revisión e avaliación. "
+"Pódese ver cada avaliación enchida polos empregados nun taboleiro de \"As "
+"miñas avaliacións actuais\".\n"
+"         "
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "(date)s: Current Date"
+msgstr "(date)s. Data actual"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:80
+#, python-format
+msgid "Regarding "
+msgstr "Referente a "
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,state:0
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan_phase
+msgid "Evaluation Plan Phase"
+msgstr "Fase do plan de avaliación"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,employee_id:0
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,employee_id:0
+#: model:ir.model,name:hr_evaluation.model_hr_employee
+msgid "Employee"
+msgstr "Empregado"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,overpass_delay:0
+msgid "Overpassed Deadline"
+msgstr "Data límite excedida"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,mail_body:0
+msgid "Email"
+msgstr "E-mail"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Exceeds expectations"
+msgstr "Supera as expectativas"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,mail_feature:0
+msgid ""
+"Check this box if you want to send mail to employees coming under this phase"
+msgstr ""
+"Marque esta casa se quere enviar correos ós empregados obxecto desta fase."
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_answer_manager:0
+msgid "Send all answers to the manager"
+msgstr "Enviar tódalas respostas ó responsable."
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Public Notes"
+msgstr "Notas públicas"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date:0
+msgid "Evaluation Deadline"
+msgstr "Data límite de avaliación"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Print Interview"
+msgstr "Imprimir entrevista"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,closed:0
+msgid "closed"
+msgstr "pechado"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Meet expectations"
+msgstr "Cumpre as expectativas"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,nbr:0
+msgid "# of Requests"
+msgstr "Nº de peticións"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_tree
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_tree
+msgid "Evaluations"
+msgstr "Avaliacións"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.open_view_hr_evaluation_tree
+msgid ""
+"Each employee may be assigned an evaluation plan. Such a plan defines the "
+"frequency and the way you manage your periodic personnel evaluation. You "
+"will be able to define steps and attach interviews to each step. OpenERP "
+"manages all kind of evaluations: bottom-up, top-down, self-evaluation and "
+"final evaluation by the manager."
+msgstr ""
+"Pódeselle asignar un plan de avaliación a cada empregado. Este plan define a "
+"frecuencia e o xeito de xestionar a avaliación periódica do persoal. Poderá "
+"definir os pasos e achegar entrevistas en cada paso. OpenERP xestiona todo "
+"tipo de avaliacións: de abaixo a arriba, de arriba a abaixo, autoavaliación "
+"e a avaliación final por parte do xerente."
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Action to Perform"
+msgstr "Acción a realizar"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,note_action:0
+msgid "Action Plan"
+msgstr "Plan de acción"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "(eval_name)s:Evaluation Name"
+msgstr "(eval_name)s: Nome da avaliación"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Ending Summary"
+msgstr "Resumo final"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Significantly exceeds expectations"
+msgstr "Supera dabondo as expectativas"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "In progress"
+msgstr "En curso"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,send_answer_employee:0
+#: field:hr_evaluation.plan.phase,send_answer_manager:0
+msgid "All Answers"
+msgstr "Tódalas respostas"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "December"
+msgstr "Decembro"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_evaluation
+#: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
+msgid "Human Resources Evaluation"
+msgstr "Avaliación de recursos humanos"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Group by..."
+msgstr "Agrupar por..."
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Mail Settings"
+msgstr "Configuración de correo"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.interview,user_to_review_id:0
+msgid "Employee to Interview"
+msgstr "Empregado a entrevistar"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Interview Question"
+msgstr "Pregunta de entrevista"
+
+#. module: hr_evaluation
+#: field:survey.request,is_evaluation:0
+msgid "Is Evaluation?"
+msgstr "É avaliación?"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_survey_request
+msgid "survey.request"
+msgstr "solicitude.enquisa"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,wait:0
+msgid ""
+"Check this box if you want to wait that all preceding phases are finished "
+"before launching this phase."
+msgstr ""
+"Antes de comezar esta fase, marque esta casa se quere esperar a que tódalas "
+"fases previas se rematen."
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Evaluation Data"
+msgstr "Datos avaliación"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.evaluation,note_action:0
+msgid ""
+"If the evaluation does not meet the expectations, you can proposean action "
+"plan"
+msgstr ""
+"Se a avaliación non cumpre as expectativas, pode propoñer un plan de acción"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Draft"
+msgstr "Proxecto"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,note_summary:0
+msgid "Evaluation Summary"
+msgstr "Resumo de avaliación"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,send_anonymous_employee:0
+#: field:hr_evaluation.plan.phase,send_anonymous_manager:0
+msgid "Anonymous Summary"
+msgstr "Resumo anónimo"
+
+#. module: hr_evaluation
+#: view:hr.employee:0
+#: view:hr_evaluation.evaluation:0
+msgid "Evaluation"
+msgstr "Avaliación"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "7 Days"
+msgstr "7 días"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid " Year "
+msgstr " Ano "
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Start Evaluation"
+msgstr "Comezar avaliación"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "To Do"
+msgstr "Para ejecutar"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "June"
+msgstr "Xuño"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Significantly bellow expectations"
+msgstr "Moi por debaixo das expectativas"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid " (employee_name)s: Partner name"
+msgstr " (employee_name)s: Nome empresa"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,plan_id:0
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,plan_id:0
+msgid "Plan"
+msgstr "Plan"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "November"
+msgstr "Novembro"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: hr_evaluation
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Erro! Non pode crear unha xerarquía recorrente de empregados."
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "January"
+msgstr "Xaneiro"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.reminder:0
+msgid "Send Mail"
+msgstr "Enviar correo"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_anonymous_manager:0
+msgid "Send an anonymous summary to the manager"
+msgstr "Enviar resumo anónimo ó responsable."
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Interview Evaluation"
+msgstr "Entrevista de avaliación"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_plan_tree
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_plan_tree
+msgid "Evaluation Plans"
+msgstr "Plans de avaliación"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Date"
+msgstr "Data"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Survey"
+msgstr "Enquisa"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.evaluation,rating:0
+msgid "This is the appreciation on that summarize the evaluation"
+msgstr "Esta é a apreciación resumo da avaliación"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,action:0
+msgid "Action"
+msgstr "Acción"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: selection:hr.evaluation.report,state:0
+msgid "Final Validation"
+msgstr "Validación final"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Waiting Appreciation"
+msgstr "Esperando apreciación"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,mail_feature:0
+msgid "Send mail for this phase"
+msgstr "Enviar correo para esta fase"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,rating:0
+msgid "Overall Rating"
+msgstr "Valoración xeral"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Late"
+msgstr "Atrasado"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Interviewer"
+msgstr "Entrevistador"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_report
+msgid "Evaluations Statistics"
+msgstr "Estatísticas de avaliacións"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Deadline Date"
+msgstr "Data límite"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Top-Down Appraisal Requests"
+msgstr "Petición de avaliación de arriba a abaixo"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "General"
+msgstr "Xeral"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_answer_employee:0
+msgid "Send all answers to the employee"
+msgstr "Enviar tódalas respostas ó empregado."
+
+#. module: hr_evaluation
+#: field:hr.employee,evaluation_date:0
+msgid "Next Evaluation Date"
+msgstr "Seguinte data de avaliación"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: selection:hr.evaluation.report,state:0
+#: view:hr_evaluation.evaluation:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Done"
+msgstr "Feito"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Evaluation Plan Phases"
+msgstr "Fases plan de avaliación"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.reminder:0
+#: view:hr_evaluation.evaluation:0
+msgid "Cancel"
+msgstr "Anular"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "In Progress"
+msgstr "En curso"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"Interview Requests are generated automatically by OpenERP according to an "
+"employee's evaluation plan. Each user receives automatic emails and requests "
+"to evaluate their colleagues periodically."
+msgstr ""
+"OpenERP xera peticións de entrevista automaticamente de acordo co plan de "
+"avaliación de cada traballador. Cada usuario recibe correos electrónicos "
+"automáticos e peticións de avaliación dos seus compañeiros periodicamente."
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0
+#: field:hr_evaluation.plan,phase_ids:0
+msgid "Evaluation Phases"
+msgstr "Fases de avaliación"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
+msgid "Evaluation Interview"
+msgstr "Entrevista de avaliación"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.reminder,evaluation_id:0
+msgid "Interview"
+msgstr "Entrevista"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.reminder:0
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_send_mail
+msgid "Evaluation Reminders"
+msgstr "Recordatorios de avaliación"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Self Appraisal Requests"
+msgstr "Petición de autoavaliación"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,email_subject:0
+msgid "char"
+msgstr "car."
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,survey_request_ids:0
+msgid "Appraisal Forms"
+msgstr "Formularios de avaliación"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "May"
+msgstr "Maio"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Internal Notes"
+msgstr "Notas internas"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Validate Evaluation"
+msgstr "Validar avaliación"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Final Interview"
+msgstr "Entrevista final"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,name:0
+msgid "Phase"
+msgstr "Fase"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Bottom-Up Appraisal Requests"
+msgstr "Petición de avaliación de abaixo a arriba"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Search Evaluation"
+msgstr "Buscar avaliación"
+
+#. module: hr_evaluation
+#: field:hr.employee,evaluation_plan_id:0
+#: view:hr_evaluation.plan:0
+#: field:hr_evaluation.plan,name:0
+#: field:hr_evaluation.plan.phase,plan_id:0
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan
+msgid "Evaluation Plan"
+msgstr "Plan de avaliación"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "February"
+msgstr "Febreiro"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Send to Managers"
+msgstr "Enviar a responsables"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_send_mail
+msgid "Evaluation Send Mail"
+msgstr "Enviar correo avaliación"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
+msgid "Employee Evaluation"
+msgstr "Avaliación empregado"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0
+msgid "Search Evaluation Plan"
+msgstr "Buscar plan de avaliación"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0
+msgid "(months)"
+msgstr "(meses)"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "(user_signature)s: User name"
+msgstr "(sinatura_usuario)s: Nome usuario"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_interview_tree
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_hr_evaluation_interview_requests
+msgid "Interview Requests"
+msgstr "Petición de entrevista"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,create_date:0
+msgid "Create Date"
+msgstr "Crear data"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,year:0
+msgid "Year"
+msgstr "Ano"
+
+#. module: hr_evaluation
+#: help:hr.employee,evaluation_date:0
+msgid ""
+"The date of the next evaluation is computed by the evaluation plan's dates "
+"(first evaluation + periodicity)."
+msgstr ""
+"A data da seguinte avaliación calcúlase polas datas de planificación da "
+"avaliación (primeira avaliación + periodicidade)."
diff --git a/addons/hr_evaluation/i18n/ru.po b/addons/hr_evaluation/i18n/ru.po
index d3ea5e99c6b..96cb0010d4c 100644
--- a/addons/hr_evaluation/i18n/ru.po
+++ b/addons/hr_evaluation/i18n/ru.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-10-16 08:48+0000\n"
-"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
+"PO-Revision-Date: 2011-06-27 05:30+0000\n"
+"Last-Translator: Bulat Shafigullin <Unknown>\n"
 "Language-Team: Russian <ru@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-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -26,26 +26,26 @@ msgstr ""
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,wait:0
 msgid "Wait Previous Phases"
-msgstr ""
+msgstr "Дождатья предыдущей фазы"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr.evaluation.report:0
 #: view:hr_evaluation.plan:0
 msgid "Group By..."
-msgstr ""
+msgstr "Группировать по ..."
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,request_id:0
 #: field:hr.evaluation.report,request_id:0
 msgid "Request_id"
-msgstr ""
+msgstr "Идентификатор запроса"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,progress_bar:0
 #: field:hr_evaluation.evaluation,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "Выполнено"
 
 #. module: hr_evaluation
 #: view:board.board:0
@@ -67,58 +67,58 @@ msgstr ""
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Март"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,delay_date:0
 msgid "Delay to Start"
-msgstr ""
+msgstr "Задержка начала"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr_evaluation.evaluation,rating:0
 msgid "Appreciation"
-msgstr ""
+msgstr "Оценка"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:242
 #: code:addons/hr_evaluation/hr_evaluation.py:311
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Warning !"
 
 #. 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 "Организация"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
 msgid "Evaluation Interviews"
-msgstr ""
+msgstr "Испытательные собеседования"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,survey_id:0
 msgid "Appraisal Form"
-msgstr ""
+msgstr "Оценочная форма"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "День"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,evaluation_id:0
 msgid "Evaluation Form"
-msgstr ""
+msgstr "Испытательная форма"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
-msgstr ""
+msgstr "Отправить анонимную сводку сотруднику"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_first:0
@@ -126,34 +126,38 @@ msgid ""
 "This number of months will be used to schedule the first evaluation date of "
 "the employee when selecting an evaluation plan. "
 msgstr ""
+"Указанное количество месяцев будет использоваться при планировании первого "
+"испытательного дня при выборе испытательного плана. "
 
 #. module: hr_evaluation
 #: view:hr.employee:0
 msgid "Notes"
-msgstr ""
+msgstr "Заметки"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Interview Request"
-msgstr ""
+msgstr "Запрос на собеседование"
 
 #. module: hr_evaluation
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Ошибка! Вы не можете выбрать подразделение, руководителем которого является "
+"этот сотрудник."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Body"
-msgstr ""
+msgstr "Тело письма"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_report_all
 #: model:ir.ui.menu,name:hr_evaluation.menu_evaluation_report_all
 msgid "Evaluations Analysis"
-msgstr ""
+msgstr "Анализ испытаний"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -170,7 +174,7 @@ msgstr ""
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Did not meet expectations"
-msgstr ""
+msgstr "Не оправдал ожиданий"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -185,7 +189,7 @@ msgstr ""
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_next:0
 msgid "Periodicity of Evaluations (months)"
-msgstr ""
+msgstr "Периодичность испытаний (мес.)"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:242
@@ -203,7 +207,7 @@ msgstr ""
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_first:0
 msgid "First Evaluation in (months)"
-msgstr ""
+msgstr "Первое испытание через (мес.)"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:81
@@ -229,7 +233,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Send to Employees"
-msgstr ""
+msgstr "Отправить сотрудникам"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,deadline:0
@@ -324,18 +328,20 @@ msgstr ""
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Exceeds expectations"
-msgstr ""
+msgstr "Превосходит ожидания"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,mail_feature:0
 msgid ""
 "Check this box if you want to send mail to employees coming under this phase"
 msgstr ""
+"Отметьте, если хотите отправлять письма сотрудникам, приходящим в текущей "
+"фазе"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_manager:0
 msgid "Send all answers to the manager"
-msgstr ""
+msgstr "Отправить все ответы менеджеру"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -350,13 +356,13 @@ msgstr ""
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date:0
 msgid "Evaluation Deadline"
-msgstr ""
+msgstr "Дата завершения испытания"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Print Interview"
-msgstr ""
+msgstr "Распечатать собеседование"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,closed:0
@@ -367,13 +373,13 @@ msgstr ""
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Meet expectations"
-msgstr ""
+msgstr "Соответствует ожиданиям"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,nbr:0
 msgid "# of Requests"
-msgstr ""
+msgstr "# запросов"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_tree
@@ -391,16 +397,20 @@ msgid ""
 "manages all kind of evaluations: bottom-up, top-down, self-evaluation and "
 "final evaluation by the manager."
 msgstr ""
+"Каждому сотруднику может быть назначен испытательный план. Данный план "
+"определяет частоту и порядок персональных испытаний. Вы можете определить "
+"этапы и прикрепить к ним собеседования. OpenERP поддерживает все виды "
+"оценок: снизу-вверх, сверху-вниз, самооценка и конечная оценка менеджером."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Action to Perform"
-msgstr ""
+msgstr "Действие к выполнению"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,note_action:0
 msgid "Action Plan"
-msgstr ""
+msgstr "План действия"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -410,13 +420,13 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Ending Summary"
-msgstr ""
+msgstr "Заключительная сводка"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Significantly exceeds expectations"
-msgstr ""
+msgstr "Значительно превосходит ожидания"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -427,7 +437,7 @@ msgstr ""
 #: field:hr_evaluation.plan.phase,send_answer_employee:0
 #: field:hr_evaluation.plan.phase,send_answer_manager:0
 msgid "All Answers"
-msgstr ""
+msgstr "Все ответы"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -448,7 +458,7 @@ msgstr ""
 #. module: hr_evaluation
 #: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
 msgid "Human Resources Evaluation"
-msgstr ""
+msgstr "Оценка человеческих ресурсов"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -458,23 +468,23 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Settings"
-msgstr ""
+msgstr "Настройки почты"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,user_to_review_id:0
 msgid "Employee to Interview"
-msgstr ""
+msgstr "Сотрудник на собеседование"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Interview Question"
-msgstr ""
+msgstr "Вопрос собеседования"
 
 #. module: hr_evaluation
 #: field:survey.request,is_evaluation:0
 msgid "Is Evaluation?"
-msgstr ""
+msgstr "Является оценкой?"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_survey_request
@@ -487,11 +497,13 @@ msgid ""
 "Check this box if you want to wait that all preceding phases are finished "
 "before launching this phase."
 msgstr ""
+"Отметьте, если необходимо, чтобы перед началом данной фазы все предыдущие "
+"были завершены."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Evaluation Data"
-msgstr ""
+msgstr "Данные испытания"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.evaluation,note_action:0
@@ -509,13 +521,13 @@ msgstr "Черновик"
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,note_summary:0
 msgid "Evaluation Summary"
-msgstr ""
+msgstr "Сводка испытания"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,send_anonymous_employee:0
 #: field:hr_evaluation.plan.phase,send_anonymous_manager:0
 msgid "Anonymous Summary"
-msgstr ""
+msgstr "Анонимная сводка"
 
 #. module: hr_evaluation
 #: view:hr.employee:0
@@ -541,7 +553,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Start Evaluation"
-msgstr ""
+msgstr "Начало испытания"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -557,7 +569,7 @@ msgstr ""
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Significantly bellow expectations"
-msgstr ""
+msgstr "Значительно ниже ожиданий"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -610,19 +622,19 @@ msgstr ""
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
 msgid "Send an anonymous summary to the manager"
-msgstr ""
+msgstr "Отправить анонимную сводку менеджеру"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Interview Evaluation"
-msgstr ""
+msgstr "Оценка собеседования"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_plan_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_plan_tree
 msgid "Evaluation Plans"
-msgstr ""
+msgstr "Планы испытаний"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -648,22 +660,22 @@ msgstr ""
 #: view:hr.evaluation.report:0
 #: selection:hr.evaluation.report,state:0
 msgid "Final Validation"
-msgstr ""
+msgstr "Конечная проверка"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Waiting Appreciation"
-msgstr ""
+msgstr "Ожидание оценки"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_feature:0
 msgid "Send mail for this phase"
-msgstr ""
+msgstr "Отправить письмо по данной фазе"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,rating:0
 msgid "Overall Rating"
-msgstr ""
+msgstr "Общий рейтинг"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -675,22 +687,22 @@ msgstr ""
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Interviewer"
-msgstr ""
+msgstr "Интервьюер"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_report
 msgid "Evaluations Statistics"
-msgstr ""
+msgstr "Статистика испытаний"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Deadline Date"
-msgstr ""
+msgstr "Конечная дата"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Top-Down Appraisal Requests"
-msgstr ""
+msgstr "Запросы на оценку сверху вниз"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -700,12 +712,12 @@ msgstr ""
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_employee:0
 msgid "Send all answers to the employee"
-msgstr ""
+msgstr "Отправить все ответы сотруднику"
 
 #. module: hr_evaluation
 #: field:hr.employee,evaluation_date:0
 msgid "Next Evaluation Date"
-msgstr ""
+msgstr "Следующая дата испытания"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -718,7 +730,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Evaluation Plan Phases"
-msgstr ""
+msgstr "Фазы плана оценки"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
@@ -794,12 +806,12 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Validate Evaluation"
-msgstr ""
+msgstr "Проверить оценку"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Final Interview"
-msgstr ""
+msgstr "Завершающее собеседование"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,name:0
@@ -809,13 +821,13 @@ msgstr ""
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Bottom-Up Appraisal Requests"
-msgstr ""
+msgstr "Запросы оценки снизу вверх"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Search Evaluation"
-msgstr ""
+msgstr "Поиск оценки"
 
 #. module: hr_evaluation
 #: field:hr.employee,evaluation_plan_id:0
@@ -824,7 +836,7 @@ msgstr ""
 #: field:hr_evaluation.plan.phase,plan_id:0
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan
 msgid "Evaluation Plan"
-msgstr ""
+msgstr "План оценки"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -834,7 +846,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Send to Managers"
-msgstr ""
+msgstr "Отправить менеджерам"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_send_mail
@@ -849,12 +861,12 @@ msgstr ""
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
 msgid "Employee Evaluation"
-msgstr ""
+msgstr "Оценка сотрудника"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 msgid "Search Evaluation Plan"
-msgstr ""
+msgstr "Поиск по плану оценки"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
@@ -875,7 +887,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_interview_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_hr_evaluation_interview_requests
 msgid "Interview Requests"
-msgstr ""
+msgstr "Запросы на собеседование"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,create_date:0
@@ -894,6 +906,8 @@ msgid ""
 "The date of the next evaluation is computed by the evaluation plan's dates "
 "(first evaluation + periodicity)."
 msgstr ""
+"Дата следующей оценки вычисляется согласно плану (первая оценка + "
+"периодичность)."
 
 #~ msgid "Score"
 #~ msgstr "Оценка"
diff --git a/addons/hr_expense/__init__.py b/addons/hr_expense/__init__.py
index 06f78648101..55a87f95400 100644
--- a/addons/hr_expense/__init__.py
+++ b/addons/hr_expense/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 95d2b60300b..aa6dd557be8 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -46,6 +46,7 @@ re-invoice your customer's expenses if your work by project.
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
+        'hr_expense_data.xml',
         'hr_expense_sequence.xml',
         'hr_expense_workflow.xml',
         'hr_expense_view.xml',
@@ -54,7 +55,8 @@ re-invoice your customer's expenses if your work by project.
         'security/ir_rule.xml',
         'report/hr_expense_report_view.xml',
         'board_hr_expense_view.xml',
-        'board_hr_expense_manager_view.xml'
+        'board_hr_expense_manager_view.xml',
+        'hr_expense_installer_view.xml',
     ],
     'demo_xml': [
         'hr_expense_demo.xml',
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 2e7020306b5..1b2d97ac253 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -70,7 +70,7 @@ class hr_expense_expense(osv.osv):
         'account_move_id': fields.many2one('account.move', 'Ledger Posting'),
         'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
         'note': fields.text('Note'),
-        'amount': fields.function(_amount, method=True, string='Total Amount'),
+        'amount': fields.function(_amount, string='Total Amount'),
         'invoice_id': fields.many2one('account.invoice', "Employee's Invoice"),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
         'department_id':fields.many2one('hr.department','Department'),
@@ -227,6 +227,16 @@ class product_product(osv.osv):
         'hr_expense_ok': fields.boolean('Can Constitute an Expense', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."),
     }
 
+    def on_change_hr_expense_ok(self, cr, uid, id, hr_expense_ok):
+
+        if not hr_expense_ok:
+            return {}
+        data_obj = self.pool.get('ir.model.data')
+        cat_id = data_obj._get_id(cr, uid, 'hr_expense', 'cat_expense')
+        categ_id = data_obj.browse(cr, uid, cat_id).res_id
+        res = {'value' : {'type':'service','procure_method':'make_to_stock','supply_method':'buy','purchase_ok':True,'sale_ok' :False,'categ_id':categ_id }}
+        return res
+
 product_product()
 
 class hr_expense_line(osv.osv):
@@ -244,7 +254,7 @@ class hr_expense_line(osv.osv):
         'name': fields.char('Expense Note', size=128, required=True),
         'date_value': fields.date('Date', required=True),
         'expense_id': fields.many2one('hr.expense.expense', 'Expense', ondelete='cascade', select=True),
-        'total_amount': fields.function(_amount, method=True, string='Total', digits_compute=dp.get_precision('Account')),
+        'total_amount': fields.function(_amount, string='Total', digits_compute=dp.get_precision('Account')),
         'unit_amount': fields.float('Unit Price', digits_compute=dp.get_precision('Account')),
         'unit_quantity': fields.float('Quantities' ),
         'product_id': fields.many2one('product.product', 'Product', domain=[('hr_expense_ok','=',True)]),
diff --git a/addons/hr_expense/hr_expense_data.xml b/addons/hr_expense/hr_expense_data.xml
new file mode 100644
index 00000000000..33a7ec7604c
--- /dev/null
+++ b/addons/hr_expense/hr_expense_data.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!--
+    Resource: product.uom.categ
+    -->
+       <record id="cat_expense" model="product.category">
+            <field name="parent_id" ref="product.cat0"/>
+            <field name="name">Expenses</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
new file mode 100644
index 00000000000..aa0ecbd1ae1
--- /dev/null
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+ <record model="ir.actions.act_window" id="product_normal_form_view_installer">
+           <field name="name">Review Your Expenses Products</field>
+           <field name="type">ir.actions.act_window</field>
+           <field name="res_model">product.product</field>
+           <field name="view_type">form</field>
+           <field name="view_mode">tree,form</field>
+           <field name="context" eval="'{\'default_type\':\'service\',\'default_procure_method\':\'make_to_stock\',\'default_supply_method\':\'buy\',\'default_purchase_ok\':True, \'default_sale_ok\':False, \'default_hr_expense_ok\':True,\'default_categ_id\': ' + str(ref('cat_expense')) +'}'"/>
+           <field name="view_id" ref="product.product_normal_form_view"/>
+       </record>
+
+       <record id="product_normal_form_view_todo" model="ir.actions.todo">
+           <field name="action_id" ref="product_normal_form_view_installer"/>
+           <field name="category_id" ref="hr.category_hr_management_config"/>
+           <field name="sequence">3</field>
+           <field name="type">normal</field>
+           <field name="state">skip</field>
+       </record>
+    </data>
+</openerp>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 5aa2fe5c38e..750404c40d9 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -189,7 +189,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <field name="purchase_ok" position="after">
-               <field name="hr_expense_ok"/>
+            <field name="hr_expense_ok" on_change="on_change_hr_expense_ok(hr_expense_ok)"/>
             </field>
             </field>
         </record>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 3796b379ba2..612b890b723 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -78,9 +78,9 @@ class hr_holidays_status(osv.osv):
         'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
         'limit': fields.boolean('Allow to Override Limit', help='If you tick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
-        'max_leaves': fields.function(_user_left_days, method=True, string='Maximum Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
-        'leaves_taken': fields.function(_user_left_days, method=True, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
-        'remaining_leaves': fields.function(_user_left_days, method=True, string='Remaining Leaves', help='Maximum Leaves Allowed - Leaves Already Taken', multi='user_left_days'),
+        'max_leaves': fields.function(_user_left_days, string='Maximum Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
+        'leaves_taken': fields.function(_user_left_days, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
+        'remaining_leaves': fields.function(_user_left_days, string='Remaining Leaves', help='Maximum Leaves Allowed - Leaves Already Taken', multi='user_left_days'),
         'double_validation': fields.boolean('Apply Double Validation', help="If its True then its Allocation/Request have to be validated by second validator")
     }
     _defaults = {
@@ -94,8 +94,8 @@ class hr_holidays(osv.osv):
     _description = "Leave"
     _order = "type desc, date_from asc"
 
-    def _employee_get(obj, cr, uid, context=None):
-        ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
+    def _employee_get(self, cr, uid, context=None):
+        ids = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
         if ids:
             return ids[0]
         return False
@@ -127,7 +127,7 @@ class hr_holidays(osv.osv):
         'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
         'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)]}),
         'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}),
-        'number_of_days': fields.function(_compute_number_of_days, method=True, string='Number of Days', store=True),
+        'number_of_days': fields.function(_compute_number_of_days, string='Number of Days', store=True),
         'case_id': fields.many2one('crm.meeting', 'Meeting'),
         'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone"),
         'parent_id': fields.many2one('hr.holidays', 'Parent'),
@@ -322,3 +322,48 @@ class resource_calendar_leaves(osv.osv):
 
 resource_calendar_leaves()
 
+
+class hr_employee(osv.osv):
+   _inherit="hr.employee"
+
+   def _set_remaining_days(self, cr, uid, empl_id, name, value, arg, context=None):
+        employee = self.browse(cr, uid, empl_id, context=context)
+        diff = value - employee.remaining_leaves
+        type_obj = self.pool.get('hr.holidays.status')
+        holiday_obj = self.pool.get('hr.holidays')
+        # Find for holidays status
+        status_ids = type_obj.search(cr, uid, [('limit', '=', False)], context=context)
+        if len(status_ids) != 1 :
+            raise osv.except_osv(_('Warning !'),_("To use this feature, you must have only one leave type without the option 'Allow to Override Limit' set. (%s Found).") % (len(status_ids)))
+        status_id = status_ids and status_ids[0] or False
+        if not status_id:
+            return False
+        if diff > 0:
+            leave_id = holiday_obj.create(cr, uid, {'name': _('Allocation for %s') % employee.name, 'employee_id': employee.id, 'holiday_status_id': status_id, 'type': 'add', 'holiday_type': 'employee', 'number_of_days_temp': diff}, context=context)
+        elif diff < 0:
+            leave_id = holiday_obj.create(cr, uid, {'name': _('Leave Request for %s') % employee.name, 'employee_id': employee.id, 'holiday_status_id': status_id, 'type': 'remove', 'holiday_type': 'employee', 'number_of_days_temp': abs(diff)}, context=context)
+        else:
+            return False
+        holiday_obj.holidays_confirm(cr, uid, [leave_id])
+        holiday_obj.holidays_validate2(cr, uid, [leave_id])
+        return True
+
+   def _get_remaining_days(self, cr, uid, ids, name, args, context=None):
+        cr.execute("SELECT sum(h.number_of_days_temp) as days, h.employee_id from hr_holidays h join hr_holidays_status s on (s.id=h.holiday_status_id) where h.type='add' and h.state='validate' and s.limit=False group by h.employee_id")
+        res = cr.dictfetchall()
+        remaining = {}
+        for r in res:
+            remaining[r['employee_id']] = r['days']
+        for employee_id in ids:
+            if not remaining.get(employee_id):
+                remaining[employee_id] = 0.0
+        return remaining
+
+
+   _columns = {
+        'remaining_leaves': fields.function(_get_remaining_days, string='Remaining Legal Leaves', fnct_inv=_set_remaining_days, type="float", help='Total number of legal leaves allocated to this employee, change this value to create allocation/leave requests.', store=True),
+    }
+
+hr_employee()
+
+
diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
index 825f8b672d2..2c0debb3552 100644
--- a/addons/hr_holidays/hr_holidays_data.xml
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -5,7 +5,6 @@
     <!-- Casual leave -->
     <record model="hr.holidays.status" id="holiday_status_cl">
       <field name="name">Legal Leaves</field>
-      <field name="limit">False</field>
       <field name="color_name">black</field>
     </record>
 
@@ -20,7 +19,7 @@
     <!-- Compensatory Days -->
     <record model="hr.holidays.status" id="holiday_status_comp">
       <field name="name">Compensatory Days</field>
-      <field name="limit">False</field>
+      <field name="limit">True</field>
       <field name="color_name">brown</field>
     </record>
 
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 608fda554fb..cf725735641 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -458,6 +458,50 @@
             src_model="hr.employee"
             view_id ="view_holiday"
             id="act_hr_employee_holiday_request"/>
+            
+       <!--  Assing leave       -->
+        
+        <record id="hr_holidays_leaves_assign_tree_view" model="ir.ui.view">
+            <field name="name">hr.employee.leave.tree</field>
+            <field name="model">hr.employee</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Assign Leaves" editable="top">
+                    <field name="name" string="Employee"/>
+                    <field name="remaining_leaves" string="Remaining Legal Leaves"/>
+                </tree>
+            </field>
+        </record>  
+
+        <record model="ir.actions.act_window" id="hr_holidays_leaves_assign_legal">
+           <field name="name">Assign Legal Leaves to Employees</field>
+           <field name="type">ir.actions.act_window</field>
+           <field name="res_model">hr.employee</field>
+           <field name="view_type">form</field>
+           <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="hr_holidays_leaves_assign_tree_view"/>
+       </record>
+
+       <record id="hr_holidays_leaves_assign_form_view_todo" model="ir.actions.todo">
+           <field name="action_id" ref="hr_holidays_leaves_assign_legal"/>
+           <field name="category_id" ref="hr.category_hr_management_config"/>
+           <field name="type">normal</field>
+           <field name="state">skip</field>
+       </record>        
+       
+        <!-- Hr employee inherit Legal Leaves -->
+    
+        <record id="view_employee_form_leave_inherit" model="ir.ui.view">
+            <field name="name">hr.employee.leave.form.inherit</field>
+            <field name="model">hr.employee</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+                <field name="coach_id" position="after">
+                    <field name="remaining_leaves" string="Remaining Legal Leaves"/>
+                </field>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/hr_holidays/i18n/vi.po b/addons/hr_holidays/i18n/vi.po
index 4bb9e39028a..30976eb55d4 100644
--- a/addons/hr_holidays/i18n/vi.po
+++ b/addons/hr_holidays/i18n/vi.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:15+0000\n"
-"PO-Revision-Date: 2010-08-02 14:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-06-04 23:20+0000\n"
+"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-06 04:37+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Blue"
-msgstr ""
+msgstr "Xanh dương"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -31,7 +31,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
-msgstr ""
+msgstr "Đang chờ Chấp thuận Thứ hai"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,remaining_leaves:0
@@ -41,48 +41,48 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Leaves Management"
-msgstr ""
+msgstr "Quản lý Ngày nghỉ"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Group By..."
-msgstr ""
+msgstr "Nhóm theo..."
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
-msgstr ""
+msgstr "Nghỉ Ốm"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Phòng ban"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Refused"
-msgstr ""
+msgstr "Đã từ chối"
 
 #. module: hr_holidays
 #: help:hr.holidays,category_id:0
 msgid "Category of Employee"
-msgstr ""
+msgstr "Nhóm Người lao động"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Brown"
-msgstr ""
+msgstr "Nâu"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Remaining Days"
-msgstr ""
+msgstr "Số ngày còn lại"
 
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee"
-msgstr ""
+msgstr "Theo Người lao động"
 
 #. module: hr_holidays
 #: help:hr.holidays,employee_id:0
@@ -94,14 +94,14 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Đặt thành Nháp"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_reporting_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
 msgid "Holidays"
-msgstr ""
+msgstr "Nghỉ lễ"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -111,7 +111,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Green"
-msgstr ""
+msgstr "Xanh lá nhạt"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
@@ -131,12 +131,12 @@ msgstr ""
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Được chấp thuận"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Refuse"
-msgstr ""
+msgstr "Từ chối"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:309
@@ -149,7 +149,7 @@ msgstr ""
 #: view:board.board:0
 #: view:hr.holidays:0
 msgid "Leaves"
-msgstr ""
+msgstr "Ngày nghỉ"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays
@@ -159,12 +159,12 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
 msgid "Leaves by Department"
-msgstr ""
+msgstr "Ngày nghỉ theo Phòng ban"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Bị hủy bỏ"
 
 #. module: hr_holidays
 #: help:hr.holidays,type:0
@@ -177,12 +177,12 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Validation"
-msgstr ""
+msgstr "Xác nhận"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
-msgstr ""
+msgstr "Màu trong Báo cáo"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
@@ -200,24 +200,24 @@ msgstr ""
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
 #: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
 msgid "Leave Type"
-msgstr ""
+msgstr "Loại nghỉ"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:186
 #: code:addons/hr_holidays/hr_holidays.py:309
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Cảnh báo!"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nháp"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Magenta"
-msgstr ""
+msgstr "Đỏ tía"
 
 #. module: hr_holidays
 #: help:hr.holidays,state:0
@@ -232,29 +232,29 @@ msgstr ""
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "You have to select at least 1 Department. And try again"
-msgstr ""
+msgstr "Bạn phải chọn ít nhất 1 Phòng ban. Và thử lại"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Đã xác nhận"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.dept,date_from:0
 #: field:hr.holidays.summary.employee,date_from:0
 msgid "From"
-msgstr ""
+msgstr "Từ"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Confirm"
-msgstr ""
+msgstr "Xác nhận"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The start date must be before the end date !"
-msgstr ""
+msgstr "Ngày bắt đầu phải trước ngày kết thúc !"
 
 #. module: hr_holidays
 #: model:ir.module.module,description:hr_holidays.module_meta_information
@@ -296,35 +296,35 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays.status,remaining_leaves:0
 msgid "Remaining Leaves"
-msgstr ""
+msgstr "Số ngày nghỉ còn lại"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,state:0
 msgid "State"
-msgstr ""
+msgstr "Trạng thái"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
 msgid "Total holidays by type"
-msgstr ""
+msgstr "Tổng số ngày nghỉ theo loại"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 msgid "Employee"
-msgstr ""
+msgstr "Người lao động"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Type"
-msgstr ""
+msgstr "Loại"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Red"
-msgstr ""
+msgstr "Đỏ"
 
 #. module: hr_holidays
 #: view:hr.holidays.remaining.leaves.user:0
@@ -351,7 +351,7 @@ msgstr ""
 #: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
-msgstr ""
+msgstr "Số ngày"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -373,12 +373,12 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Đang chờ Chấp thuận"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
-msgstr ""
+msgstr "Người lao động"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
@@ -395,7 +395,7 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Cha"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -406,7 +406,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
 msgid "Leave Requests"
-msgstr ""
+msgstr "Các yêu cầu Nghỉ"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
@@ -417,12 +417,12 @@ msgstr ""
 #: view:hr.holidays.summary.employee:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
 msgid "Employee's Holidays"
-msgstr ""
+msgstr "Các ngày lễ của Người lao động"
 
 #. module: hr_holidays
 #: field:hr.holidays,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Phân loại"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,max_leaves:0
@@ -450,18 +450,18 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Black"
-msgstr ""
+msgstr "Đen"
 
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
-msgstr ""
+msgstr "Ngày lễ"
 
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
-msgstr ""
+msgstr "Cuộc họp"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -483,12 +483,12 @@ msgstr ""
 #: field:hr.holidays,user_id:0
 #: field:hr.holidays.remaining.leaves.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Người sử dụng"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,active:0
 msgid "Active"
-msgstr ""
+msgstr "Hoạt động"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
@@ -498,12 +498,12 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Các bộ lọc Mở rộng..."
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The number of days must be greater than 0 !"
-msgstr ""
+msgstr "Số ngày phải lớn hơn 0 !"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
@@ -525,7 +525,7 @@ msgstr ""
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Lỗi"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -535,7 +535,7 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,type:0
 msgid "Request Type"
-msgstr ""
+msgstr "Loại Yêu cầu"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,active:0
@@ -547,12 +547,12 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Misc"
-msgstr ""
+msgstr "Các thứ khác"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "General"
-msgstr ""
+msgstr "Tổng quát"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -569,7 +569,7 @@ msgstr ""
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
 msgid "Cancel"
-msgstr ""
+msgstr "Hủy bỏ"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,color_name:0
@@ -599,18 +599,18 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays.status,double_validation:0
 msgid "Apply Double Validation"
-msgstr ""
+msgstr "Thực hiện Xét duyệt Hai lần"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
 msgid "Print"
-msgstr ""
+msgstr "In"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Details"
-msgstr ""
+msgstr "Các chi tiết"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
@@ -626,12 +626,12 @@ msgstr ""
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 msgid "Leave Request"
-msgstr ""
+msgstr "Yêu cầu Nghỉ"
 
 #. module: hr_holidays
 #: field:hr.holidays,name:0
 msgid "Description"
-msgstr ""
+msgstr "Mô tả"
 
 #. module: hr_holidays
 #: help:hr.holidays,holiday_type:0
@@ -649,37 +649,37 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Search Leave"
-msgstr ""
+msgstr "Tìm kiếm Ngày nghỉ"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Holiday Type"
-msgstr ""
+msgstr "Lựa chọn Loại Nghỉ lễ"
 
 #. module: hr_holidays
 #: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
 msgid "Remaining leaves"
-msgstr ""
+msgstr "Số ngày nghỉ còn lại"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.dept,depts:0
 msgid "Department(s)"
-msgstr ""
+msgstr "Phòng ban"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "This Month"
-msgstr ""
+msgstr "Tháng này"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id2:0
 msgid "Second Approval"
-msgstr ""
+msgstr "Chấp thuận Lần 2"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "Ngày kết thúc"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
@@ -698,7 +698,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Violet"
-msgstr ""
+msgstr "Tím sẫm"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,max_leaves:0
@@ -715,7 +715,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
 msgid "Human Resources: Holidays management"
-msgstr ""
+msgstr "Nguồn Nhân lực: Quản lý ngày nghỉ"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
@@ -730,12 +730,12 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Approve"
-msgstr ""
+msgstr "Chấp thuận"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "Ngày bắt đầu"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
@@ -756,7 +756,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Manager"
-msgstr ""
+msgstr "Người quản lý"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index b29bd1312ac..7b94ecc5dbb 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -318,11 +318,11 @@ class hr_contract(osv.osv):
         'visa_expire': fields.date('Visa Expire Date'),
         'struct_id': fields.many2one('hr.payroll.structure', 'Salary Structure'),
         'working_days_per_week': fields.integer('Working Days', help="No of Working days / week for an employee"),
-        'basic': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Basic Salary', digits=(14,2)),
-        'gross': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Gross Salary', digits=(14,2)),
-        'net': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Net Salary', digits=(14,2)),
-        'advantages_net': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Deductions', digits=(14,2)),
-        'advantages_gross': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Allowances', digits=(14,2)),
+        'basic': fields.function(_calculate_salary, store=True, multi='dc', type='float', string='Basic Salary', digits=(14,2)),
+        'gross': fields.function(_calculate_salary, store=True, multi='dc', type='float', string='Gross Salary', digits=(14,2)),
+        'net': fields.function(_calculate_salary, store=True, multi='dc', type='float', string='Net Salary', digits=(14,2)),
+        'advantages_net': fields.function(_calculate_salary, store=True, multi='dc', type='float', string='Deductions', digits=(14,2)),
+        'advantages_gross': fields.function(_calculate_salary, store=True, multi='dc', type='float', string='Allowances', digits=(14,2)),
     }
     _defaults = {
         'working_days_per_week': lambda *a: 5,
@@ -374,10 +374,10 @@ class payroll_register(osv.osv):
         ],'State', select=True, readonly=True),
         'active':fields.boolean('Active', required=False),
         'company_id':fields.many2one('res.company', 'Company', required=False),
-        'grows': fields.function(_calculate, method=True, store=True, multi='dc', string='Gross Salary', type='float', digits=(16, 4)),
-        'net': fields.function(_calculate, method=True, store=True, multi='dc', string='Net Salary', digits=(16, 4)),
-        'allounce': fields.function(_calculate, method=True, store=True, multi='dc', string='Allowance', digits=(16, 4)),
-        'deduction': fields.function(_calculate, method=True, store=True, multi='dc', string='Deduction', digits=(16, 4)),
+        'grows': fields.function(_calculate, store=True, multi='dc', string='Gross Salary', type='float', digits=(16, 4)),
+        'net': fields.function(_calculate, store=True, multi='dc', string='Net Salary', digits=(16, 4)),
+        'allounce': fields.function(_calculate, store=True, multi='dc', string='Allowance', digits=(16, 4)),
+        'deduction': fields.function(_calculate, store=True, multi='dc', string='Deduction', digits=(16, 4)),
         'note': fields.text('Description'),
         'bank_id':fields.many2one('res.bank', 'Bank', required=False, help="Select the Bank Address from whcih the salary is going to be paid"),
     }
@@ -611,8 +611,8 @@ class contrib_register(osv.osv):
         'company_id':fields.many2one('res.company', 'Company', required=False),
         'name':fields.char('Name', size=256, required=True, readonly=False),
         'register_line_ids':fields.one2many('hr.contibution.register.line', 'register_id', 'Register Line', readonly=True),
-        'monthly_total_by_emp': fields.function(_total_contrib, method=True, multi='dc', string='Total By Employee', digits=(16, 4)),
-        'monthly_total_by_comp': fields.function(_total_contrib, method=True, multi='dc', string='Total By Company', digits=(16, 4)),
+        'monthly_total_by_emp': fields.function(_total_contrib, multi='dc', string='Total By Employee', digits=(16, 4)),
+        'monthly_total_by_comp': fields.function(_total_contrib, multi='dc', string='Total By Company', digits=(16, 4)),
         'note': fields.text('Description'),
     }
     _defaults = {
@@ -644,7 +644,7 @@ class contrib_register_line(osv.osv):
         'date': fields.date('Date'),
         'emp_deduction': fields.float('Employee Deduction', digits=(16, 4)),
         'comp_deduction': fields.float('Company Deduction', digits=(16, 4)),
-        'total': fields.function(_total, method=True, store=True,  string='Total', digits=(16, 4)),
+        'total': fields.function(_total, store=True,  string='Total', digits=(16, 4)),
     }
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
@@ -711,7 +711,6 @@ class company_contribution(osv.osv):
             type='many2one',
             relation='hr.contibution.register',
             string="Contribution Register",
-            method=True,
             view_load=True,
             help="Contribution register based on company",
             required=False
@@ -884,12 +883,12 @@ class hr_payslip(osv.osv):
         'basic_before_leaves': fields.float('Basic Salary', readonly=True,  digits_compute=dp.get_precision('Account')),
         'leaves': fields.float('Leave Deductions', readonly=True,  digits_compute=dp.get_precision('Account')),
         'basic': fields.float('Net Basic', readonly=True,  digits_compute=dp.get_precision('Account')),
-        'grows': fields.function(_calculate, method=True, store=True, multi='dc', string='Gross Salary', digits_compute=dp.get_precision('Account')),
-        'net': fields.function(_calculate, method=True, store=True, multi='dc', string='Net Salary', digits_compute=dp.get_precision('Account')),
-        'allounce': fields.function(_calculate, method=True, store=True, multi='dc', string='Allowance', digits_compute=dp.get_precision('Account')),
-        'deduction': fields.function(_calculate, method=True, store=True, multi='dc', string='Deduction', digits_compute=dp.get_precision('Account')),
-        'other_pay': fields.function(_calculate, method=True, store=True, multi='dc', string='Others', digits_compute=dp.get_precision('Account')),
-        'total_pay': fields.function(_calculate, method=True, store=True, multi='dc', string='Total Payment', digits_compute=dp.get_precision('Account')),
+        'grows': fields.function(_calculate, store=True, multi='dc', string='Gross Salary', digits_compute=dp.get_precision('Account')),
+        'net': fields.function(_calculate, store=True, multi='dc', string='Net Salary', digits_compute=dp.get_precision('Account')),
+        'allounce': fields.function(_calculate, store=True, multi='dc', string='Allowance', digits_compute=dp.get_precision('Account')),
+        'deduction': fields.function(_calculate, store=True, multi='dc', string='Deduction', digits_compute=dp.get_precision('Account')),
+        'other_pay': fields.function(_calculate, store=True, multi='dc', string='Others', digits_compute=dp.get_precision('Account')),
+        'total_pay': fields.function(_calculate, store=True, multi='dc', string='Total Payment', digits_compute=dp.get_precision('Account')),
         'line_ids':fields.one2many('hr.payslip.line', 'slip_id', 'Payslip Line', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'company_id':fields.many2one('res.company', 'Company', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'holiday_days': fields.float('No of Leaves', readonly=True),
@@ -1436,11 +1435,11 @@ class hr_employee(osv.osv):
         'slip_ids':fields.one2many('hr.payslip', 'employee_id', 'Payslips', required=False, readonly=True),
         'otherid': fields.char('Other Id', size=64),
 
-        'basic': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Basic Salary', digits=(14,2)),
-        'gross': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Gross Salary', digits=(14,2)),
-        'net': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Net Salary', digits=(14,2)),
-        'advantages_net': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Deductions', digits=(14,2)),
-        'advantages_gross': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Allowances', digits=(14,2)),
+        'basic': fields.function(_calculate_salary, multi='dc', type='float', string='Basic Salary', digits=(14,2)),
+        'gross': fields.function(_calculate_salary, multi='dc', type='float', string='Gross Salary', digits=(14,2)),
+        'net': fields.function(_calculate_salary, multi='dc', type='float', string='Net Salary', digits=(14,2)),
+        'advantages_net': fields.function(_calculate_salary, multi='dc', type='float', string='Deductions', digits=(14,2)),
+        'advantages_gross': fields.function(_calculate_salary, multi='dc', type='float', string='Allowances', digits=(14,2)),
     }
 hr_employee()
 
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 78b9da0f9c1..68090e09dd3 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -167,9 +167,9 @@
                             </group>
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Valid for"/>
-                                <field name="visa_no" attrs="{'required': [('passport_id','!=',False), ]}"/>
-                                <field name="permit_no" attrs="{'required': [('passport_id','!=',False), ]}"/>
-                                <field name="visa_expire" attrs="{'required': [('passport_id','!=',False), ]}"/>
+                                <field name="visa_no" attrs="{'required': [('passport_id','!=',False) ]}"/>
+                                <field name="permit_no" attrs="{'required': [('passport_id','!=',False) ]}"/>
+                                <field name="visa_expire" attrs="{'required': [('passport_id','!=',False) ]}"/>
                             </group>
                         </page>
                     </notebook>
diff --git a/addons/hr_payroll/i18n/es_EC.po b/addons/hr_payroll/i18n/es_EC.po
index 6a7f2d496c0..3e67532736f 100644
--- a/addons/hr_payroll/i18n/es_EC.po
+++ b/addons/hr_payroll/i18n/es_EC.po
@@ -8,128 +8,142 @@ 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-13 21:03+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-06-11 13:23+0000\n"
+"Last-Translator: Christopher Ormaza - (Ecuadorenlinea.net) "
+"<chris.ormaza@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@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-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-12 04:52+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "E-mail Address"
-msgstr ""
+msgstr "Dirección de correo electrónico"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
 msgid "Based"
-msgstr ""
+msgstr "Basado"
 
 #. module: hr_payroll
+#: field:hr.contract,net:0
+#: field:hr.employee,net:0
 #: field:hr.payroll.register,net:0
 #: field:hr.payslip,net:0
+#: report:salary.structure:0
 msgid "Net Salary"
-msgstr ""
+msgstr "Salario neto"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Recompute Sheet"
-msgstr ""
+msgstr "Recalcular plantilla"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Employees Salary Details"
-msgstr ""
+msgstr "Detalles de Salarios de Empleados"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Allowances with Basic:"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
+#: report:employees.salary:0
+#: report:salary.structure:0
 msgid "Department"
-msgstr ""
+msgstr "Departamento"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Deductions:"
-msgstr ""
+msgstr "Deducciones:"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,gratuity:0
+#: field:company.contribution,gratuity:0
 msgid "Use for Gratuity ?"
-msgstr ""
+msgstr "¿Uso de propina?"
 
 #. module: hr_payroll
+#: field:hr.contract,working_days_per_week:0
 #: field:hr.payslip,working_days:0
+#: report:payslip.pdf:0
 msgid "Working Days"
-msgstr ""
+msgstr "Días de trabajo"
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Loan"
-msgstr ""
+msgstr "Préstamo"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 msgid "Salary Payment Register"
-msgstr ""
+msgstr "Registro de pago de nómina"
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
 #: view:hr.payroll.register:0
 #: field:hr.payroll.register,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
-msgstr ""
+msgstr "Nóminas"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
 msgid "Year Salary Report"
-msgstr ""
+msgstr "Informe anual de salarios"
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Paid Salary"
-msgstr ""
+msgstr "Nómina pagada"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "("
-msgstr ""
+msgstr "("
 
 #. module: hr_payroll
+#: field:company.contribution,company_id:0
+#: field:hr.allounce.deduction.categoty,company_id:0
+#: field:hr.contibution.register,company_id:0
+#: field:hr.holidays.status,company_id:0
+#: field:hr.payroll.advice,company_id:0
 #: field:hr.payroll.register,company_id:0
+#: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
-#: wizard_field:payroll.analysis,init,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Compañía"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "The Manager"
-msgstr ""
+msgstr "Responsable"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Letter Details"
-msgstr ""
+msgstr "Detalles de la carta"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
+#: report:payslip.pdf:0
 msgid ","
-msgstr ""
+msgstr ","
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Cambiar a borrador"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:180
@@ -141,42 +155,41 @@ msgstr ""
 #: code:addons/hr_payroll/hr_payroll.py:1410
 #, python-format
 msgid "Variable Error: %s "
-msgstr ""
+msgstr "Error variable: %s "
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Expire"
-msgstr ""
+msgstr "Vencimiento"
 
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
 msgid "Half-Pay Holiday"
-msgstr ""
+msgstr "Vacaciones con media paga"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 #: field:hr.payslip,other_pay:0
 msgid "Others"
-msgstr ""
+msgstr "Otros"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,slip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Pay Slip"
-msgstr ""
+msgstr "Nómina"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Contract Detail:"
-msgstr ""
+msgstr "Detalles del contrato:"
 
 #. module: hr_payroll
 #: field:hr.payslip,igross:0
 #: field:hr.payslip,inet:0
 msgid "Calculaton Field"
-msgstr ""
+msgstr "Campo de cálculo"
 
 #. module: hr_payroll
 #: help:hr.payroll.advice,bank_id:0
@@ -188,98 +201,108 @@ msgstr ""
 #: view:hr.payroll.advice:0
 #: field:hr.payroll.advice.line,advice_id:0
 msgid "Bank Advice"
-msgstr ""
+msgstr "Aviso bancario"
 
 #. module: hr_payroll
 #: selection:hr.payroll.advice,state:0
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Reject"
-msgstr ""
+msgstr "Rechazar"
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Leaves"
-msgstr ""
+msgstr "Ausencias"
 
 #. module: hr_payroll
+#: field:hr.contibution.register.line,register_id:0
+#: view:hr.payslip:0
 #: field:hr.payslip,register_id:0
+#: report:payslip.pdf:0
 msgid "Register"
-msgstr ""
+msgstr "Registro"
 
 #. module: hr_payroll
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"¡Error! No puede seleccionar un departamento que tenga el empleado como "
+"responsable."
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Total Deductions"
-msgstr ""
+msgstr "Total de Deducciones"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,value:0
+#: field:company.contribution.line,value:0
+#: field:hr.payslip.line.line,value:0
 msgid "Value"
-msgstr ""
+msgstr "Valor"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Name of the Employee"
-msgstr ""
+msgstr "Nombre del empleado"
 
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Register Lines"
-msgstr ""
+msgstr "Líneas de registro"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Salary Computation"
-msgstr ""
+msgstr "Cálculo de la nómina"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,amount:0
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
+#: report:salary.structure:0
 msgid "Amount"
-msgstr ""
+msgstr "Monto"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:1225
 #, python-format
 msgid "Please check configuration of %s, payroll head is missing"
 msgstr ""
+"Por favor, compruebe la configuración de %s, falta la cabecera de la nómina"
 
 #. module: hr_payroll
 #: selection:company.contribution,amount_type:0
 msgid "Percentage"
-msgstr ""
+msgstr "Porcentaje"
 
 #. module: hr_payroll
 #: view:company.contribution:0
 #: view:hr.allounce.deduction.categoty:0
 msgid "Other Information"
-msgstr ""
+msgstr "Otra Información"
 
 #. module: hr_payroll
 #: field:hr.passport,country_id:0
 msgid "Country of Issue"
-msgstr ""
+msgstr "País de emisión"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,emp_deduction:0
 msgid "Employee Deduction"
-msgstr ""
+msgstr "Deducción del Empleado"
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Other Deduction"
-msgstr ""
+msgstr "Otras deducciones"
 
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
 msgid "Paid Holiday"
-msgstr ""
+msgstr "Vacaciones pagada"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -287,77 +310,80 @@ msgstr ""
 #: view:hr.passport:0
 #: view:hr.payslip:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agroupar por ..."
 
 #. module: hr_payroll
 #: field:hr.passport,date_expire:0
 msgid "Passport Expire Date"
-msgstr ""
+msgstr "Fecha de Expiración de Pasaporte"
 
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
 msgid "Un-Paid Holiday"
-msgstr ""
+msgstr "Vacaciones no pagadas"
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Valid From"
-msgstr ""
+msgstr "Válido desde"
 
 #. module: hr_payroll
 #: help:hr.payslip,igross:0
 #: help:hr.payslip,inet:0
 msgid ""
 "Calculation field used for internal calculation, do not place this on form"
-msgstr ""
+msgstr "Campo usado en cálculos internos, no lo coloque en un formulario."
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Amount (in words) :"
-msgstr ""
+msgstr "Monto (en letras) :"
 
 #. module: hr_payroll
 #: field:hr.holidays.status,type:0
 msgid "Payment"
-msgstr ""
+msgstr "Pago"
 
 #. module: hr_payroll
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
 #: field:hr.payslip,line_ids:0
 #: view:hr.payslip.line:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip_line
 msgid "Payslip Line"
-msgstr ""
+msgstr "Línea de nómina"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Identification No"
-msgstr ""
+msgstr "Nº identificación"
 
 #. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
 #: field:hr.allounce.deduction.categoty,base:0
 msgid "Based on"
-msgstr ""
+msgstr "Basado en"
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Wating for Verification"
-msgstr ""
+msgstr "Esperando verificación"
 
 #. module: hr_payroll
 #: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
 msgid "Human Resource Payroll"
-msgstr ""
+msgstr "Nóminas de recursos humanos"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "Total:"
-msgstr ""
+msgstr "Total:"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Posted"
-msgstr ""
+msgstr "Asentado"
 
 #. module: hr_payroll
 #: model:ir.module.module,description:hr_payroll.module_meta_information
@@ -373,95 +399,110 @@ msgid ""
 "    * Integrated with Holiday Management\n"
 "    "
 msgstr ""
+"Sistema de nóminas genérico\n"
+"    * Detalles de empleado\n"
+"    * Contratos de empleado\n"
+"    * Contratos basados en pasaportes\n"
+"    * Complementos/deducciones\n"
+"    * Permite configurar salario base/bruto/neto\n"
+"    * Nómina de empleado\n"
+"    * Registro mensual de nóminas\n"
+"    * Integrado con la gestión de vacaciones\n"
+"    "
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_holidays_status
 msgid "Leave Type"
-msgstr ""
+msgstr "Tipo de ausencia"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Date :"
-msgstr ""
+msgstr "Fecha:"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,total:0
 msgid "Sub Total"
-msgstr ""
+msgstr "Sub Total"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Payments -"
-msgstr ""
+msgstr "Pagos -"
 
 #. module: hr_payroll
 #: field:hr.contract,visa_no:0
 msgid "Visa No"
-msgstr ""
+msgstr "Número de Visa"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,from:0
+#: field:company.contribution.line,from_val:0
+#: report:employees.salary:0
+#: field:hr.payslip.line.line,from_val:0
+#: report:year.salary:0
 msgid "From"
-msgstr ""
+msgstr "De"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
+#: report:payroll.advice:0
 msgid "By Salary"
-msgstr ""
+msgstr "Por salario"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: field:hr.payroll.employees.detail,date_to:0
+#: field:hr.payroll.year.salary,date_to:0
+#: report:salary.structure:0
 msgid "End Date"
-msgstr ""
+msgstr "Fecha Final"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
 msgid "Employee PaySlip"
-msgstr ""
+msgstr "Rol de Pagos de Empleado"
 
 #. module: hr_payroll
 #: field:hr.payslip,leaves:0
 msgid "Leave Deductions"
-msgstr ""
+msgstr "Deducciones por Ausencia"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-#: rml:payroll.advice:0
+#: report:hr.payroll.register.sheet:0
+#: report:payroll.advice:0
 msgid "Authorised Signature"
-msgstr ""
+msgstr "Firma autorizada"
 
 #. module: hr_payroll
 #: selection:hr.payslip.line,amount_type:0
 msgid "Function Value"
-msgstr ""
+msgstr "Valor de función"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
 msgid "Contribution Register Line"
-msgstr ""
+msgstr "Línea de registro de contribución"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Notes:"
-msgstr ""
+msgstr "Notas:"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,based_on:0
 #: field:hr.payroll.advice,state:0
 #: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Paymeny Lines"
-msgstr ""
+msgstr "Líneas de Pago"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Other Lines"
-msgstr ""
+msgstr "Otras Líneas"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -470,120 +511,129 @@ msgstr ""
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
 msgid "Function Arguments"
-msgstr ""
+msgstr "Argumentos de la función"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
 msgid "Company Contributions"
-msgstr ""
+msgstr "Contribuciones de la compañía"
 
 #. module: hr_payroll
+#: field:hr.contibution.register.line,employee_id:0
 #: field:hr.passport,employee_id:0
 #: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
+#: model:ir.model,name:hr_payroll.model_hr_employee
 msgid "Employee"
-msgstr ""
+msgstr "Empleado(a)"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,base:0
 msgid "Formula"
-msgstr ""
+msgstr "Fórmula"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
 msgid "Bank Advice Lines"
-msgstr ""
+msgstr "Líneas de notificación bancaria"
 
 #. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
 #: field:hr.allounce.deduction.categoty,type:0
 #: field:hr.payslip.line,type:0
-#: wizard_field:payroll.analysis,init,type:0
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Email"
-msgstr ""
+msgstr "Correo electrónico"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 msgid "#"
-msgstr ""
+msgstr "Nº"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:469
 #: code:addons/hr_payroll/hr_payroll.py:1225
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Verify Sheet"
-msgstr ""
+msgstr "Comprobar Hoja"
 
 #. module: hr_payroll
 #: help:hr.contract,working_days_per_week:0
 msgid "No of Working days / week for an employee"
-msgstr ""
+msgstr "Número de días/semanas trabajados por un empleado."
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "New Slip"
-msgstr ""
+msgstr "Nuevo Justificante"
 
 #. module: hr_payroll
 #: field:hr.payslip,basic:0
 msgid "Net Basic"
-msgstr ""
+msgstr "Base neta"
 
 #. module: hr_payroll
+#: field:hr.contract,gross:0
+#: field:hr.employee,gross:0
 #: field:hr.payroll.register,grows:0
 #: field:hr.payslip,grows:0
+#: report:salary.structure:0
 msgid "Gross Salary"
-msgstr ""
+msgstr "Salario bruto"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Total Earnings"
-msgstr ""
+msgstr "Ingresos totales"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
 msgid "Employee Salary Statement"
-msgstr ""
+msgstr "Declaración salario del empleado"
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Other Payment"
-msgstr ""
+msgstr "Otros pagos"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: field:hr.employee,advantages_net:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Deductions"
-msgstr ""
+msgstr "Deducciones"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "C/D"
-msgstr ""
+msgstr "C/D"
 
 #. module: hr_payroll
 #: field:hr.contract,permit_no:0
 msgid "Work Permit No"
-msgstr ""
+msgstr "Nº Permiso de Trabajo"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,line_ids:0
 msgid "Employee Salary"
-msgstr ""
+msgstr "Salario del Empleado"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,chaque_nos:0
@@ -593,18 +643,24 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.contibution.register,monthly_total_by_emp:0
 msgid "Total By Employee"
-msgstr ""
+msgstr "Total por empleado"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: view:company.contribution:0
+#: selection:company.contribution,amount_type:0
+#: selection:company.contribution.line,amount_type:0
 #: selection:hr.payslip.line,amount_type:0
+#: selection:hr.payslip.line.line,amount_type:0
 msgid "Fixed Amount"
-msgstr ""
+msgstr "Importe fijo"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,to:0
+#: field:company.contribution.line,to_val:0
+#: report:employees.salary:0
+#: field:hr.payslip.line.line,to_val:0
+#: report:year.salary:0
 msgid "To"
-msgstr ""
+msgstr "Para"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:180
@@ -616,43 +672,43 @@ msgstr ""
 #: code:addons/hr_payroll/hr_payroll.py:1410
 #, python-format
 msgid "Variable Error !"
-msgstr ""
+msgstr "¡Error de variable!"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
 msgid "hr.payroll.employees.detail"
-msgstr ""
+msgstr "hr.payroll.employees.detail"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Pay Salary"
-msgstr ""
+msgstr "Pagar Nómina"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,name:0
 msgid "Bank Account A/C"
-msgstr ""
+msgstr "Cuenta bancaria"
 
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Contribution Lines"
-msgstr ""
+msgstr "Líneas de contribución"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-#: rml:payslip.pdf:0
+#: report:hr.payroll.register.sheet:0
 msgid "For the month of"
-msgstr ""
+msgstr "Para el mes de"
 
 #. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
 #: selection:hr.allounce.deduction.categoty,type:0
 #: field:hr.payroll.register,deduction:0
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 #: field:hr.payslip,deduction:0
 #: selection:hr.payslip.line,type:0
 msgid "Deduction"
-msgstr ""
+msgstr "Deducción"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_advice
@@ -663,55 +719,55 @@ msgstr ""
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
-msgstr ""
+msgstr "Nómina"
 
 #. module: hr_payroll
 #: constraint:hr.contract:0
 msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
+"¡Error! La fecha de inicio de contrato debe ser anterior a la fecha de "
+"finalización."
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Loan Installment"
-msgstr ""
+msgstr "Entrega anticipo"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
-#: view:hr.payslip:0
 msgid "Complete HR Checking"
-msgstr ""
+msgstr "Comprobación RH completa"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Yours Sincerely"
-msgstr ""
+msgstr "Atentamente"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "SI. No."
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Net Amount"
-msgstr ""
+msgstr "Importe neto"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Salary Structure:"
-msgstr ""
+msgstr "Estructura salarial:"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-#: model:ir.actions.wizard,name:hr_payroll.wizard_print_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_employees_detail
 msgid "Employees Salary Detail"
-msgstr ""
+msgstr "Detalle del salario del empleado"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
 msgid "Function Line"
-msgstr ""
+msgstr "Línea de función"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
@@ -719,62 +775,64 @@ msgstr ""
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Confirm Sheet"
-msgstr ""
+msgstr "Hoja de confirmación"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Others:"
-msgstr ""
+msgstr "Otros:"
 
 #. module: hr_payroll
 #: view:company.contribution:0
 #: selection:company.contribution,amount_type:0
 msgid "Function Calculation"
-msgstr ""
+msgstr "Función de cálculo"
 
 #. module: hr_payroll
 #: field:hr.payslip,worked_days:0
+#: report:payslip.pdf:0
 msgid "Worked Day"
-msgstr ""
+msgstr "Días trabajados"
 
 #. module: hr_payroll
 #: field:hr.contibution.register,monthly_total_by_comp:0
 msgid "Total By Company"
-msgstr ""
+msgstr "Total por compañía"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,flag:0
 msgid "D/C"
-msgstr ""
+msgstr "D/C"
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Country & Address"
-msgstr ""
+msgstr "País y Dirección"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Employee Code"
-msgstr ""
+msgstr "Código de empleado"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Basic Salary – Leaves"
-msgstr ""
+msgstr "Salario base - Ausencias"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,amount_type:0
+#: field:company.contribution,amount_type:0
+#: field:company.contribution.line,amount_type:0
 #: field:hr.payslip.line,amount_type:0
-#: rml:salary.structure:0
+#: field:hr.payslip.line.line,amount_type:0
+#: report:salary.structure:0
 msgid "Amount Type"
-msgstr ""
+msgstr "Tipo de importe"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,category_id:0
+#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
-#: rml:salary.structure:0
 msgid "Category"
-msgstr ""
+msgstr "Categoría"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -782,63 +840,60 @@ msgstr ""
 #: field:hr.payslip.line,company_contrib:0
 #: model:ir.model,name:hr_payroll.model_company_contribution
 msgid "Company Contribution"
-msgstr ""
+msgstr "Contribución compañía"
 
 #. module: hr_payroll
 #: field:company.contribution,category_id:0
 msgid "Heads"
-msgstr ""
+msgstr "Cabeceras"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
 msgid "Print Statement"
-msgstr ""
+msgstr "Imprimir declaración"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Earnings"
-msgstr ""
+msgstr "Ingresos"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
 msgid "Basic"
-msgstr ""
+msgstr "Básico"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_passport_tree
 msgid "All Passports"
-msgstr ""
+msgstr "Todos los pasaportes"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
 #: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
 msgid "Salary Register"
-msgstr ""
+msgstr "Registro Salarial"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:hr.payroll.register.sheet:0
-#: rml:payslip.pdf:0
+#: report:employees.salary:0
+#: report:hr.payroll.register.sheet:0
 msgid "Employee Name"
-msgstr ""
+msgstr "Nombre del empleado"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_passport
 msgid "Passport Detail"
-msgstr ""
+msgstr "Detalle del Pasaporte"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty.line,amount_type:0
 #: selection:hr.payslip.line,amount_type:0
 msgid "Percentage (%)"
-msgstr ""
+msgstr "Porcentaje (%)"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,register_id:0
@@ -847,87 +902,82 @@ msgstr ""
 #: model:ir.model,name:hr_payroll.model_hr_payroll_register
 #: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
 msgid "Payroll Register"
-msgstr ""
+msgstr "Registro de nómina"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:hr.payroll.register.sheet:0
-#: rml:payroll.advice:0
-#: rml:salary.structure:0
-#: rml:year.salary:0
+#: report:hr.payroll.register.sheet:0
+#: report:payroll.advice:0
 msgid "For"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
 #: field:hr.passport,contracts_ids:0
 msgid "Contracts"
-msgstr ""
+msgstr "Contratos"
 
 #. module: hr_payroll
-#: view:hr.employee.grade:0
+#: view:hr.payroll.structure:0
 msgid "Employee Function"
-msgstr ""
+msgstr "Función del empleado"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Paid"
-msgstr ""
+msgstr "Pagado"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Approve Sheet"
-msgstr ""
+msgstr "Aprobar hoja"
 
 #. module: hr_payroll
 #: field:hr.payslip,paid:0
 msgid "Paid ? "
-msgstr ""
+msgstr "¿Pagado? "
 
 #. module: hr_payroll
 #: view:hr.holidays.status:0
 msgid "Validation"
-msgstr ""
+msgstr "Validación"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Title"
-msgstr ""
+msgstr "Tratamiento:"
 
 #. module: hr_payroll
 #: view:company.contribution:0
 msgid "Search Company Contribution"
-msgstr ""
+msgstr "Buscar contribución de la compañía"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuario"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
-#: view:hr.payslip:0
-#: field:hr.payslip,move_payment_ids:0
 msgid "Payment Lines"
-msgstr ""
+msgstr "Líneas de pago"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Compute Sheet"
-msgstr ""
+msgstr "Calcular hoja"
 
 #. module: hr_payroll
+#: field:company.contribution,active:0
 #: field:hr.payroll.register,active:0
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #. module: hr_payroll
 #: help:hr.allounce.deduction.categoty,condition:0
 msgid "Applied this head for calculation if condition is true"
-msgstr ""
+msgstr "Aplicar este encabezado en el cálculo si la condición es verdadera"
 
 #. module: hr_payroll
-#: rml:year.salary:0
+#: report:year.salary:0
 msgid "Yearly Salary Details"
 msgstr ""
 
@@ -958,22 +1008,23 @@ msgid "Compute"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 #: field:hr.payslip,deg_id:0
-#: rml:payslip.pdf:0
-#: rml:salary.structure:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Designation"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 msgid "HR Manager"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.contract,basic:0
+#: field:hr.employee,basic:0
 #: field:hr.payslip,basic_before_leaves:0
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Basic Salary"
 msgstr ""
 
@@ -999,12 +1050,13 @@ msgid "Companies"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
+#: field:hr.payslip,contract_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr ""
 
@@ -1014,14 +1066,14 @@ msgid "Draft Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:wizard.year.salary,init,salary_on:0
+#: selection:hr.payroll.year.salary,salary_on:0
 msgid "Next Month Date"
 msgstr ""
 
 #. module: hr_payroll
+#: field:hr.contibution.register.line,date:0
 #: field:hr.payroll.advice,date:0
 #: field:hr.payroll.register,date:0
-#: rml:hr.payroll.register.sheet:0
 #: field:hr.payslip,date:0
 msgid "Date"
 msgstr ""
@@ -1037,8 +1089,8 @@ msgid "Search Passport"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
+#: report:employees.salary:0
+#: report:salary.structure:0
 msgid "Phone No."
 msgstr ""
 
@@ -1070,16 +1122,19 @@ msgid "Other No."
 msgstr ""
 
 #. module: hr_payroll
+#: field:company.contribution,code:0
+#: field:hr.contibution.register.line,code:0
 #: field:hr.holidays.status,code:0
+#: field:hr.payroll.structure,code:0
 #: field:hr.payslip.line,code:0
-#: rml:salary.structure:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Code"
 msgstr ""
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
 #: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-#: rml:payroll.advice:0
 msgid "Payment Advice"
 msgstr ""
 
@@ -1102,24 +1157,28 @@ msgid "Computation Overview"
 msgstr ""
 
 #. module: hr_payroll
-#: wizard_field:wizard.year.salary,init,salary_on:0
+#: field:hr.payroll.year.salary,salary_on:0
 msgid "Salary On"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,number:0
 #: field:hr.payroll.register,number:0
-#: rml:hr.payroll.register.sheet:0
 #: field:hr.payslip,number:0
 msgid "Number"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
+#: field:hr.contract,struct_id:0
 #: field:hr.employee,line_ids:0
-#: view:hr.employee.grade:0
-#: field:hr.employee.grade,line_ids:0
-#: rml:salary.structure:0
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
+#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
+#: model:ir.model,name:hr_payroll.model_hr_payroll_structure
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr ""
 
@@ -1131,9 +1190,6 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
-#: wizard_button:payroll.analysis,init,end:0
-#: wizard_button:wizard.employees.detail,init,end:0
-#: wizard_button:wizard.year.salary,init,end:0
 msgid "Cancel"
 msgstr ""
 
@@ -1145,34 +1201,33 @@ msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip.line,amount:0
-#: rml:salary.structure:0
 msgid "Amount / Percentage"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: field:hr.employee,advantages_gross:0
+#: report:hr.payroll.register.sheet:0
+#: report:salary.structure:0
 msgid "Allowances"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:wizard.year.salary,init,salary_on:0
+#: selection:hr.payroll.year.salary,salary_on:0
 msgid "Current Month Date"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Salary"
 msgstr ""
 
 #. module: hr_payroll
+#: field:hr.contract,passport_id:0
 #: field:hr.passport,name:0
 msgid "Passport No"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.employee,passport_id:0
 #: view:hr.passport:0
 msgid "Passport"
 msgstr ""
@@ -1183,12 +1238,11 @@ msgid "Total Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "for period"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.expense.expense,category_id:0
 #: field:hr.holidays.status,head_id:0
 msgid "Payroll Head"
 msgstr ""
@@ -1202,7 +1256,7 @@ msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "E-mail"
 msgstr ""
 
@@ -1220,8 +1274,11 @@ msgid "Print Report"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,line_ids:0
+#: field:company.contribution,line_ids:0
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr ""
 
@@ -1259,7 +1316,11 @@ msgid "Basic Salary without Leave:"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee.grade,function_id:0
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
 #: field:hr.payslip.line,function_id:0
 msgid "Function"
 msgstr ""
@@ -1270,7 +1331,7 @@ msgid "States"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Dear Sir/Madam,"
 msgstr ""
 
@@ -1285,12 +1346,29 @@ msgid "Gross Sal."
 msgstr ""
 
 #. module: hr_payroll
+#: view:company.contribution:0
+#: field:company.contribution,note:0
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.allounce.deduction.categoty,note:0
+#: view:hr.contibution.register:0
+#: field:hr.contibution.register,note:0
+#: view:hr.passport:0
+#: field:hr.passport,note:0
 #: field:hr.payroll.advice,note:0
+#: field:hr.payroll.register,note:0
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,note:0
+#: view:hr.payslip:0
+#: field:hr.payslip,note:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,note:0
 msgid "Description"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: field:hr.payroll.employees.detail,date_from:0
+#: field:hr.payroll.year.salary,date_from:0
+#: report:salary.structure:0
 msgid "Start Date"
 msgstr ""
 
@@ -1312,6 +1390,7 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll
+#: model:ir.ui.menu,name:hr_payroll.payroll_configure
 msgid "Payroll"
 msgstr ""
 
@@ -1341,9 +1420,10 @@ msgid "hr.payroll.year.salary"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:payslip.pdf:0
-#: rml:salary.structure:0
+#: report:employees.salary:0
+#: field:hr.passport,address_id:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Address"
 msgstr ""
 
@@ -1358,8 +1438,10 @@ msgid "Number of Leaves"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
+#: report:employees.salary:0
+#: field:hr.payroll.advice,bank_id:0
+#: field:hr.payroll.register,bank_id:0
+#: report:salary.structure:0
 msgid "Bank"
 msgstr ""
 
@@ -1369,28 +1451,35 @@ msgid "Cancel Sheet"
 msgstr ""
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Advance"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Special Allowances and Deductions For Employee:"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,name:0
+#: field:company.contribution,name:0
+#: field:company.contribution.line,name:0
+#: field:hr.contibution.register,name:0
+#: field:hr.contibution.register.line,name:0
 #: field:hr.payroll.advice,name:0
 #: field:hr.payroll.register,name:0
+#: field:hr.payroll.structure,name:0
 #: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: rml:salary.structure:0
-#: rml:year.salary:0
+#: field:hr.payslip.line.line,name:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+#: report:year.salary:0
 msgid "Name"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
+#: report:payslip.pdf:0
 msgid "Leaved Deduction"
 msgstr ""
 
@@ -1400,14 +1489,17 @@ msgid "Country"
 msgstr ""
 
 #. module: hr_payroll
-#: wizard_field:wizard.employees.detail,init,employee_ids:0
-#: wizard_field:wizard.year.salary,init,employee_ids:0
+#: view:hr.passport:0
+#: view:hr.payroll.employees.detail:0
+#: field:hr.payroll.employees.detail,employee_ids:0
+#: view:hr.payroll.year.salary:0
+#: field:hr.payroll.year.salary,employee_ids:0
+#: view:hr.payslip:0
 msgid "Employees"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,property_bank_account:0
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Bank Account"
 msgstr ""
 
@@ -1459,6 +1551,7 @@ msgid "Passport Issue Date"
 msgstr ""
 
 #. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
 #: selection:hr.allounce.deduction.categoty,type:0
 #: field:hr.payroll.register,allounce:0
 #: field:hr.payslip,allounce:0
@@ -1477,7 +1570,7 @@ msgid "Other Id"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Bank Details"
 msgstr ""
 
@@ -1487,7 +1580,10 @@ msgid "Slip ID"
 msgstr ""
 
 #. module: hr_payroll
+#: field:company.contribution.line,sequence:0
 #: field:hr.allounce.deduction.categoty,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.line.line,sequence:0
 msgid "Sequence"
 msgstr ""
 
@@ -1503,8 +1599,8 @@ msgid "Letter Content"
 msgstr ""
 
 #. module: hr_payroll
-#: wizard_view:wizard.employees.detail,init:0
-#: wizard_view:wizard.year.salary,init:0
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
 msgid "Year Salary"
 msgstr ""
 
@@ -1524,9 +1620,9 @@ msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:payroll.advice:0
-#: rml:year.salary:0
+#: report:employees.salary:0
+#: field:hr.contibution.register.line,total:0
+#: report:year.salary:0
 msgid "Total"
 msgstr ""
 
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 416aeb485ef..7d069bdf346 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -60,7 +60,6 @@ class hr_employee(osv.osv):
             type='many2one',
             relation='account.account',
             string="Bank Account",
-            method=True,
             domain="[('type', '=', 'liquidity')]",
             view_load=True,
             help="Select Bank Account from where Salary Expense will be Paid, to be used for payslip verification."),
@@ -69,7 +68,6 @@ class hr_employee(osv.osv):
             type='many2one',
             relation='account.account',
             string="Salary Account",
-            method=True,
             domain="[('type', '=', 'other')]",
             view_load=True,
             help="Expense account when Salary Expense will be recorded"),
@@ -78,7 +76,6 @@ class hr_employee(osv.osv):
             type='many2one',
             relation='account.account',
             string="Employee Account",
-            method=True,
             domain="[('type', '=', 'other')]",
             view_load=True,
             help="Employee Payable Account"),
@@ -87,7 +84,6 @@ class hr_employee(osv.osv):
             type='many2one',
             relation='account.analytic.account',
             string="Analytic Account",
-            method=True,
             view_load=True,
             help="Analytic Account for Salary Analysis"),
     }
@@ -180,8 +176,8 @@ class contrib_register(osv.osv):
     _columns = {
         'account_id': fields.many2one('account.account', 'Account'),
         'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account'),
-        'yearly_total_by_emp': fields.function(_total_contrib, method=True, multi='dc', store=True, string='Total By Employee', digits=(16, 4)),
-        'yearly_total_by_comp': fields.function(_total_contrib, method=True, multi='dc', store=True,  string='Total By Company', digits=(16, 4)),
+        'yearly_total_by_emp': fields.function(_total_contrib, multi='dc', store=True, string='Total By Employee', digits=(16, 4)),
+        'yearly_total_by_comp': fields.function(_total_contrib, multi='dc', store=True,  string='Total By Company', digits=(16, 4)),
     }
 contrib_register()
 
diff --git a/addons/hr_payroll_account/i18n/ru.po b/addons/hr_payroll_account/i18n/ru.po
new file mode 100644
index 00000000000..0bbd09433aa
--- /dev/null
+++ b/addons/hr_payroll_account/i18n/ru.po
@@ -0,0 +1,333 @@
+# Russian 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-06-12 22:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian <ru@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-06-13 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\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 "Банковский журнал"
+
+#. 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 "Аналитический счет для анализа заработной платы"
+
+#. 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 "Период"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_employee
+msgid "Employee"
+msgstr "Сотрудник"
+
+#. 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 "Описание"
+
+#. 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 "Позиции платежа"
+
+#. 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 "Расчетный листок"
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Ошибка! Структура подчинения не может быть рекурсивной."
+
+#. 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 "Учётная запись"
+
+#. module: hr_payroll_account
+#: field:hr.employee,property_bank_account:0
+msgid "Bank Account"
+msgstr "Банковский счет"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,name:0
+msgid "Name"
+msgstr "Название"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Строка расчетного листка"
+
+#. 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 "Warning !"
+
+#. 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 "Базовый счёт"
+
+#. 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 "Последовательность"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,period_id:0
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr "Установить период"
+
+#. 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 "Счёт аналитики"
+
+#. 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 "Год"
+
+#. 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 ""
diff --git a/addons/hr_payroll_account/i18n/zh_CN.po b/addons/hr_payroll_account/i18n/zh_CN.po
new file mode 100644
index 00000000000..d44c5ae8a83
--- /dev/null
+++ b/addons/hr_payroll_account/i18n/zh_CN.po
@@ -0,0 +1,344 @@
+# Chinese (Simplified) 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-06-27 13:51+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 13168)\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 "银行日记帐"
+
+#. 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 "薪酬分析的辅助核算项"
+
+#. 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 "期间"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_employee
+msgid "Employee"
+msgstr "员工"
+
+#. 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 "描述"
+
+#. 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 "付款明细"
+
+#. 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 "工资表"
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "错误！您不能创建递归的员工等级。"
+
+#. 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 "科目"
+
+#. module: hr_payroll_account
+#: field:hr.employee,property_bank_account:0
+msgid "Bank Account"
+msgstr "银行帐户"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,name:0
+msgid "Name"
+msgstr "名称"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "工资表明细"
+
+#. 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 "警告！"
+
+#. 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 "一般科目"
+
+#. 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 "序列"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,period_id:0
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr "强制会计期间"
+
+#. 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 "这薪酬日期  %s 财务年度没定义"
+
+#. 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 "辅助核算项"
+
+#. 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 "年"
+
+#. 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 "这薪酬日期  %s 会计期间没定义。"
+
+#. 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 ""
+
+#~ msgid ""
+#~ "Generic Payroll system Integrated with Accountings\n"
+#~ "    * Expense Encoding\n"
+#~ "    * Payment Encoding\n"
+#~ "    * Company Contribution Management\n"
+#~ "    "
+#~ msgstr ""
+#~ "通用工资系统整合会计\n"
+#~ "    * 费用编码\n"
+#~ "    * 付款编码\n"
+#~ "    * 公司捐款管理\n"
+#~ "    "
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index c7f97cf3075..18c5b034624 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -47,6 +47,7 @@ system to store and search in your CV base.
         'security/ir.model.access.csv',
         'report/hr_recruitment_report_view.xml',
         'board_hr_recruitment_statistical_view.xml',
+        'hr_recruitment_installer_view.xml'
      ],
     'init_xml': [
         'hr_recruitment_data.xml'
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index bc7489a0c4f..5e738fc6f48 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -157,9 +157,9 @@ class hr_applicant(crm.crm_case, osv.osv):
         'response': fields.integer("Response"),
         'reference': fields.char('Reference', size=128),
         'day_open': fields.function(_compute_day, string='Days to Open', \
-                                method=True, multi='day_open', type="float", store=True),
+                                multi='day_open', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
-                                method=True, multi='day_close', type="float", store=True),
+                                multi='day_close', type="float", store=True),
     }
 
     def _get_stage(self, cr, uid, context=None):
@@ -308,7 +308,7 @@ class hr_applicant(crm.crm_case, osv.osv):
         mailgate_pool = self.pool.get('email.server.tools')
         attach_obj = self.pool.get('ir.attachment')
 
-        subject = msg.get('subject')
+        subject = msg.get('subject') or _("No Subject")
         body = msg.get('body')
         msg_from = msg.get('from')
         priority = msg.get('priority')
diff --git a/addons/hr_recruitment/hr_recruitment_installer_view.xml b/addons/hr_recruitment/hr_recruitment_installer_view.xml
new file mode 100644
index 00000000000..d1614117826
--- /dev/null
+++ b/addons/hr_recruitment/hr_recruitment_installer_view.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+ <record model="ir.actions.act_window" id="hr_recruitment_stage_form_installer">
+           <field name="name">Review Recruitment Stages</field>
+           <field name="type">ir.actions.act_window</field>
+           <field name="res_model">hr.recruitment.stage</field>
+           <field name="view_type">form</field>
+           <field name="view_mode">tree,form</field>
+           <field name="help">Check if the following stages are matching your recruitment process. Don't forget to specify the department if your recruitment process is different according to the job position.</field>
+           <field name="view_id" ref="hr_recruitment.hr_recruitment_stage_tree"/>
+       </record>
+
+       <record id="hr_recruitment_stage_form_todo" model="ir.actions.todo">
+           <field name="action_id" ref="hr_recruitment_stage_form_installer"/>
+           <field name="category_id" ref="hr.category_hr_management_config"/>
+           <field name="sequence">3</field>
+           <field name="type">normal</field>
+           <field name="state">skip</field>
+       </record>
+    </data>
+</openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 2d11116bf32..28c69394e96 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -346,6 +346,7 @@
         <field name="res_model">hr.recruitment.stage</field>
         <field name="view_type">form</field>
         <field name="view_id" ref="hr_recruitment_stage_tree"/>
+        <field name="help"> Check if the following stages are matching your recruitment process. Don't forget to specify the department if your recruitment process is different according to the job position.</field>
     </record>
 
     <menuitem
diff --git a/addons/hr_recruitment/i18n/vi.po b/addons/hr_recruitment/i18n/vi.po
new file mode 100644
index 00000000000..4f7b6dc5bd8
--- /dev/null
+++ b/addons/hr_recruitment/i18n/vi.po
@@ -0,0 +1,957 @@
+# Vietnamese 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-05-30 01:31+0000\n"
+"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
+"Language-Team: Vietnamese <vi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-05-31 04:47+0000\n"
+"X-Generator: Launchpad (build 12959)\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 "Các yêu cầu"
+
+#. 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 ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Group By..."
+msgstr "Nhóm theo..."
+
+#. 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 "Phòng ban"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_action:0
+msgid "Next Action Date"
+msgstr "Ngày Hành động Kế tiếp"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Jobs"
+msgstr "Các công việc"
+
+#. module: hr_recruitment
+#: field:hr.applicant,company_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,company_id:0
+msgid "Company"
+msgstr "Công ty"
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.partner.create,close:0
+msgid "Close job request"
+msgstr "Đóng yêu cầu công việc"
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,note:0
+msgid "Goals"
+msgstr "Mục tiêu"
+
+#. 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 "Tạo Đối tác"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,day:0
+msgid "Day"
+msgstr "Ngày"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contract Data"
+msgstr "Dữ liệu Hợp đồng"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Add Internal Note"
+msgstr "Thêm Ghi chú Nội bộ"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_mobile:0
+msgid "Mobile"
+msgstr "Di động"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Notes"
+msgstr "Các ghi chú"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_ids:0
+msgid "Messages"
+msgstr "Các thông điệp"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next Actions"
+msgstr "Các Hành động Kế tiếp"
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job2
+msgid "Junior Developer"
+msgstr ""
+
+#. 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 "Nhu cầu Công việc Ban đầu"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Thông tin liên hệ đối tác"
+
+#. module: hr_recruitment
+#: field:hr.applicant,reference:0
+msgid "Reference"
+msgstr "Tham chiếu"
+
+#. 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 "Hành động Kế tiếp"
+
+#. module: hr_recruitment
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment
+msgid "Recruitment"
+msgstr "Tuyển dụng"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop:0
+msgid "Salary Proposed"
+msgstr "Mức lương Đề nghị"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Đối tác"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Avg Proposed Salary"
+msgstr "Mức lương Đề nghị Trung bình"
+
+#. 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 "Trước"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:107
+#: view:hr.applicant:0
+#, python-format
+msgid "Phone Call"
+msgstr "Cuộc gọi"
+
+#. 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 "Thống kê Tuyển dụng"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next"
+msgstr "Tiếp theo"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_job
+msgid "Job Description"
+msgstr "Mô tả công việc"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Send New Email"
+msgstr "Gửi thư điện tử mới"
+
+#. 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 "Mới"
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_from:0
+msgid "Email"
+msgstr "Thư điện tử"
+
+#. 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 "Tốt"
+
+#. 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 "Lỗi !"
+
+#. 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 "Ngày tạo"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,deadline:0
+msgid "Planned Date"
+msgstr "Ngày dự kiến"
+
+#. 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 "Công việc"
+
+#. 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 "Phỏng vấn lần hai"
+
+#. 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 "Mức lương mong đợi"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "July"
+msgstr "Tháng Bảy"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Subject"
+msgstr "Chủ đề"
+
+#. 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 "Các ứng viên"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History Information"
+msgstr "Thông tin lịch sử"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Dates"
+msgstr "Ngày"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "    Month-1    "
+msgstr "    Tháng-1    "
+
+#. 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 "Ứng viên"
+
+#. 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 "Liên hệ"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Qualification"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "March"
+msgstr "Tháng Ba"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
+msgid "Stage of Recruitment"
+msgstr "Giai đoạn Tuyển dụng"
+
+#. 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 "Các giai đoạn"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "In progress"
+msgstr "Đang tiến hành"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Jobs - Recruitment Form"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,probability:0
+msgid "Probability"
+msgstr "Xác suất"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "September"
+msgstr "Tháng Chín"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "December"
+msgstr "Tháng Mười Hai"
+
+#. module: hr_recruitment
+#: model:ir.module.module,shortdesc:hr_recruitment.module_meta_information
+msgid "HR - Recruitement"
+msgstr "Nhân sự - Tuyển dụng"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job Info"
+msgstr "Thông tin Công việc"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Phỏng vấn lần một"
+
+#. module: hr_recruitment
+#: field:hr.applicant,write_date:0
+msgid "Update Date"
+msgstr "Ngày cập nhật"
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_proposed:0
+#: view:hr.recruitment.report:0
+msgid "Proposed Salary"
+msgstr "Mức lương đề nghị"
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job1
+msgid "Salesman"
+msgstr "Nhân viên bán hàng"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Tìm kiếm Các công việc"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,category_id:0
+msgid "Category"
+msgstr "Phân loại"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_name:0
+msgid "Applicant's Name"
+msgstr "Tên Ứng viên"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Very Good"
+msgstr "Rất Tốt"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "# Cases"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_open:0
+msgid "Opened"
+msgstr "Đã mở"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Group By ..."
+msgstr "Nhóm theo ..."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+msgid "In Progress"
+msgstr "Đang thực hiện"
+
+#. 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 "Mức lương Ứng viên mong đợi"
+
+#. 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 "Đã được đóng"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+msgid "Stage Definition"
+msgstr "Định nghĩa Giai đoạn"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Answer"
+msgstr "Trả lời"
+
+#. 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 "Mức lương Tổ chức đề nghị"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Meeting"
+msgstr "Cuộc gặp"
+
+#. 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 "Đang chờ"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Status"
+msgstr "Tình trạng"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Communication & History"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Tháng Tám"
+
+#. 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 "Bằng Cấp"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Điện thoại"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Global CC"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "October"
+msgstr "Tháng Mười"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "June"
+msgstr "Tháng Sáu"
+
+#. 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 "Từ chối bởi Công ty"
+
+#. 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 "Người sử dụng"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Excellent"
+msgstr "Tuyệt vời"
+
+#. module: hr_recruitment
+#: field:hr.applicant,active:0
+msgid "Active"
+msgstr "Hoạt động"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "November"
+msgstr "Tháng Mười Một"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Extended Filters..."
+msgstr "Các bộ lọc Mở rộng..."
+
+#. module: hr_recruitment
+#: field:hr.applicant,response:0
+msgid "Response"
+msgstr "Hồi đáp"
+
+#. 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 "Tháng Giêng"
+
+#. 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 "Không Tốt"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date:0
+#: field:hr.recruitment.report,date:0
+msgid "Date"
+msgstr "Ngày"
+
+#. 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 "Lịch sử"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Attachments"
+msgstr "Các tập tin đính kèm"
+
+#. 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 "Trạng thái"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: view:hr.recruitment.partner.create:0
+msgid "Cancel"
+msgstr "Hủy bỏ"
+
+#. 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 "Mở"
+
+#. 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 "Chịu trách nhiệm"
+
+#. 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 "Phân tích Tuyển dụng"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Current"
+msgstr "Hiện hành"
+
+#. 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 "Các chi tiết"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Cases By Stage and Estimates"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reply"
+msgstr "Phản hồi"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Interview"
+msgstr "Phỏng vấn"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,month:0
+msgid "Month"
+msgstr "Tháng"
+
+#. module: hr_recruitment
+#: field:hr.applicant,description:0
+msgid "Description"
+msgstr "Mô tả"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "May"
+msgstr "Tháng Năm"
+
+#. 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 "Đã từ chối"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:412
+#, python-format
+msgid "Applicant '%s' is being hired."
+msgstr "Ứng viên '%s' được tuyển dụng."
+
+#. 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 "Đã được tuyển dụng"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job6
+msgid "Refused by Employee"
+msgstr "Từ chối bởi Người lao động"
+
+#. 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 "Tháng Hai"
+
+#. module: hr_recruitment
+#: field:hr.applicant,name:0
+#: field:hr.recruitment.degree,name:0
+#: field:hr.recruitment.stage,name:0
+msgid "Name"
+msgstr "Tên"
+
+#. 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 "Tháng Tư"
+
+#. 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_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index caaaef12f01..9d977c1315a 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -7,7 +7,7 @@
             <field name="standard_price">30.0</field>
             <field name="uom_id" ref="product.uom_hour"/>
             <field name="uom_po_id" ref="product.uom_hour"/>
-            <field name="name">Service on Timesheet</field>
+            <field name="name">Consultant</field>
             <field name="categ_id" ref="product.cat0"/>
             <field name="type">service</field>
             <field eval="False" name="purchase_ok"/>
@@ -27,11 +27,11 @@
             <field name="name">Requirements analysis and specification</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
-            <field eval="0.00" name="unit_amount"/>
+            <field eval="2.00" name="unit_amount"/>
             <field name="product_id" ref="product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
             <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
-            <field eval="0.00" name="amount"/>
+            <field eval="-60.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
@@ -40,11 +40,11 @@
             <field name="name">Design and specification</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
-            <field eval="0.00" name="unit_amount"/>
+            <field eval="1.00" name="unit_amount"/>
             <field name="product_id" ref="product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
             <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
-            <field eval="0.00" name="amount"/>
+            <field eval="-30.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
@@ -53,11 +53,11 @@
             <field name="name">Coding and module testing</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
-            <field eval="0.00" name="unit_amount"/>
+            <field eval="03.00" name="unit_amount"/>
             <field name="product_id" ref="product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
             <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
-            <field eval="0.00" name="amount"/>
+            <field eval="-90.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
@@ -66,11 +66,11 @@
             <field name="name">Integration and system testing</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
-            <field eval="0.00" name="unit_amount"/>
+            <field eval="01.00" name="unit_amount"/>
             <field name="product_id" ref="product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
             <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
-            <field eval="0.00" name="amount"/>
+            <field eval="-30.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
@@ -79,11 +79,11 @@
             <field name="name">Delivery and maintenance</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
-            <field eval="0.00" name="unit_amount"/>
+            <field eval="01.00" name="unit_amount"/>
             <field name="product_id" ref="product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
             <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
-            <field eval="0.00" name="amount"/>
+            <field eval="-30.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
diff --git a/addons/hr_timesheet_invoice/__init__.py b/addons/hr_timesheet_invoice/__init__.py
index 223ee7ea0c6..a80615f5c9b 100644
--- a/addons/hr_timesheet_invoice/__init__.py
+++ b/addons/hr_timesheet_invoice/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,12 +15,11 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 import hr_timesheet_invoice
 import wizard
 import report
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index 95682d00ef0..5d5e41ecbb0 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -47,6 +47,7 @@ reports, etc.""",
         'wizard/hr_timesheet_invoice_create_view.xml',
         'wizard/hr_timesheet_invoice_create_final_view.xml',
         'board_hr_timesheet_invoice.xml',
+        'hr_timesheet_invoice_installer_view.xml'
     ],
     'demo': [
         'hr_timesheet_invoice_demo.xml',
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 5c042c5c7e3..d9314690ce7 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -66,7 +66,7 @@ class account_analytic_account(osv.osv):
         'pricelist_id': fields.many2one('product.pricelist', 'Sale 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_invoiced': fields.function(_invoiced_calc, method=True, string='Invoiced Amount',
+        'amount_invoiced': fields.function(_invoiced_calc, string='Invoiced Amount',
             help="Total invoiced"),
         'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Reinvoice Costs',
             help="Fill this field if you plan to automatically generate invoices based " \
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml
new file mode 100644
index 00000000000..22d12db6ec8
--- /dev/null
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+ 
+        <!--  Configure Your Services Config Wiz  -->
+
+        <record id="product_timesheet_invoice_tree_view" model="ir.ui.view">
+            <field name="name">product.product.tree</field>
+            <field name="model">product.product</field>
+            <field name="type">tree</field>
+            <field eval="7" name="priority"/>
+            <field name="arch" type="xml">
+                <tree colors="red:virtual_available&lt;0;blue:virtual_available&gt;=0 and state in ('draft', 'end', 'obsolete');black:virtual_available&gt;=0 and state not in ('draft', 'end', 'obsolete')" string="Products">
+                    <field name="name"/>
+                    <field name="standard_price"/>
+                    <field name="lst_price"/>
+                    <field name="uom_id" string="UoM"/>
+                </tree>
+            </field>
+        </record>       
+
+        <record model="ir.actions.act_window" id="product_services_form_view_installer">
+           <field name="name">Configure Your Services</field>
+           <field name="type">ir.actions.act_window</field>
+           <field name="res_model">product.product</field>
+           <field name="view_type">form</field>
+           <field name="view_mode">tree,form</field>
+           <field name="domain">[('type','=','service')]</field>
+           <field name="context" eval="'{\'default_type\':\'service\', \'default_sale_ok\':True, \'default_hr_expense_ok\':False,}'"/>
+           <field name="view_id" ref="product_timesheet_invoice_tree_view"/>
+       </record>
+
+       <record id="product_services_form_view_todo" model="ir.actions.todo">
+           <field name="action_id" ref="product_services_form_view_installer"/>
+           <field name="category_id" ref="hr.category_hr_management_config"/>
+           <field name="sequence">3</field>
+           <field name="type">normal</field>
+           <field name="state">skip</field>
+       </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index ea2b5017790..cf4351112a4 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -286,13 +286,13 @@ class hr_timesheet_sheet(osv.osv):
             help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed timesheet. \
                 \n* The \'Confirmed\' state is used for to confirm the timesheet by user. \
                 \n* The \'Done\' state is used when users timesheet is accepted by his/her senior.'),
-        'state_attendance' : fields.function(_state_attendance, method=True, type='selection', selection=[('absent', 'Absent'), ('present', 'Present'),('none','No employee defined')], string='Current Status'),
-        'total_attendance_day': fields.function(_total_day, method=True, string='Total Attendance', multi="_total_day"),
-        'total_timesheet_day': fields.function(_total_day, method=True, string='Total Timesheet', multi="_total_day"),
-        'total_difference_day': fields.function(_total_day, method=True, string='Difference', multi="_total_day"),
-        'total_attendance': fields.function(_total, method=True, string='Total Attendance', multi="_total_sheet"),
-        'total_timesheet': fields.function(_total, method=True, string='Total Timesheet', multi="_total_sheet"),
-        'total_difference': fields.function(_total, method=True, string='Difference', multi="_total_sheet"),
+        'state_attendance' : fields.function(_state_attendance, type='selection', selection=[('absent', 'Absent'), ('present', 'Present'),('none','No employee defined')], string='Current Status'),
+        'total_attendance_day': fields.function(_total_day, string='Total Attendance', multi="_total_day"),
+        'total_timesheet_day': fields.function(_total_day, string='Total Timesheet', multi="_total_day"),
+        'total_difference_day': fields.function(_total_day, string='Difference', multi="_total_day"),
+        'total_attendance': fields.function(_total, string='Total Attendance', multi="_total_sheet"),
+        'total_timesheet': fields.function(_total, string='Total Timesheet', multi="_total_sheet"),
+        'total_difference': fields.function(_total, string='Difference', multi="_total_sheet"),
         'period_ids': fields.one2many('hr_timesheet_sheet.sheet.day', 'sheet_id', 'Period', readonly=True),
         'account_ids': fields.one2many('hr_timesheet_sheet.sheet.account', 'sheet_id', 'Analytic accounts', readonly=True),
         'company_id': fields.many2one('res.company', 'Company'),
@@ -473,7 +473,7 @@ class hr_timesheet_line(osv.osv):
         return [('id', 'in', [x[0] for x in res])]
 
     _columns = {
-        'sheet_id': fields.function(_sheet, method=True, string='Sheet',
+        'sheet_id': fields.function(_sheet, string='Sheet',
             type='many2one', relation='hr_timesheet_sheet.sheet',
             fnct_search=_sheet_search),
     }
@@ -494,6 +494,8 @@ class hr_timesheet_line(osv.osv):
     ]
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         self._check(cr, uid, ids)
         return super(hr_timesheet_line,self).unlink(cr, uid, ids,*args, **kwargs)
 
@@ -596,7 +598,7 @@ class hr_attendance(osv.osv):
         return [('id', 'in', [x[0] for x in res])]
 
     _columns = {
-        'sheet_id': fields.function(_sheet, method=True, string='Sheet',
+        'sheet_id': fields.function(_sheet, string='Sheet',
             type='many2one', relation='hr_timesheet_sheet.sheet',
             fnct_search=_sheet_search),
     }
@@ -619,12 +621,16 @@ class hr_attendance(osv.osv):
         return res
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         self._check(cr, uid, ids)
         return super(hr_attendance,self).unlink(cr, uid, ids,*args, **kwargs)
 
     def write(self, cr, uid, ids, vals, context=None):
         if context is None:
             context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         self._check(cr, uid, ids)
         res = super(hr_attendance,self).write(cr, uid, ids, vals, context=context)
         if 'sheet_id' in context:
diff --git a/addons/hr_timesheet_sheet/i18n/vi.po b/addons/hr_timesheet_sheet/i18n/vi.po
index d4319b93d04..31b01bd6098 100644
--- a/addons/hr_timesheet_sheet/i18n/vi.po
+++ b/addons/hr_timesheet_sheet/i18n/vi.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-08-02 14:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-05-25 15:26+0000\n"
+"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-26 04:36+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
@@ -32,12 +32,12 @@ msgstr ""
 #: field:hr_timesheet_sheet.sheet.account,sheet_id:0
 #: field:hr_timesheet_sheet.sheet.day,sheet_id:0
 msgid "Sheet"
-msgstr ""
+msgstr "Tờ"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
 msgid "Service"
-msgstr ""
+msgstr "Dịch vụ"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
@@ -50,7 +50,7 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: view:timesheet.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Nhóm theo..."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
@@ -64,7 +64,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Phòng ban"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
@@ -74,7 +74,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Today"
-msgstr ""
+msgstr "Hôm nay"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:199
@@ -87,7 +87,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Tháng Ba"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -96,7 +96,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Công ty"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -128,7 +128,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
 msgid "Validate"
-msgstr ""
+msgstr "Xác nhận"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -137,30 +137,30 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Ngày"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Present"
-msgstr ""
+msgstr "Có mặt"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Total Cost"
-msgstr ""
+msgstr "Toàn bộ chi phí"
 
 #. 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 "Lỗi người sử dụng"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
 msgid "Refuse"
-msgstr ""
+msgstr "Từ chối"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:608
@@ -191,18 +191,18 @@ msgstr ""
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Tháng-1 "
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "Validation"
-msgstr ""
+msgstr "Xác nhận"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:199
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Cảnh báo !"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
@@ -216,7 +216,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Tài khoản KTQT"
 
 #. module: hr_timesheet_sheet
 #: field:timesheet.report,nbr:0
@@ -233,7 +233,7 @@ msgstr ""
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Month "
-msgstr ""
+msgstr " Tháng "
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -244,7 +244,7 @@ msgstr ""
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Bảng chấm công"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -252,20 +252,20 @@ msgstr ""
 #: view:timesheet.report:0
 #: selection:timesheet.report,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Đã được xác nhận"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
 msgid "Attendance"
-msgstr ""
+msgstr "Điểm danh"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_draftconfirmtimesheet0
 msgid "Confirm"
-msgstr ""
+msgstr "Xác nhận"
 
 #. module: hr_timesheet_sheet
 #: model:ir.module.module,description:hr_timesheet_sheet.module_meta_information
@@ -295,14 +295,14 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Lỗi ! Bạn không thể tạo các công ty đệ quy."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0
 #: view:timesheet.report:0
 #: field:timesheet.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Trạng thái"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
@@ -312,13 +312,13 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,employee_id:0
 msgid "Employee"
-msgstr ""
+msgstr "Người LĐ"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 #: selection:timesheet.report,state:0
 msgid "New"
-msgstr ""
+msgstr "Mới"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
@@ -344,12 +344,12 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Lỗi !"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
 msgid "Total Time"
-msgstr ""
+msgstr "Tổng thời gian"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
@@ -359,7 +359,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Hours"
-msgstr ""
+msgstr "Giờ"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
@@ -382,7 +382,7 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:374
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Hành động không hợp lệ !"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
@@ -393,12 +393,12 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Tháng Bảy"
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Cấu hình"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:179
@@ -440,7 +440,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign In"
-msgstr ""
+msgstr "Đăng nhập"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
@@ -451,7 +451,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
 msgid "hr.timesheet.current.open"
-msgstr ""
+msgstr "hr.timesheet.current.open"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -462,13 +462,13 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Tháng Chín"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Tháng Mười Hai"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
@@ -482,7 +482,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Tháng"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
@@ -531,7 +531,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: selection:timesheet.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Dự thảo"
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_max_difference:0
@@ -552,24 +552,24 @@ msgstr ""
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Year "
-msgstr ""
+msgstr " Năm "
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
 msgid "Week"
-msgstr ""
+msgstr "Tuần"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Tháng Tám"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Tháng Sáu"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -596,7 +596,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Người sử dụng"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
@@ -607,19 +607,19 @@ msgstr ""
 #: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
-msgstr ""
+msgstr "Ngày"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Tháng Mười Một"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Các bộ lọc Mở rộng..."
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
@@ -640,7 +640,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Tháng Mười"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
@@ -654,7 +654,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Tháng Giêng"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
@@ -664,12 +664,12 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Các công ty"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Số lượng"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -677,7 +677,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Tài khoản Tổng"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
@@ -690,7 +690,7 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: field:hr_timesheet_sheet.sheet,period_ids:0
 msgid "Period"
-msgstr ""
+msgstr "Chu kỳ"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:480
@@ -712,7 +712,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: selection:timesheet.report,state:0
 msgid "Done"
-msgstr ""
+msgstr "Hoàn tất"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
@@ -722,7 +722,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
-msgstr ""
+msgstr "Hủy bỏ"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
@@ -777,7 +777,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Search Timesheet"
-msgstr ""
+msgstr "Tìm kiếm Bảng chấm công"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:170
@@ -798,21 +798,21 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Sản phẩm"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: field:hr_timesheet_sheet.sheet,attendances_ids:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_attendance
 msgid "Attendances"
-msgstr ""
+msgstr "Tham dự"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,name:0
 #: field:hr_timesheet_sheet.sheet,name:0
 #: field:timesheet.report,name:0
 msgid "Description"
-msgstr ""
+msgstr "Mô tả"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
@@ -823,7 +823,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Tháng Năm"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
@@ -849,7 +849,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
-msgstr ""
+msgstr "Theo Ngày"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
@@ -862,23 +862,23 @@ msgstr ""
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
 #: field:hr_timesheet_sheet.sheet.day,total_difference:0
 msgid "Difference"
-msgstr ""
+msgstr "Khác biệt"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
-msgstr ""
+msgstr "Vắng mặt"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Tháng Hai"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Employees"
-msgstr ""
+msgstr "Các nhân viên"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
@@ -889,12 +889,12 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Tháng Tư"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "Confirmation"
-msgstr ""
+msgstr "Xác nhận"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -904,7 +904,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Approve"
-msgstr ""
+msgstr "Chấp thuận"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -926,13 +926,13 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "Giá"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
 #: field:timesheet.report,date_current:0
 msgid "Current date"
-msgstr ""
+msgstr "Ngày hiện thời"
 
 #. module: hr_timesheet_sheet
 #: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
@@ -946,12 +946,12 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Năm"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Open"
-msgstr ""
+msgstr "Mở"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
diff --git a/addons/html_view/i18n/fi.po b/addons/html_view/i18n/fi.po
new file mode 100644
index 00000000000..53f7526fc21
--- /dev/null
+++ b/addons/html_view/i18n/fi.po
@@ -0,0 +1,67 @@
+# Finnish 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-06-08 10:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: html_view
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Nimi"
+
+#. module: html_view
+#: field:html.view,comp_id:0
+msgid "Company"
+msgstr "Yritys"
+
+#. module: html_view
+#: model:ir.actions.act_window,name:html_view.action_html_view_form
+#: model:ir.ui.menu,name:html_view.html_form
+msgid "Html Test"
+msgstr "HTML testi"
+
+#. module: html_view
+#: view:html.view:0
+msgid "Html Example"
+msgstr "HTML malli"
+
+#. module: html_view
+#: model:ir.module.module,shortdesc:html_view.module_meta_information
+msgid "Html View"
+msgstr "HTML näkymä"
+
+#. module: html_view
+#: field:html.view,bank_ids:0
+msgid "Banks"
+msgstr "Pankit"
+
+#. module: html_view
+#: model:ir.module.module,description:html_view.module_meta_information
+msgid ""
+"\n"
+"    This is the test module which shows html tag supports in normal xml form "
+"view.\n"
+"    "
+msgstr ""
+"\n"
+"    Tämä on testimoduuli joka näyttää html tagi joita tuetaan normaalissa "
+"xml näkymässä\n"
+"    "
+
+#. module: html_view
+#: model:ir.model,name:html_view.model_html_view
+msgid "html.view"
+msgstr ""
diff --git a/addons/html_view/i18n/vi.po b/addons/html_view/i18n/vi.po
new file mode 100644
index 00000000000..fcee5f57985
--- /dev/null
+++ b/addons/html_view/i18n/vi.po
@@ -0,0 +1,66 @@
+# Vietnamese 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-05-29 14:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese <vi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-05-30 04:59+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: html_view
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Tên"
+
+#. module: html_view
+#: field:html.view,comp_id:0
+msgid "Company"
+msgstr "Công ty"
+
+#. module: html_view
+#: model:ir.actions.act_window,name:html_view.action_html_view_form
+#: model:ir.ui.menu,name:html_view.html_form
+msgid "Html Test"
+msgstr "kiểm tra HTML"
+
+#. module: html_view
+#: view:html.view:0
+msgid "Html Example"
+msgstr "HTML mẫu"
+
+#. module: html_view
+#: model:ir.module.module,shortdesc:html_view.module_meta_information
+msgid "Html View"
+msgstr "xem dưới dạng HTML"
+
+#. module: html_view
+#: field:html.view,bank_ids:0
+msgid "Banks"
+msgstr "Các ngân hàng"
+
+#. module: html_view
+#: model:ir.module.module,description:html_view.module_meta_information
+msgid ""
+"\n"
+"    This is the test module which shows html tag supports in normal xml form "
+"view.\n"
+"    "
+msgstr ""
+"\n"
+"    đây là module thử nghiệm sẽ trình bày dưới dạng HTML thông qua XML.\n"
+"    "
+
+#. module: html_view
+#: model:ir.model,name:html_view.model_html_view
+msgid "html.view"
+msgstr "html.view"
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 04ae4dff5df..0e6e89f15b5 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -52,7 +52,7 @@ class idea_category(osv.osv):
 
     _columns = {
         'name': fields.char('Category', size=64, required=True),
-        'complete_name': fields.function(_categ_name_get_fnc, method=True, type="char", string='Name'),
+        'complete_name': fields.function(_categ_name_get_fnc, type="char", string='Name'),
         'summary': fields.text('Summary'),
         'parent_id': fields.many2one('idea.category', 'Parent Categories', ondelete='set null'),
         'child_ids': fields.one2many('idea.category', 'parent_id', 'Child Categories'),
@@ -180,10 +180,10 @@ class idea_idea(osv.osv):
         'created_date': fields.datetime('Creation date', readonly=True),
         'open_date': fields.datetime('Open date', readonly=True, help="Date when an idea opened"),
         'vote_ids': fields.one2many('idea.vote', 'idea_id', 'Vote'),
-        'my_vote': fields.function(_vote_read, fnct_inv = _vote_save, string="My Vote", method=True, type="selection", selection=VoteValues),
-        'vote_avg': fields.function(_vote_avg_compute, method=True, string="Average Score", type="float"),
-        'count_votes': fields.function(_vote_count, method=True, string="Count of votes", type="integer"),
-        'count_comments': fields.function(_comment_count, method=True, string="Count of comments", type="integer"),
+        'my_vote': fields.function(_vote_read, fnct_inv = _vote_save, string="My Vote", type="selection", selection=VoteValues),
+        'vote_avg': fields.function(_vote_avg_compute, string="Average Score", type="float"),
+        'count_votes': fields.function(_vote_count, string="Count of votes", type="integer"),
+        'count_comments': fields.function(_comment_count, string="Count of comments", type="integer"),
         'category_id': fields.many2one('idea.category', 'Category', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'Draft'),
             ('open', 'Opened'),
diff --git a/addons/import_base/__init__.py b/addons/import_base/__init__.py
new file mode 100644
index 00000000000..0a5d7fb20b7
--- /dev/null
+++ b/addons/import_base/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Openerp sa (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 import_framework
+import mapper
\ No newline at end of file
diff --git a/addons/import_base/__openerp__.py b/addons/import_base/__openerp__.py
new file mode 100644
index 00000000000..962541f427a
--- /dev/null
+++ b/addons/import_base/__openerp__.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Base framework for module that need to import complex data',
+    'version': '0.9',
+    'category': 'Generic Modules',
+    'description': """
+        This module provide a class import_framework to help importing 
+        complex data from other software
+    """,
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['base'],
+    'init_xml': [],
+    'update_xml': [],
+    'demo_xml': [],
+    'test': [], #TODO provide test
+    'installable': True,
+    'active': False,
+}
diff --git a/addons/import_base/import_framework.py b/addons/import_base/import_framework.py
new file mode 100644
index 00000000000..9b25ecb1ecf
--- /dev/null
+++ b/addons/import_base/import_framework.py
@@ -0,0 +1,432 @@
+# -*- 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 pprint
+import mapper
+import pooler
+import tools
+
+
+from threading import Thread
+import datetime
+import logging
+pp = pprint.PrettyPrinter(indent=4)
+
+
+
+
+class import_framework(Thread):
+    """
+        This class should be extends,
+        get_data and get_mapping have to extends
+        get_state_map and initialize can be extended
+        for advanced purpose get_default_hook can also be extended
+        @see dummy import for a minimal exemple
+    """
+    
+    """
+        for import_object, this domain will avoid to find an already existing object
+    """
+    DO_NOT_FIND_DOMAIN = [('id', '=', 0)]
+  
+    def __init__(self, obj, cr, uid, instance_name, module_name, email_to_notify=False, context=None):
+        Thread.__init__(self)
+        self.obj = obj
+        self.cr = cr
+        self.uid = uid
+        self.instance_name = instance_name
+        self.module_name = module_name
+        self.context = context or {}
+        self.email = email_to_notify
+        self.table_list = []
+        self.initialize()
+        
+        
+      
+    """
+        Abstract Method to be implemented in 
+        the real instance
+    """  
+    def initialize(self):
+        """
+            init before import
+            usually for the login
+        """
+        pass
+    
+    def get_data(self, table):
+        """
+            @return: a list of dictionaries
+                each dictionnaries contains the list of pair  external_field_name : value 
+        """
+        return [{}]
+    
+    def get_mapping(self):
+        """
+            @return: { TABLE_NAME : {
+                'model' : 'openerp.model.name',
+                #if true import the table if not just resolve dependencies, use for meta package, by default => True  
+                #Not required
+                'import' : True or False, 
+                #Not required
+                'dependencies' : [TABLE_1, TABLE_2],
+                #Not required
+                'hook' : self.function_name, #get the val dict of the object, return the same val dict or False
+                'map' : { @see mapper
+                    'openerp_field_name' : 'external_field_name', or val('external_field_name')
+                    'openerp_field_id/id' : ref(TABLE_1, 'external_id_field'), #make the mapping between the external id and the xml on the right
+                    'openerp_field2_id/id_parent' : ref(TABLE_1,'external_id_field') #indicate a self dependencies on openerp_field2_id
+                    'state' : map_val('state_equivalent_field', mapping), # use get_state_map to make the mapping between the value of the field and the value of the state
+                    'text_field' : concat('field_1', 'field_2', .., delimiter=':'), #concat the value of the list of field in one
+                    'description_field' : ppconcat('field_1', 'field_2', .., delimiter='\n\t'), #same as above but with a prettier formatting
+                    'field' : call(callable, arg1, arg2, ..), #call the function with all the value, the function should send the value : self.callable
+                    'field' : callable
+                    'field' : call(method, val('external_field') interface of method is self, val where val is the value of the field
+                    'field' : const(value) #always set this field to value
+                    + any custom mapper that you will define
+                } 
+            },
+            
+            } 
+        """
+        return {}
+    
+    def default_hook(self, val):
+        """
+            this hook will be apply on each table that don't have hook
+            here we define the identity hook
+        """
+        return val
+        
+    def _import_table(self, table):
+        data = self.get_data(table)
+        map = self.get_mapping()[table]['map']
+        hook = self.get_mapping()[table].get('hook', self.default_hook)
+        model = self.get_mapping()[table]['model']
+        
+        final_data = []
+        for val in data:
+            res = hook(val)
+            if res:
+                final_data.append(res)
+        return self._save_data(model, dict(map), final_data, table)
+        
+    def _save_data(self, model, mapping, datas, table):
+        """
+            @param model: the model of the object to import
+            @param table : the external table where the data come from 
+            @param mapping : definition of the mapping
+                             @see: get_mapping
+            @param datas : list of dictionnaries 
+                datas = [data_1, data_2, ..]
+                data_i is a map external field_name => value
+                and each data_i have a external id => in data_id['id']
+        """
+        if not datas:
+            return (0, 'No data in this table')
+        mapping['id'] = 'id_new'
+        res = []
+        
+        
+        self_dependencies = []
+        for k in mapping.keys():
+            if '_parent' in k:
+                self_dependencies.append((k[:-7], mapping.pop(k)))
+        
+        for data in datas:
+            for k, field_name in self_dependencies:
+                data[k] = data.get(field_name) and self._generate_xml_id(data.get(field_name), table)
+                    
+            data['id_new'] = self._generate_xml_id(data['id'], table)
+            fields, values = self._fields_mapp(data, mapping, table)
+            res.append(values)
+        
+        model_obj = self.obj.pool.get(model)
+        if not model_obj:
+            raise ValueError("%s is not a valid model name" % model)
+        
+        (p, r, warning, s) = model_obj.import_data(self.cr, self.uid, fields, res, mode='update', current_module=self.module_name, noupdate=True, context=self.context)
+        for (field, field_name) in self_dependencies:
+            self._import_self_dependencies(model_obj, field, datas)
+        return (len(res), warning)
+            
+    def _import_self_dependencies(self, obj, parent_field, datas):
+        """
+            @param parent_field: the name of the field that generate a self_dependencies, we call the object referenced in this
+                field the parent of the object
+            @param datas: a list of dictionnaries
+                Dictionnaries need to contains 
+                    id_new : the xml_id of the object
+                    field_new : the xml_id of the parent
+        """
+        fields = ['id', parent_field]
+        for data in datas:
+            if data.get(parent_field):
+                values = [data['id_new'], data[parent_field]]
+                obj.import_data(self.cr, self.uid, fields, [values], mode='update', current_module=self.module_name, noupdate=True, context=self.context) 
+    
+    def _preprocess_mapping(self, mapping):
+        """
+            Preprocess the mapping :
+            after the preprocces, everything is 
+            callable in the val of the dictionary
+            
+            use to allow syntaxical sugar like 'field': 'external_field'
+            instead of 'field' : value('external_field')
+        """
+        map = dict(mapping)
+        for key, value in map.items():
+            if isinstance(value, basestring):
+                map[key] = mapper.value(value)
+            #set parent for instance of dbmapper
+            elif isinstance(value, mapper.dbmapper): 
+                value.set_parent(self)
+        return map   
+            
+            
+    def _fields_mapp(self,dict_sugar, openerp_dict, table):
+        """
+            call all the mapper and transform data 
+            to be compatible with import_data
+        """
+        fields=[]
+        data_lst = []
+        mapping = self._preprocess_mapping(openerp_dict)
+        for key,val in mapping.items():
+            if key not in fields and dict_sugar:
+                fields.append(key)
+                value = val(dict(dict_sugar))
+                data_lst.append(value)
+        return fields, data_lst
+    
+    def _generate_xml_id(self, name, table):
+        """
+            @param name: name of the object, has to be unique in for a given table
+            @param table : table where the record we want generate come from
+            @return: a unique xml id for record, the xml_id will be the same given the same table and same name
+                     To be used to avoid duplication of data that don't have ids
+        """
+        sugar_instance = self.instance_name
+        name = name.replace('.', '_').replace(',', '_')
+        return sugar_instance + "_" + table + "_" + name
+    
+    
+    """
+        Public interface of the framework
+        those function can be use in the callable function defined in the mapping
+    """
+    def xml_id_exist(self, table, external_id):
+        """
+            Check if the external id exist in the openerp database
+            in order to check if the id exist the table where it come from
+            should be provide
+            @return the xml_id generated if the external_id exist in the database or false
+        """
+        if not external_id:
+            return False
+        
+        xml_id = self._generate_xml_id(external_id, table)
+        id = self.obj.pool.get('ir.model.data').search(self.cr, self.uid, [('name', '=', xml_id), ('module', '=', self.module_name)])
+        return id and xml_id or False
+    
+    def name_exist(self, table, name, model):
+        """
+            Check if the object with the name exist in the openerp database
+            in order to check if the id exist the table where it come from
+            should be provide and the model of the object
+        """
+        fields = ['name']
+        data = [name]
+        return self.import_object(fields, data, model, table, name, [('name', '=', name)])
+    
+    def get_mapped_id(self, table, external_id, context=None):
+        """
+            @return return the databse id linked with the external_id
+        """
+        if not external_id:
+            return False
+    
+        xml_id = self._generate_xml_id(external_id, table)
+        return self.obj.pool.get('ir.model.data').get_object_reference(self.cr, self.uid, self.module_name, xml_id)[1]
+    
+    def import_object_mapping(self, mapping, data, model, table, name, domain_search=False):
+        """
+            same as import_objects but instead of two list fields and data, 
+            this method take a dictionnaries : external_field : value 
+                            and the mapping similar to the one define in 'map' key
+            @see import_object, get_mapping
+        """
+        fields, datas = self._fields_mapp(data, mapping, table)
+        return self.import_object(fields, datas, model, table, name, domain_search)
+
+    def import_object(self, fields, data, model, table, name, domain_search=False):
+        """
+            This method will import an object in the openerp, usefull for field that is only a char in sugar and is an object in openerp
+            use import_data that will take care to create/update or do nothing with the data
+            this method return the xml_id
+            
+            To be use, when you want to create an object or link if already exist
+            use DO_NOT_LINK_DOMAIN to create always a new object
+            @param fields: list of fields needed to create the object without id
+            @param data: the list of the data, in the same order as the field
+                ex : fields = ['firstname', 'lastname'] ; data = ['John', 'Mc donalds']
+            @param model: the openerp's model of the create/update object
+            @param table: the table where data come from in sugarcrm, no need to fit the real name of openerp name, just need to be unique
+            @param unique_name: the name of the object that we want to create/update get the id
+            @param domain_search : the domain that should find the unique existing record
+            
+            @return: the xml_id of the ressources
+        """
+        domain_search = not domain_search and [('name', 'ilike', name)] or domain_search
+        obj = self.obj.pool.get(model)
+        xml_id = self._generate_xml_id(name, table)
+        xml_ref = self.mapped_id_if_exist(model, domain_search, table, name)
+        fields.append('id')
+        data.append(xml_id)
+        obj.import_data(self.cr, self.uid, fields, [data], mode='update', current_module=self.module_name, noupdate=True, context=self.context)
+        return xml_ref or xml_id
+    
+
+    def mapped_id_if_exist(self, model, domain, table, name):
+        """
+            To be use when we want link with and existing object, if the object don't exist
+            just ignore.
+            @param domain : search domain to find existing record, should return a unique record
+            @param xml_id: xml_id give to the mapping
+            @param name: external_id or name of the object to create if there is no id
+            @param table: the name of the table of the object to map
+            @return : the xml_id if the record exist in the db, False otherwise
+        """
+        obj = self.obj.pool.get(model)
+        ids = obj.search(self.cr, self.uid, domain, context=self.context)
+        if ids:
+            xml_id = self._generate_xml_id(name, table)
+            ir_model_data_obj = obj.pool.get('ir.model.data')
+            id = ir_model_data_obj._update(self.cr, self.uid, model,
+                             self.module_name, {}, mode='update', xml_id=xml_id,
+                             noupdate=True, res_id=ids[0], context=self.context)
+            return xml_id
+        return False
+    
+    
+    def set_table_list(self, table_list):
+        """
+            Set the list of table to import, this method should be call before run
+            @param table_list: the list of external table to import
+               ['Leads', 'Opportunity']
+        """
+        self.table_list = table_list
+    
+    def run(self):
+        """
+            Import all data into openerp, 
+            this is the Entry point to launch the process of import
+            
+        
+        """
+        self.data_started = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        self.cr = pooler.get_db(self.cr.dbname).cursor()
+        try:
+            result = []
+            imported = set() #to invoid importing 2 times the sames modules
+            for table in self.table_list:
+                to_import = self.get_mapping()[table].get('import', True)
+                if not table in imported:
+                    res = self._resolve_dependencies(self.get_mapping()[table].get('dependencies', []), imported)
+                    result.extend(res)
+                    if to_import:
+                        (position, warning) = self._import_table(table)
+                        result.append((table, position, warning))
+                    imported.add(table)
+            self.cr.commit()
+            
+        finally:
+            self.cr.close()
+        self.date_ended = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        self._send_notification_email(result)
+        
+        
+    def _resolve_dependencies(self, dep, imported):
+        """ 
+            import dependencies recursively
+            and avoid to import twice the same table
+        """
+        result = []
+        for dependency in dep:
+            if not dependency in imported:
+                to_import = self.get_mapping()[dependency].get('import', True)
+                res = self._resolve_dependencies(self.get_mapping()[dependency].get('dependencies', []), imported)
+                result.extend(res)
+                if to_import:
+                    r = self._import_table(dependency)
+                    (position, warning) = r
+                    result.append((dependency, position, warning))
+                imported.add(dependency)
+        return result
+                
+    def _send_notification_email(self, result):
+        if not self.email:
+            return 		 
+        tools.email_send(
+                'import_sugarcrm@module.openerp',
+                self.email,
+                self.get_email_subject(result),
+                self.get_email_body(result),
+            )
+        logger = logging.getLogger('import_sugarcam')
+        logger.info("Import finished, notification email sended")
+    
+    def get_email_subject(self, result):
+        """
+            This method define the subject of the email send by openerp at the end of import
+            @param result: a list of tuple 
+                (table_name, number_of_record_created/updated, warning) for each table
+            @return the subject of the mail
+        
+        """
+        return "Import of your data finished at %s" % self.date_ended
+    
+    def get_email_body(self, result):
+        """
+            This method define the body of the email send by openerp at the end of import. The body is separated in two part
+            the header (@see get_body_header), and the generate body with the list of table and number of record imported.
+            If you want to keep this it's better to overwrite get_body_header
+            @param result: a list of tuple 
+                (table_name, number_of_record_created/updated, warning) for each table
+            @return the subject of the mail
+        
+        """
+        
+        body = "started at %s and finished at %s \n" % (self.data_started, self.date_ended)
+        for (table, nb, warning) in result:
+            if not warning:
+                warning = "with no warning"
+            else:
+                warning = "with warning : %s" % warning
+            body += "%s records were imported from table %s, %s \n" % (nb, table, warning)
+        return self.get_body_header(result) + "\n\n" + body
+    
+    def get_body_header(self, result):
+        """
+            @return the first sentences written in the mail's body
+        """
+        return "The import of data \n instance name : %s \n" % self.instance_name
+    
+#For example of use see import_sugarcrm    
diff --git a/addons/import_base/mapper.py b/addons/import_base/mapper.py
new file mode 100644
index 00000000000..7f97ed0b615
--- /dev/null
+++ b/addons/import_base/mapper.py
@@ -0,0 +1,173 @@
+# -*- 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/>.
+#
+##############################################################################
+
+
+class mapper(object):
+    """
+        super class for all mapper class
+        They are call before import data
+        to transform the mapping into real value that we
+        will import
+        
+        the call function receive a dictionary with external data
+            'external_field' : value
+    """
+    def __call__(self, external_values):
+        raise NotImplementedError()
+
+class dbmapper(mapper):
+    """
+        Super class for mapper that need to access to 
+        data base or any function of the import_framework
+        
+        self.parent contains a reference to the instance of
+        the import framework
+    """
+    def set_parent(self, parent):
+        self.parent = parent
+        
+
+class concat(mapper):
+    """
+        Use : contact('field_name1', 'field_name2', delimiter='_')
+        concat value of fields using the delimiter, delimiter is optional
+        and by default is a space
+        
+    """
+    def __init__(self, *arg, **delimiter):
+        self.arg = arg
+        self.delimiter = delimiter and delimiter.get('delimiter', ' ') or ' '
+        
+    def __call__(self, external_values):
+        return self.delimiter.join(map(lambda x : external_values.get(x,''), self.arg))
+    
+class ppconcat(mapper):
+    """
+        Use : contact('field_name1', 'field_name2', delimiter='_')
+        concat external field name and value of fields using the delimiter, 
+        delimiter is optional and by default is a two line feeds
+        
+    """
+    def __init__(self, *arg, **delimiter):
+        self.arg = arg
+        self.delimiter = delimiter and delimiter.get('delimiter', ' ') or '\n\n'
+        
+    def __call__(self, external_values):
+        return self.delimiter.join(map(lambda x : x + ": " + external_values.get(x,''), self.arg))
+    
+class const(mapper):
+    """
+        Use : const(arg)
+        return always arg
+    """
+    def __init__(self, val):
+        self.val = val
+        
+    def __call__(self, external_values):
+        return self.val 
+    
+class value(mapper):
+    """
+        Use : value(external_field_name)
+        Return the value of the external field name
+        this is equivalent to the a single string
+        
+        usefull for call if you want your call get the value
+        and don't care about the name of the field
+        call(self.method, value('field1'))
+    """
+    def __init__(self, val, default='', fallback=False):
+        self.val = val
+        self.default = default
+        self.fallback = fallback
+        
+    def __call__(self, external_values):
+        val = external_values.get(self.val, self.default) 
+        if self.fallback and (not val or val == self.default):
+            val = external_values.get(self.fallback, self.default)
+        return val 
+    
+
+    
+class map_val(mapper):
+    """
+        Use : map_val(external_field, val_mapping)
+        where val_mapping is a dictionary 
+        with external_val : openerp_val
+        
+        usefull for selection field like state
+        to map value 
+    """
+    def __init__(self, val, map, default='draft'):
+        self.val = value(val)
+        self.map = map
+        self.default = default
+        
+    def __call__(self, external_values):
+        return self.map.get(self.val(external_values), self.default)
+    
+class ref(dbmapper):
+    """
+        Use : ref(table_name, external_id)
+        return the xml_id of the ressource
+        
+        to associate an already imported object with the current object
+    """
+    def __init__(self, table, field_name):
+        self.table = table
+        self.field_name = field_name
+        
+    def __call__(self, external_values):
+        return self.parent.xml_id_exist(self.table, external_values.get(self.field_name))
+  
+class refbyname(dbmapper):  
+    """
+        Use : refbyname(table_name, external_name, res.model)
+        same as ref but use the name of the ressource to find it
+    """
+    def __init__(self, table, field_name, model):
+        self.table = table
+        self.field_name = field_name
+        self.model = model
+        
+    def __call__(self, external_values):
+        v = external_values.get(self.field_name, '')
+        return self.parent.name_exist(self.table, v , self.model)
+        
+class call(mapper):
+    """
+        Use : call(function, arg1, arg2)
+        to call the function with external val follow by the arg specified 
+    """
+    def __init__(self, fun, *arg):
+        self.fun = fun
+        self.arg = arg
+    
+    def __call__(self, external_values):
+        args = []
+        for arg in self.arg:
+            if isinstance(arg, mapper):
+                args.append(arg(external_values))
+            else:
+                args.append(arg)
+        return self.fun(external_values, *args)
+    
+    
\ No newline at end of file
diff --git a/addons/import_google/__init__.py b/addons/import_google/__init__.py
new file mode 100644
index 00000000000..7ca8ce67ab3
--- /dev/null
+++ b/addons/import_google/__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 partner
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py
new file mode 100644
index 00000000000..f1ab89a041d
--- /dev/null
+++ b/addons/import_google/__openerp__.py
@@ -0,0 +1,47 @@
+# -*- 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': 'Google Import',
+    'version': '1.0',
+    'category': 'Generic Modules/Others',
+    'description': """The module adds google contact in partner address and add google calendar events details in Meeting""",
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['base', 'google_base_account','crm'],
+    'init_xml': [],
+    'update_xml': ['security/ir.model.access.csv',
+                'sync_google_calendar_view.xml',
+                'wizard/import_google_data_view.xml',
+                'wizard/google_import_message_view.xml'
+
+               ],
+    'demo_xml': [],
+    'test': [
+             #'test/test_sync_google_contact_import_partner.yml',
+            # 'test/test_sync_google_contact_import_address.yml',
+             #'test/test_sync_google_calendar.yml',
+    ],
+    'installable': True,
+    'active': False,
+    'certificate': '',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/partner.py b/addons/import_google/partner.py
new file mode 100644
index 00000000000..232f18d06a3
--- /dev/null
+++ b/addons/import_google/partner.py
@@ -0,0 +1,31 @@
+# -*- 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
+
+class crm_case_categ(osv.osv):
+    """ Category of Case """
+    _inherit = "crm.case.categ"
+    _columns = {
+        'user_id': fields.many2one('res.users', 'User')
+    }
+crm_case_categ()
+# vim:expandtab:smartindent:toabstop=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
new file mode 100644
index 00000000000..50b689efa69
--- /dev/null
+++ b/addons/import_google/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_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_google/sync_google_calendar_view.xml b/addons/import_google/sync_google_calendar_view.xml
new file mode 100644
index 00000000000..58e1e55efd0
--- /dev/null
+++ b/addons/import_google/sync_google_calendar_view.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="crm_case_form_view_meet_inherit">
+	        <field name="name">CRM - Meetings Form (Inherited)</field>
+	        <field name="model">crm.meeting</field>
+	        <field name="type">form</field>
+	        <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>
+	        <field name="arch" type="xml">
+		        <field name="categ_id" position="replace">
+		           <field name="categ_id" widget="selection"
+	                      string="Meeting Type" groups="base.group_extended"
+	                      domain="[('object_id.model', '=', 'crm.meeting'),('user_id','in',[uid, False])]" />
+		        </field>
+		    </field>
+        </record>
+        
+        <record model="ir.ui.view" id="crm_case_tree_view_meet_inherit">
+	        <field name="name">CRM - Meetings Tree (Inherited)</field>
+	        <field name="model">crm.meeting</field>
+	        <field name="type">tree</field>
+	        <field name="inherit_id" ref="crm.crm_case_tree_view_meet"/>
+	        <field name="arch" type="xml">
+	           <field name="categ_id" position="replace">
+                   <field name="categ_id" widget="selection"
+                          string="Meeting Type" groups="base.group_extended"
+                          domain="[('object_id.model', '=', 'crm.meeting'),('user_id','in',[uid, False])]" />
+                </field>
+	        </field>
+	    </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/import_google/test/test_sync_google_calendar.yml b/addons/import_google/test/test_sync_google_calendar.yml
new file mode 100644
index 00000000000..28863f358bb
--- /dev/null
+++ b/addons/import_google/test/test_sync_google_calendar.yml
@@ -0,0 +1,36 @@
+-
+  In order to test google calendar feature with OpenERP, I import events from
+  a google account and store them in Meetings.
+- |
+  I create a record for the gmail account for which I want to import the contacts.
+- 
+  !record {model: google.login, id: google_login_id0}:
+    user: testmail.openerp@gmail.com
+    password: openerptiny
+- |
+  I login into that account.
+-
+  !python {model: google.login}: |
+    self.login(cr, uid, [ref('google_login_id0')], context)
+- |
+  Now I want to import all the events from all the calendars in the user account.
+- |
+  I select all calendars.
+-
+  !record {model: synchronize.google.import, id: synchronize_google_import_id0}:
+    calendar_name: all
+- |
+  I import the events from the google calendar.
+-
+  !python {model: synchronize.google.import}: |
+    self.import_google(cr, uid, [ref('synchronize_google_import_id0')], context={'calendar':True})
+- |
+  Now I check my meetings are created or not.
+-
+  !python {model: crm.meeting}: |
+    model_obj = self.pool.get('ir.model.data')
+    meeting_ids = self.search(cr, uid, [])
+    model_ids = model_obj.search(cr, uid, [('res_id','in',meeting_ids),('model','=','crm.meeting'),('module','=','synchronize_google')])
+    assert model_ids, 'Meetings not created !'
+    
+    
diff --git a/addons/import_google/test/test_sync_google_contact_import_address.yml b/addons/import_google/test/test_sync_google_contact_import_address.yml
new file mode 100644
index 00000000000..b1a8f9a2e09
--- /dev/null
+++ b/addons/import_google/test/test_sync_google_contact_import_address.yml
@@ -0,0 +1,34 @@
+-
+  In order to test Importing contacts from any google account into OpenERP,
+  I use a gmail account and import the contact details and store them as Partner addresses.
+- |
+  I create a record for the gmail account for which I want to import the contacts.
+- 
+  !record {model: google.login, id: google_login_id0}:
+    user: testmail.openerp@gmail.com
+    password: openerptiny
+- |
+  I login into that account.
+-
+  !python {model: google.login}: |
+    self.login(cr, uid, [ref('google_login_id0')], context)
+- |
+  Now I select from which group I want to get the contact details.
+-
+  !record {model: synchronize.google.import, id: synchronize_google_import_id0}:
+    create_partner: create_address
+    group_name: all
+    calendar_name: all
+- |
+  I import the contacts and I also check if the contact already exists in db and updates the address.
+-
+  !python {model: synchronize.google.import}: |
+    self.import_google(cr, uid, [ref('synchronize_google_import_id0')], context={'contact':True})
+- |
+  I check whether the Contacts are created in Partner address or not.
+-
+  !python {model: res.partner.address}: |
+    addr_obj = self.pool.get('ir.model.data')
+    data_ids = addr_obj.search(cr, uid, [('model','=','res.partner.address'),('module','=','synchronize_google')])
+    assert data_ids, 'Addresses not created !'
+    
\ No newline at end of file
diff --git a/addons/import_google/test/test_sync_google_contact_import_partner.yml b/addons/import_google/test/test_sync_google_contact_import_partner.yml
new file mode 100644
index 00000000000..4eadbf0f100
--- /dev/null
+++ b/addons/import_google/test/test_sync_google_contact_import_partner.yml
@@ -0,0 +1,36 @@
+-
+  In order to test Importing contacts from any google account into OpenERP,
+  I use a gmail account and import the contact details and create Partners.
+- |
+  I create a record for the gmail account for which I want to import the contacts.
+-
+  !record {model: google.login, id: google_login_id1}:
+    user: testmail.openerp@gmail.com
+    password: openerptiny
+- |
+  I login into that account.
+-
+  !python {model: google.login}: |
+    self.login(cr, uid, [ref('google_login_id1')], context)
+- |
+  Now I select from which group I want to get the contact details and I want to create partner for all contacts.
+-
+  !record {model: synchronize.google.import, id: synchronize_google_import_id1}:
+    create_partner: create_all
+    group_name: all
+- |
+  I import the contacts.
+-
+  !python {model: synchronize.google.import}: |
+    self.import_google(cr, uid, [ref('synchronize_google_import_id1')], context={'contact':True})
+- |
+  I check whether the Partners are created or not.
+-
+  !python {model: res.partner.address }: |
+    addr_obj = self.pool.get('ir.model.data')
+    addr_ids = addr_obj.search(cr, uid, [])
+    data_ids = addr_obj.search(cr, uid, [('model','=','res.partner.address'),('module','=','synchronize_google')])
+    address_ids = map(lambda x: x.res_id, [child for child in addr_obj.browse(cr, uid, data_ids) if child.res_id])
+    partner_ids = map(lambda x: x.partner_id.id, [addr for addr in self.browse(cr, uid, address_ids) if addr.partner_id])
+    assert partner_ids, 'Partners not created !'
+    
\ No newline at end of file
diff --git a/addons/import_google/wizard/__init__.py b/addons/import_google/wizard/__init__.py
new file mode 100644
index 00000000000..41c118a0ef3
--- /dev/null
+++ b/addons/import_google/wizard/__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 import_google
+import import_google_data
+import google_import_message
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/wizard/google_import_message.py b/addons/import_google/wizard/google_import_message.py
new file mode 100644
index 00000000000..5e2b2b6f4b1
--- /dev/null
+++ b/addons/import_google/wizard/google_import_message.py
@@ -0,0 +1,42 @@
+# -*- 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
+from osv import fields
+
+
+class google_import_message(osv.osv):
+    """Import Message"""
+    
+    _name = "google.import.message"
+    _description = "Import Message"
+    _columns = {
+        'name': fields.text('Message', readonly=True),
+        }
+
+    def default_get(self, cr, uid, fields, context=None):
+        if context == None:
+            context = {}
+        res = super(google_import_message, self).default_get(cr, uid, fields, context=context)
+        res.update({'name': context.get('message')})
+        return res
+
+google_import_message()
diff --git a/addons/import_google/wizard/google_import_message_view.xml b/addons/import_google/wizard/google_import_message_view.xml
new file mode 100644
index 00000000000..0ea8b15f286
--- /dev/null
+++ b/addons/import_google/wizard/google_import_message_view.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <!-- Import Message Form View -->
+        <record model="ir.ui.view" id="view_google_import_message_form">
+            <field name="name">google.import.message.form</field>
+            <field name="model">google.import.message</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Import Google Data">
+                    <group colspan="4" col="4" width="300">
+                        <field name='name' nolabel='1'/>
+                    </group>
+                    <separator string="" colspan="4"/>
+                    <group colspan="4">
+                        <group colspan="2"/>
+                        <group colspan="2">
+                            <button  icon="gtk-ok" special="cancel" string="_Ok"/>
+                        </group>        
+                    </group>
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/import_google/wizard/import_google.py b/addons/import_google/wizard/import_google.py
new file mode 100644
index 00000000000..87155c806c6
--- /dev/null
+++ b/addons/import_google/wizard/import_google.py
@@ -0,0 +1,355 @@
+# -*- 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 re
+import urllib
+import dateutil
+import pytz
+from dateutil import *
+from pytz import timezone
+from datetime import datetime
+import time
+from osv import *
+try:
+    import gdata
+    import gdata.contacts.service
+    import gdata.calendar.service
+    import gdata.contacts
+    import gdata.calendar
+except ImportError:
+    raise osv.except_osv(_('Google Contacts Import Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list'))
+from import_base.import_framework import *
+from import_base.mapper import *
+
+class google_import(import_framework):
+
+    gd_client = False
+    calendars = False
+    contact = False
+    DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S"
+    TABLE_CONTACT = 'Contact'
+    TABLE_ADDRESS ='Address'
+    TABLE_EVENT = 'Events'
+
+    def initialize(self):
+        google = self.obj.pool.get('google.login')
+        self.external_id_field = 'Id'
+        self.gd_client = google.google_login(self.context.get('user'),
+                                       self.context.get('password'),
+                                        self.context.get('instance'))
+
+        if self.context.get('instance') and self.context.get('instance') == 'contact':
+            self.contact = self.context.get('contact')
+        if self.context.get('instance') and self.context.get('instance') == 'calendar':
+            self.calendars = self.context.get('calendars')
+
+    def get_mapping(self):
+        return {
+            self.TABLE_EVENT: self.get_event_mapping(),
+            self.TABLE_CONTACT: self.get_contact_mapping(),
+            self.TABLE_ADDRESS: self.get_address_mapping(),
+        }
+
+    def get_data(self, table):
+        data_fetching_function = {
+              self.TABLE_CONTACT: self.get_contact,
+              self.TABLE_ADDRESS: self.get_contact,
+              self.TABLE_EVENT: self.get_events,
+        }
+
+        return data_fetching_function.get(table)()
+
+
+    def _get_tinydates(self, stime, etime, au_tz):
+        stime = dateutil.parser.parse(stime)
+        etime = dateutil.parser.parse(etime)
+        try:
+            au_dt = au_tz.normalize(stime.replace(tzinfo=pytz.utc).astimezone(au_tz))
+            timestring = datetime.datetime(*au_dt.timetuple()[:6]).strftime('%Y-%m-%d %H:%M:%S')
+            au_dt = au_tz.normalize(etime.replace(tzinfo=pytz.utc).astimezone(au_tz))
+            timestring_end = datetime.datetime(*au_dt.timetuple()[:6]).strftime('%Y-%m-%d %H:%M:%S')
+        except:
+            timestring = datetime.datetime(*stime.timetuple()[:6]).strftime('%Y-%m-%d %H:%M:%S')
+            timestring_end = datetime.datetime(*etime.timetuple()[:6]).strftime('%Y-%m-%d %H:%M:%S')
+        return (timestring, timestring_end)
+
+    def _get_rules(self, datas):
+        new_val = {}
+        if  datas['FREQ'] == 'WEEKLY' and datas.get('BYDAY'):
+            for day in datas['BYDAY'].split(','):
+                new_val[day.lower()] = True
+            datas.pop('BYDAY')
+
+        if datas.get('UNTIL'):
+            until = parser.parse(''.join((re.compile('\d')).findall(datas.get('UNTIL'))))
+            new_val['end_date'] = until.strftime('%Y-%m-%d')
+            new_val['end_type'] = 'end_date'
+            datas.pop('UNTIL')
+
+        if datas.get('COUNT'):
+            new_val['count'] = datas.get('COUNT')
+            new_val['end_type'] = 'count'
+            datas.pop('COUNT')
+
+        if datas.get('INTERVAL'):
+            new_val['interval'] = datas.get('INTERVAL')
+        else:
+            new_val['interval'] = 1
+
+        if datas.get('BYMONTHDAY'):
+            new_val['day'] = datas.get('BYMONTHDAY')
+            datas.pop('BYMONTHDAY')
+            new_val['select1'] = 'date'
+
+        if datas.get('BYDAY'):
+            d = datas.get('BYDAY')
+            if '-' in d:
+                new_val['byday'] = d[:2]
+                new_val['week_list'] = d[2:4].upper()
+            else:
+                new_val['byday'] = d[:1]
+                new_val['week_list'] = d[1:3].upper()
+            new_val['select1'] = 'day'
+
+        if datas.get('BYMONTH'):
+            new_val['month_list'] = datas.get('BYMONTH')
+            datas.pop('bymonth')
+        return new_val
+
+
+    def _get_repeat_status(self, str_google):
+        rrule = str_google[str_google.find('FREQ'):str_google.find('\nBEGIN')]
+        status = {}
+        for rule in rrule.split(';'):
+            status[rule.split('=')[0]] = rule.split('=')[-1:] and rule.split('=')[-1:][0] or ''
+        rules = self._get_rules(status)
+        if status.get('FREQ') == 'WEEKLY':
+            status.update({'rrule_type': 'weekly'})
+            status.pop('FREQ')
+        elif status.get('FREQ') == 'DAILY':
+            status.update({'rrule_type': 'daily'})
+            status.pop('FREQ')
+        elif status.get('FREQ') == 'MONTHLY':
+            status.update({'rrule_type': 'monthly'})
+            status.pop('FREQ')
+        elif status.get('FREQ') == 'YEARLY':
+            status.update({'rrule_type': 'yearly'})
+            status.pop('FREQ')
+        status.update(rules)
+        return status
+
+
+    def _get_repeat_dates(self, x):
+        if len(x) > 4:
+            if x[3].startswith('BY'):
+                zone_time = x[4].split('+')[-1:][0].split(':')[0][:4]
+            else:
+                zone_time = x[3].split('+')[-1:][0].split(':')[0][:4]
+        else:
+            zone_time = x[2].split('+')[-1:][0].split(':')[0][:4]
+        tz_format = zone_time[:2]+':'+zone_time[2:]
+        repeat_start = x[1].split('\n')[0].split(':')[1]
+        repeat_end = x[2].split('\n')[0].split(':')[1]
+        o = repeat_start.split('T')
+        repeat_start = str(o[0][:4]) + '-' + str(o[0][4:6]) + '-' + str(o[0][6:8])
+        if len(o) == 2:
+            repeat_start += ' ' + str(o[1][:2]) + ':' + str(o[1][2:4]) + ':' + str(o[1][4:6])
+        else:
+            repeat_start += ' ' + '00' + ':' + '00' + ':' + '00'
+        p = repeat_end.split('T')
+        repeat_end = str(p[0][:4]) + '-' + str(p[0][4:6]) + '-' + str(p[0][6:8])
+        if len(p) == 2:
+            repeat_end += ' ' + str(p[1][:2]) + ':' + str(p[1][2:4]) + ':' + str(p[1][4:6])
+        else:
+            repeat_end += ' ' + '00' + ':' + '00' + ':' + '00'
+        return (repeat_start, repeat_end, tz_format)
+
+    def get_events(self):
+        if 'tz' in self.context and self.context['tz']:
+            time_zone = self.context['tz']
+        else:
+            time_zone = tools.get_server_timezone()
+        au_tz = timezone(time_zone)
+        event_vals = []
+        for cal in self.calendars:
+            events_query = gdata.calendar.service.CalendarEventQuery(user=urllib.unquote(cal.split('/')[~0]))
+            events_query.start_index = 1
+            events_query.max_results = 1000
+            event_feed = self.gd_client.GetCalendarEventFeed(events_query.ToUri())
+            for feed in event_feed.entry:
+                event = {
+                    'recurrency': False,
+                    'end_date' : False,
+                    'end_type' : False,
+                    'byday': 0,
+                    'count' : 0,
+                    'interval': 1,
+                    'day': False,
+                    'select1': False,
+                    'week_list': "",
+                    'month_list': False,
+                    'rrule_type': False,
+                }
+
+                timestring = timestring_end = datetime.datetime.now().strftime(self.DATETIME_FORMAT)
+                if feed.when:
+                    timestring, timestring_end = self._get_tinydates(feed.when[0].start_time, feed.when[0].end_time, au_tz)
+                else:
+                    x = feed.recurrence.text.split(';')
+                    repeat_status = self._get_repeat_status(feed.recurrence.text)
+                    repeat_start, repeat_end, zone_time = self._get_repeat_dates(x)
+                    timestring = time.strftime('%Y-%m-%d %H:%M:%S', time.strptime(repeat_start, "%Y-%m-%d %H:%M:%S"))
+                    timestring_end = time.strftime('%Y-%m-%d %H:%M:%S', time.strptime(repeat_end, "%Y-%m-%d %H:%M:%S"))
+                    if repeat_status:
+                        repeat_status.update({'recurrency': True})
+                        event.update(repeat_status)
+
+                event.update({'id' : feed.id.text,
+                              'DateStart': timestring,
+                              'DateEnd': timestring_end,
+                              'Category':event_feed.title.text,
+                              'Name': feed.title.text or 'No title',
+                              'Description': feed.content.text,
+                              })
+                event_vals.append(event)
+        return event_vals
+
+
+    def get_event_category(self, val, name):
+        fields = ['name', 'object_id']
+        nameid = 'event_category_'+name
+        data = [name, 'crm.meeting']
+        return self.import_object(fields, data, 'crm.case.categ', "crm_case_categ", nameid, [('name', 'ilike', name)])
+
+    def get_rec(self, val):
+        if val.get("recurrency"):
+            return "1"
+        return "0"
+
+    def get_event_mapping(self):
+        return {
+            'model': 'crm.meeting',
+            'map': {
+                    'id': 'id',
+                    'name': 'Name',
+                    'description': 'Description',
+                    'email_from': 'Email',
+                    'date': 'DateStart',
+                    'date_deadline': 'DateEnd',
+                    'categ_id/id': call(self.get_event_category, value('Category')),
+                    'recurrency': self.get_rec,
+                    'end_date' : 'end_date',
+                    'end_type' : 'end_type',
+                    'byday':'byday',
+                    'count' : 'count',
+                    'interval': 'interval',
+                    'day': 'day',
+                    'select1': 'date',
+                    'week_list': 'week_list',
+                    'month_list':'month_list',
+                    'rrule_type': 'rrule_type',
+                }
+        }
+
+
+    def get_contact(self):
+        table = self.context.get('table')[0]
+        datas = []
+        if self.context.get('group_name'):
+            query = gdata.contacts.service.ContactsQuery()
+            query.group = self.context.get('group_name')
+            self.contact = self.gd_client.GetContactsFeed(query.ToUri())
+        else:
+            self.contact = self.gd_client.GetContactsFeed()
+        while self.contact:
+            for entry in self.contact.entry:
+                data = {}
+                data['id'] = entry.id.text
+                name = tools.ustr(entry.title.text)
+                if name == "None":
+                    name = entry.email[0].address
+                data['name'] = name
+                emails = ','.join(email.address for email in entry.email)
+                data['email'] = emails
+                if table == 'Contact':
+                    data.update({'customer': str(self.context.get('customer')),
+                                 'supplier': str(self.context.get('supplier'))})
+                if entry.organization:
+                    if entry.organization.org_name:
+                        data.update({'company': entry.organization.org_name.text})
+                    if entry.organization.org_title:
+                        data.update ({'function': entry.organization.org_title.text})
+                if entry.phone_number:
+                    for phone in entry.phone_number:
+                        if phone.rel == gdata.contacts.REL_WORK:
+                            data['phone'] = phone.text
+                        if phone.rel == gdata.contacts.PHONE_MOBILE:
+                            data['mobile'] = phone.text
+                        if phone.rel == gdata.contacts.PHONE_WORK_FAX:
+                            data['fax'] = phone.text
+                datas.append(data)
+            next = self.contact.GetNextLink()
+            self.contact = next and self.gd_client.GetContactsFeed(next.href) or None
+        return datas
+
+
+
+    def get_contact_mapping(self):
+        return {
+            'model': 'res.partner',
+            'dependencies': [self.TABLE_ADDRESS],
+            'map': {
+                'id':'id',
+                'name': value('company', fallback='name'),
+                'customer': 'customer',
+                'supplier': 'supplier',
+                'address/id': ref(self.TABLE_ADDRESS, 'id'),
+                }
+            }
+
+    def get_partner_id(self, val):
+        partner_id = False
+        company_pool = self.obj.pool.get('res.partner')
+        if 'company' in val:
+            partner_ids = company_pool.search(self.cr, self.uid, [('name', '=', val.get('company'))])
+            return partner_ids and partner_ids[0] or False
+        contact = self.xml_id_exist(self.TABLE_CONTACT, val.get('id'))
+        if contact:
+            partner_id = self.get_mapped_id(self.TABLE_CONTACT, val.get('id'))
+        return partner_id
+
+    def get_address_mapping(self):
+        return {
+            'model': 'res.partner.address',
+            'dependencies': [],
+            'map': {
+                'id':'id',
+                'partner_id/.id': self.get_partner_id,
+                'name': 'name',
+                'city': 'city',
+                'phone': 'phone',
+                'mobile': 'mobile',
+                'email': 'email',
+                'fax': 'fax',
+                'function': 'function'
+                }
+
+        }
diff --git a/addons/import_google/wizard/import_google_data.py b/addons/import_google/wizard/import_google_data.py
new file mode 100644
index 00000000000..776cb578f08
--- /dev/null
+++ b/addons/import_google/wizard/import_google_data.py
@@ -0,0 +1,182 @@
+# -*- 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 datetime
+
+try:
+    import gdata
+    import gdata.contacts.service
+    import gdata.contacts
+except ImportError:
+    raise osv.except_osv(_('Google Contacts Import Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list'))
+from osv import fields
+from osv import osv
+from tools.translate import _
+from import_google import google_import
+
+
+class google_login_contact(osv.osv_memory):
+    
+    _inherit = 'google.login'
+    
+    def _get_next_action(self, cr, uid, context=None):
+        data_obj = self.pool.get('ir.model.data')
+        data_id = data_obj._get_id(cr, uid, 'import_google', 'view_synchronize_google_contact_import_form')
+        view_id = False
+        if context.get('contact'):
+             data_id = data_obj._get_id(cr, uid, 'import_google', 'view_synchronize_google_contact_import_form')
+        if  context.get('calendar'):
+             data_id = data_obj._get_id(cr, uid, 'import_google', 'view_synchronize_google_calendar_import_form')     
+        if data_id:
+            view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
+        value = {
+            'name': _('Import google'),
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'synchronize.google.import',
+            'view_id': False,
+            'context': context,
+            'views': [(view_id, 'form')],
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+        }
+        return value
+    
+google_login_contact()
+
+class synchronize_google(osv.osv_memory):
+    _name = 'synchronize.google.import'
+
+    def _get_group(self, cr, uid, context=None):
+        user_obj = self.pool.get('res.users').browse(cr, uid, uid)
+        google=self.pool.get('google.login')
+        if not user_obj.gmail_user or not user_obj.gmail_password:
+            raise osv.except_osv(_('Warning !'), _("No Google Username or password Defined for user.\nPlease define in user view"))
+        gd_client = google.google_login(user_obj.gmail_user,user_obj.gmail_password,type='group')
+        if not gd_client:
+            return [('failed', 'Connection to google fail')]
+
+        res = []
+        query = gdata.contacts.service.GroupsQuery(feed='/m8/feeds/groups/default/full')
+        if gd_client:
+            groups = gd_client.GetFeed(query.ToUri())
+            for grp in groups.entry:
+                res.append((grp.id.text, grp.title.text))
+        res.append(('all','All Groups'))
+        return res
+
+    def _get_calendars(self, cr, uid, context=None):
+        user_obj = self.pool.get('res.users').browse(cr, uid, uid)
+        google = self.pool.get('google.login')
+        res = []
+        try:
+            gd_client = google.google_login(user_obj.gmail_user, user_obj.gmail_password, type='calendar')
+            calendars = gd_client.GetAllCalendarsFeed()
+            for cal in calendars.entry:
+                res.append((cal.id.text, cal.title.text))
+        except Exception, e:
+            return [('failed', 'Connection to google fail')]
+        res.append(('all', 'All Calendars'))
+        return res
+
+    _columns = {
+        'create_partner': fields.selection([('create_all','Create partner for each contact'),('create_address','Import only address')],'Options'),
+        'customer': fields.boolean('Customer', help="Check this box to set newly created partner as Customer."),
+        'supplier': fields.boolean('Supplier', help="Check this box to set newly created partner as Supplier."),
+        'group_name': fields.selection(_get_group, "Group Name", size=32,help="Choose which group to import, By default it takes all."),
+        'calendar_name': fields.selection(_get_calendars, "Calendar Name", size=32),
+     }
+
+    _defaults = {
+        'create_partner': 'create_all',
+        'group_name': 'all',
+        'calendar_name': 'all',
+    }
+
+    def import_google(self, cr, uid, ids, context=None):
+        if context == None:
+            context = {}
+        if not ids:
+            return {'type': 'ir.actions.act_window_close'}
+        obj = self.browse(cr, uid, ids, context=context)[0]
+        cust = obj.customer
+        sup = obj.supplier
+        tables=[]
+        user_obj = self.pool.get('res.users').browse(cr, uid, uid)
+        
+        gmail_user = user_obj.gmail_user
+        gmail_pwd = user_obj.gmail_password
+        google = self.pool.get('google.login')
+        if not gmail_user or not gmail_pwd:
+            raise osv.except_osv(_('Error'), _("Invalid login detail !\n Specify Username/Password."))
+        
+        if context.get('contact'):
+            msg = "  You're Contact are import in background, a email will be send when the process is finished to %s"%(user_obj.gmail_user)
+            gd_client = google.google_login(gmail_user, gmail_pwd, type='contact')
+            if not gd_client:
+                raise osv.except_osv(_('Error'), _("Please specify correct user and password !"))        
+            if obj.group_name not in ['all']:
+                context.update({ 'group_name': obj.group_name})
+            if obj.create_partner=='create_all':
+                tables.append('Contact')    
+            else:    
+                tables.append('Address')
+            context.update({'user': gmail_user,
+                            'password': gmail_pwd,
+                            'instance': 'contact',
+                            'table':tables,
+                            'customer':cust,
+                            'supplier':sup})
+              
+        elif context.get('calendar'):
+            msg = "  You're Meeting are import in background, a email will be send when the process is finished to %s"%(user_obj.gmail_user)
+         
+            tables.append('Events')
+            current_rec = self.browse(cr, uid, ids, context=context)
+            calendars = False
+            for rec in current_rec:
+                if rec.calendar_name != 'all':
+                    calendars = [rec.calendar_name]
+                else:
+                    calendars = map(lambda x: x[0], [cal for cal in self._get_calendars(cr, uid, context) if cal[0] != 'all'])
+            context.update({'user': gmail_user,
+                        'password': gmail_pwd,
+                        'calendars': calendars,
+                        'instance': 'calendar'})
+        imp = google_import(self, cr, uid,'import_google' , "synchronize_google", gmail_user, context)
+        imp.set_table_list(tables)
+        imp.start()
+        context.update({'message': msg})
+        obj_model = self.pool.get('ir.model.data')
+        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_google_import_message_form')])
+        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        return {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'google.import.message',
+                'views': [(resource_id,'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+               'context': context,
+            }
+
+synchronize_google()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
new file mode 100644
index 00000000000..b35e97645e7
--- /dev/null
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_synchronize_google_contact_import_form">
+            <field name="name">synchronize.base.form</field>
+            <field name="model">synchronize.google.import</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Import contacts from a google account">
+                    <group colspan="4" col="4" width="430">
+                       <field name="group_name" colspan="4"/>
+                       <separator string="Import Options" colspan="4"/>
+                       <field name="create_partner" colspan="4"/>
+                       <newline/>
+                       <group attrs="{'invisible': [('create_partner','!=','create_all')]}" colspan="4" col="4">
+                            <separator string="Partner status for this group:" colspan="4"/>
+                            <field name="customer" colspan="4"/>
+                            <field name="supplier"  colspan="4"/>
+                       </group>
+                    </group>
+                    <separator string="" colspan="4"/>
+                    <group colspan="4" col="4">
+                        <group colspan="2" col="2"/>
+                        <group colspan="2" col="2">
+                            <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                            <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+"/>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+
+
+        <record model="ir.ui.view" id="view_synchronize_google_calendar_import_form">
+            <field name="name">synchronize.google.calendar.form</field>
+            <field name="model">synchronize.google.import</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Import Google Calendar Events">
+                    <group colspan="4" col="4" width="320">
+                       <field name="calendar_name" />
+                    </group>
+                    <separator string="" colspan="4"/>
+                    <group colspan="4" col="4">
+                        <group colspan="2" col="2"/>
+                        <group colspan="2" col="2">
+                            <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                            <button name="import_google" string="_Import Events" type="object" icon="terp-calendar"/>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <!--
+            Login Action
+        -->
+        <record model="ir.actions.act_window" id="act_google_login_form">
+          <field name="name">Import Google Calendar</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">google.login</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+          <field name="context">{'calendar':True}</field>
+          <field name="view_id" ref="google_base_account.view_google_login_form" />
+        </record>
+
+        <record model="ir.actions.act_window" id="act_google_login_contact_form">
+          <field name="name">Import Google Contacts</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">google.login</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+          <field name="context">{'contact':True}</field>
+          <field name="view_id" ref="google_base_account.view_google_login_form" />
+        </record>
+
+        <menuitem id="menu_sync_contact"
+                  parent="base.menu_address_book"
+                  action="act_google_login_contact_form"
+                  sequence="40" />
+
+        <menuitem id="menu_sync_calendar"
+                  parent="crm.menu_meeting_sale"
+                  action="act_google_login_form"
+                  sequence="20" />
+
+    </data>
+</openerp>
diff --git a/addons/knowledge/installer.py b/addons/knowledge/installer.py
index e74c37f80d0..0f6b29597de 100644
--- a/addons/knowledge/installer.py
+++ b/addons/knowledge/installer.py
@@ -21,8 +21,7 @@
 from osv import fields, osv
 
 class knowledge_installer(osv.osv_memory):
-    _name = 'knowledge.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         # Knowledge Management
@@ -39,11 +38,11 @@ class knowledge_installer(osv.osv_memory):
                  "to keep track of business knowledge and share it with "
                  "and  between your employees."),
         # Content templates
-        'wiki_faq':fields.boolean('Internal FAQ',
+        'wiki_faq':fields.boolean('Template: Internal FAQ',
             help="Creates a skeleton internal FAQ pre-filled with "
                  "documentation about OpenERP's Document Management "
                  "System."),
-        'wiki_quality_manual':fields.boolean('Quality Manual',
+        'wiki_quality_manual':fields.boolean('Template: Quality Manual',
             help="Creates an example skeleton for a standard quality manual."),
         }
     _defaults = {
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index 068fa9b413b..d9a4a45df66 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -2,59 +2,22 @@
   <data>
     <record id="view_knowledge_installer" model="ir.ui.view">
       <field name="name">knowledge.installer.view</field>
-      <field name="model">knowledge.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes">
-            <attribute name="string">Knowledge Application Configuration</attribute>
-          </form>
-
-          <separator string="title" position="attributes">
-            <attribute name="string"
-                       >Configure Your Knowledge Application</attribute>
-          </separator>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                      <attribute name='string'></attribute>
-                  </xpath>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">Share information within the company with these specific Addons.</attribute>
+          <xpath expr="//group[@name='knowledge']" position="replace">
+            <newline/>
+            <separator  string="Knowledge Management Features" colspan="4" />
+            <field name="document_ftp" />
+            <field name="document_webdav" />
+            <field name="wiki" />
+            <field name="wiki_faq" />
+            <field name="wiki_quality_manual" />
           </xpath>
-          <group colspan="8" position="replace">
-          <group colspan="4">
-            <field name="document_ftp"/>
-            <field name="document_webdav"/>
-            <field name="wiki"/>
-            <separator string="Content templates" colspan="4"/>
-            <field name="wiki_faq"/>
-            <field name="wiki_quality_manual"/>
-          </group>
-          </group>
-         <xpath expr="//button[@string='Install Modules']" position="attributes">
-              <attribute name="string">Configure</attribute>
-         </xpath>
         </data>
       </field>
     </record>
-
-    <record id="action_knowledge_installer" model="ir.actions.act_window">
-      <field name="name">Knowledge Application Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">knowledge.installer</field>
-      <field name="view_id" ref="view_knowledge_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="knowledge_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_knowledge_installer"/>
-      <field name="sequence">3</field>
-      <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
-            <field name="restart">always</field>
-    </record>
-
   </data>
 </openerp>
diff --git a/addons/l10n_be/i18n/de.po b/addons/l10n_be/i18n/de.po
index a6dec54c06d..ca6658cb201 100644
--- a/addons/l10n_be/i18n/de.po
+++ b/addons/l10n_be/i18n/de.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: 2011-05-19 19:08+0000\n"
-"Last-Translator: Daniel Fai <Unknown>\n"
+"PO-Revision-Date: 2011-06-24 17:11+0000\n"
+"Last-Translator: Marco Dieckhoff <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-05-20 04:34+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-06-25 04:58+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
@@ -42,7 +42,7 @@ msgstr "Umsatzsteuernummer ist keinem Partner zugeordnet."
 #. module: l10n_be
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:155
@@ -149,6 +149,7 @@ msgstr "Jährlicher Bericht über umsatzsteuerpflichtige Kunden"
 #: model:ir.module.module,shortdesc:l10n_be.module_meta_information
 msgid "Belgium - Plan Comptable Minimum Normalise"
 msgstr ""
+"Belgien - Genormter minimaler Kontenrahmen (Plan Comptable Minimum Normalise)"
 
 #. module: l10n_be
 #: view:partner.vat.list:0
@@ -266,7 +267,7 @@ msgstr "Anzahl"
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
 msgid "Is Last Declaration"
-msgstr ""
+msgstr "Letzte Erklärung"
 
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat
@@ -304,7 +305,7 @@ msgstr ""
 #. module: l10n_be
 #: field:vat.listing.clients,turnover:0
 msgid "Turnover"
-msgstr ""
+msgstr "Umsatz"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
diff --git a/addons/l10n_be/l10n_be_wizard.xml b/addons/l10n_be/l10n_be_wizard.xml
index 0e691260425..5473499d971 100644
--- a/addons/l10n_be/l10n_be_wizard.xml
+++ b/addons/l10n_be/l10n_be_wizard.xml
@@ -4,7 +4,8 @@
 
     <record id="config_call_account_template" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="restart">onskip</field>
+        <field name="category_id" ref="account.category_accounting_configuration"/>
+        <field name="type">special</field>
     </record>
 
     </data>
diff --git a/addons/l10n_br/data/l10n_br_account_chart_template.xml b/addons/l10n_br/data/l10n_br_account_chart_template.xml
index dd714bacab8..819c4a8456a 100644
--- a/addons/l10n_br/data/l10n_br_account_chart_template.xml
+++ b/addons/l10n_br/data/l10n_br_account_chart_template.xml
@@ -19,7 +19,8 @@
     This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
             <field name="action_id" ref="account.action_wizard_multi_chart"/>
             <field name="state">open</field>
-            <field name="restart">onskip</field>
+            <field name="type">special</field>
+            <field name="category_id" ref="account.category_accounting_configuration"/>
         </record>
 	
 	</data>
diff --git a/addons/l10n_ca/l10n_ca_wizard.xml b/addons/l10n_ca/l10n_ca_wizard.xml
index ea4f3a94052..ada59135971 100644
--- a/addons/l10n_ca/l10n_ca_wizard.xml
+++ b/addons/l10n_ca/l10n_ca_wizard.xml
@@ -8,6 +8,7 @@
 	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
 	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
 	        <field name="state">open</field>
+	        <field name="category_id" ref="account.category_accounting_configuration"/>
     	</record>
 
     </data>
diff --git a/addons/l10n_ch/invoice.py b/addons/l10n_ch/invoice.py
index 07c62d43d51..4896931b77b 100644
--- a/addons/l10n_ch/invoice.py
+++ b/addons/l10n_ch/invoice.py
@@ -73,7 +73,7 @@ class account_invoice(osv.osv):
             help='The partner bank account to pay\nKeep empty to use the default'
             ),
         ### Amount to pay
-        'amount_to_pay': fields.function(_amount_to_pay, method=True,
+        'amount_to_pay': fields.function(_amount_to_pay,
             type='float', string='Amount to be paid',
             help='The amount which should be paid at the current date\n' \
                     'minus the amount which is already in payment order'),
@@ -84,7 +84,7 @@ class account_invoice(osv.osv):
     ## @param user res.user.id that is currently loged
     ## @parma ids invoices id
     ## @return a boolean True if valid False if invalid
-    def _check_bvr(self, cr, uid, ids):
+    def _check_bvr(self, cr, uid, ids, context=None):
         """
         Function to validate a bvr reference like :
         0100054150009>132000000000000000000000014+ 1300132412>
@@ -111,7 +111,7 @@ class account_invoice(osv.osv):
     ## @param user res.user.id that is currently loged
     ## @parma ids invoices id
     ## @return a boolean True if valid False if invalid
-    def _check_reference_type(self, cursor, user, ids):
+    def _check_reference_type(self, cursor, user, ids, context=None):
         """Check the customer invoice reference type depending
         on the BVR reference type and the invoice partner bank type"""
         for invoice in self.browse(cursor, user, ids):
@@ -196,4 +196,4 @@ class account_tax_code(osv.osv):
 
 account_tax_code()
 
-# 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/l10n_ch/wizard.xml b/addons/l10n_ch/wizard.xml
index 123f062a670..14e70313501 100644
--- a/addons/l10n_ch/wizard.xml
+++ b/addons/l10n_ch/wizard.xml
@@ -7,6 +7,7 @@
                 Accounts/Generate Chart of Accounts from a Chart Template.</field>
             <field name="action_id" ref="account.action_wizard_multi_chart"/>
             <field name="sequence">4</field>
+            <field name="category_id" ref="account.category_accounting_configuration"/>
         </record>
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/l10n_cn/i18n/tr.po b/addons/l10n_cn/i18n/tr.po
new file mode 100644
index 00000000000..a53ecd45663
--- /dev/null
+++ b/addons/l10n_cn/i18n/tr.po
@@ -0,0 +1,55 @@
+# Turkish 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-07 05:27+0000\n"
+"PO-Revision-Date: 2011-06-08 10:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: l10n_cn
+#: model:ir.module.module,shortdesc:l10n_cn.module_meta_information
+msgid "中国会计科目表"
+msgstr "中国会计科目表"
+
+#. module: l10n_cn
+#: model:ir.module.module,description:l10n_cn.module_meta_information
+msgid ""
+"\n"
+"        添加中文省份数据\n"
+"        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
+"    "
+msgstr ""
+"\n"
+"        添加中文省份数据\n"
+"        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
+"    "
+
+#. module: l10n_cn
+#: model:ir.actions.todo,note:l10n_cn.config_call_account_template_cn_chart
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Bir Tablo Şablonundan bir Hesap Tablosu oluşturun. Firma adını girmeniz, "
+"hesaplarınızın ve banka hesaplarınızın kodlarının oluşturulması için rakam "
+"sayısını, yevmiyeleri oluşturmak için para birimini girmeniz istenecektir. "
+"Böylece sade bir hesap planı oluşturumuş olur.\n"
+"\t Bu sihirbaz, Mali Yönetim/Yapılandırma/Mali Muhasebe/Mali Hesaplar/Tablo "
+"Şablonundan Hesap planı Oluşturma menüsünden çalıştırılan sihirbaz ile "
+"aynıdır."
diff --git a/addons/l10n_cn/l10n_chart_cn_wizard.xml b/addons/l10n_cn/l10n_chart_cn_wizard.xml
index adcb5440ce5..0ddd62716b2 100644
--- a/addons/l10n_cn/l10n_chart_cn_wizard.xml
+++ b/addons/l10n_cn/l10n_chart_cn_wizard.xml
@@ -8,6 +8,7 @@
 	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
 	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
 	        <field name="state">open</field>
+	        <field name="category_id" ref="account.category_accounting_configuration"/>
     	</record>
 
     </data>
diff --git a/addons/l10n_cr/l10n_wizard.xml b/addons/l10n_cr/l10n_wizard.xml
index 0e691260425..26a82eb22ce 100644
--- a/addons/l10n_cr/l10n_wizard.xml
+++ b/addons/l10n_cr/l10n_wizard.xml
@@ -4,7 +4,8 @@
 
     <record id="config_call_account_template" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="restart">onskip</field>
+        <field name="type">special</field>
+        <field name="category_id" ref="account.category_accounting_configuration"/>
     </record>
 
     </data>
diff --git a/addons/l10n_de/l10n_de_wizard.xml b/addons/l10n_de/l10n_de_wizard.xml
index 63a92fe8ae2..6512d0ab40d 100644
--- a/addons/l10n_de/l10n_de_wizard.xml
+++ b/addons/l10n_de/l10n_de_wizard.xml
@@ -7,6 +7,7 @@
 	        <field name="note">Der Assistent generiert einen Kontenplan auf Basis eines Templates (Vorlage). Sie werden aufgefordert den Namen der Firma einzugeben, sowie die entsprechende Kontenvorlage zu wählen. Ausserdem können Sie für die Initialisierung der Journale die gewünschte Stellenanzahl der Konten, sowie die Hauptwährung Ihres Betriebes auswählen. Dieser Assistent ist identisch mit dem Open ERP Menü Finanzen/Konfiguration/Finanzkonten/Erzeuge Konten aus Vorlage.</field>
 	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
 	        <field name="state">open</field>
+	        <field name="category_id" ref="account.category_accounting_configuration"/>
     	</record>
 
     </data>
diff --git a/addons/l10n_ec/i18n/tr.po b/addons/l10n_ec/i18n/tr.po
new file mode 100644
index 00000000000..c561f10beea
--- /dev/null
+++ b/addons/l10n_ec/i18n/tr.po
@@ -0,0 +1,54 @@
+# Turkish 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-07 06:01+0000\n"
+"PO-Revision-Date: 2011-06-08 10:16+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: l10n_ec
+#: model:ir.module.module,shortdesc:l10n_ec.module_meta_information
+msgid "Ecuador - Accounting Chart"
+msgstr "Ekvator - Hesap Planları"
+
+#. module: l10n_ec
+#: model:ir.module.module,description:l10n_ec.module_meta_information
+msgid ""
+"\n"
+"    This is the base module to manage the accounting chart for Ecuador in "
+"OpenERP.\n"
+"    "
+msgstr ""
+"\n"
+"    Ekvator için hesap tablolarını yönetmek için temel OpenERP modülü.\n"
+"    "
+
+#. module: l10n_ec
+#: model:ir.actions.todo,note:l10n_ec.config_call_account_template_ec
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Bir Tablo Şablonundan bir Hesap Tablosu oluşturun. Firma adını girmeniz, "
+"hesaplarınızın ve banka hesaplarınızın kodlarının oluşturulması için rakam "
+"sayısını, yevmiyeleri oluşturmak için para birimini girmeniz istenecektir. "
+"Böylece sade bir hesap planı oluşturumuş olur.\n"
+"\t Bu sihirbaz, Mali Yönetim/Yapılandırma/Mali Muhasebe/Mali Hesaplar/Tablo "
+"Şablonundan Hesap planı Oluşturma menüsünden çalıştırılan sihirbaz ile "
+"aynıdır."
diff --git a/addons/l10n_ec/l10n_chart_ec_wizard.xml b/addons/l10n_ec/l10n_chart_ec_wizard.xml
index 926aeb55995..06026ba0347 100644
--- a/addons/l10n_ec/l10n_chart_ec_wizard.xml
+++ b/addons/l10n_ec/l10n_chart_ec_wizard.xml
@@ -8,6 +8,7 @@
 	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
 	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
 	        <field name="state">open</field>
+	        <field name="category_id" ref="account.category_accounting_configuration"/>
     	</record>
 
     </data>
diff --git a/addons/l10n_es/i18n/tr.po b/addons/l10n_es/i18n/tr.po
new file mode 100644
index 00000000000..9a8c2277421
--- /dev/null
+++ b/addons/l10n_es/i18n/tr.po
@@ -0,0 +1,39 @@
+# Turkish 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-06-08 10:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: l10n_es
+#: model:ir.module.module,shortdesc:l10n_es.module_meta_information
+msgid "Spanish Charts of Accounts (PGCE 2008)"
+msgstr "İspanya Hesap tabloları (PGCE 2008)"
+
+#. module: l10n_es
+#: model:ir.module.module,description:l10n_es.module_meta_information
+msgid ""
+"Spanish Charts of Accounts (PGCE 2008)\n"
+"\n"
+"* Defines the following chart of account templates:\n"
+"        * Spanish General Chart of Accounts 2008.\n"
+"        * Spanish General Chart of Accounts 2008 for small and medium "
+"companies.\n"
+"* Defines templates for sale and purchase VAT.\n"
+"* Defines tax code templates.\n"
+"\n"
+"Note: You should install the l10n_ES_account_balance_report module\n"
+"for yearly account reporting (balance, profit & losses).\n"
+msgstr ""
diff --git a/addons/l10n_es/l10n_es_wizard.xml b/addons/l10n_es/l10n_es_wizard.xml
index 294f0a5e668..d0f89dfc87a 100644
--- a/addons/l10n_es/l10n_es_wizard.xml
+++ b/addons/l10n_es/l10n_es_wizard.xml
@@ -4,7 +4,8 @@
 
         <record id="config_call_account_template" model="ir.actions.todo">
             <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="restart">onskip</field>
+            <field name="type">special</field>
+            <field name="category_id" ref="account.category_accounting_configuration"/>
         </record>
 
     </data>
diff --git a/addons/l10n_fr/l10n_fr_wizard.xml b/addons/l10n_fr/l10n_fr_wizard.xml
index 985c3b81195..0e97d868a52 100644
--- a/addons/l10n_fr/l10n_fr_wizard.xml
+++ b/addons/l10n_fr/l10n_fr_wizard.xml
@@ -4,7 +4,8 @@
 
     <record id="config_call_account_template_fr" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="restart">onskip</field>
+        <field name="type">special</field>
+        <field name="category_id" ref="account.category_accounting_configuration"/>
     </record>
 
     </data>
diff --git a/addons/l10n_gr/i18n/tr.po b/addons/l10n_gr/i18n/tr.po
new file mode 100644
index 00000000000..c5cdf9c74b5
--- /dev/null
+++ b/addons/l10n_gr/i18n/tr.po
@@ -0,0 +1,41 @@
+# Turkish 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-06-08 10:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: l10n_gr
+#: model:ir.module.module,description:l10n_gr.module_meta_information
+msgid "This is the base module to manage the accounting chart for Greece."
+msgstr ""
+"Yunanistan için hesap tablolarını yönetmek için temel OpenERP modülü."
+
+#. module: l10n_gr
+#: model:ir.module.module,shortdesc:l10n_gr.module_meta_information
+msgid "Greece - minimal"
+msgstr ""
+
+#. module: l10n_gr
+#: model:ir.actions.todo,note:l10n_gr.config_call_account_template_gr
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
diff --git a/addons/l10n_gr/l10n_gr_wizard.xml b/addons/l10n_gr/l10n_gr_wizard.xml
index 296c6554b11..7affcffd719 100644
--- a/addons/l10n_gr/l10n_gr_wizard.xml
+++ b/addons/l10n_gr/l10n_gr_wizard.xml
@@ -8,6 +8,7 @@
     This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
             <field name="action_id" ref="account.action_wizard_multi_chart"/>
             <field name="state">open</field>
+            <field name="category_id" ref="account.category_accounting_configuration"/>
         </record>
 
     </data>
diff --git a/addons/l10n_gt/i18n/tr.po b/addons/l10n_gt/i18n/tr.po
new file mode 100644
index 00000000000..d8824301f55
--- /dev/null
+++ b/addons/l10n_gt/i18n/tr.po
@@ -0,0 +1,39 @@
+# Turkish 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-06-08 10:21+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: l10n_gt
+#: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
+msgid "Guatemala - Plan contable general"
+msgstr "Guetemala - Genel Hesap planı"
+
+#. module: l10n_gt
+#: model:ir.actions.todo,note:l10n_gt.config_call_account_template_gt_minimal
+msgid ""
+"Generar la nomenclatura contable a partir de un modelo.  Deberá seleccionar "
+"una compañía, el modelo a utilizar, el número de digitos a usar en la "
+"nomenclatura, la moneda para crear los diarios."
+msgstr ""
+
+#. module: l10n_gt
+#: model:ir.module.module,description:l10n_gt.module_meta_information
+msgid ""
+"Agrega una nomenclatura contable para Guatemala. También icluye impuestos y "
+"la moneda del Quetzal. -- Adds accounting chart for Guatemala.  It also "
+"includes taxes and the Quetzal currency"
+msgstr ""
diff --git a/addons/l10n_gt/l10n_gt_base.xml b/addons/l10n_gt/l10n_gt_base.xml
index 87b1adb72f7..7cc96ba0d23 100644
--- a/addons/l10n_gt/l10n_gt_base.xml
+++ b/addons/l10n_gt/l10n_gt_base.xml
@@ -9,6 +9,7 @@
             <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus, the pure copy of chart Template is generated.
             This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>-->
             <field name="action_id" ref="account.action_wizard_multi_chart"/>
+            <field name="category_id" ref="account.category_accounting_configuration"/>
             <field name="state">open</field>
         </record>
 
diff --git a/addons/l10n_in/i18n/tr.po b/addons/l10n_in/i18n/tr.po
new file mode 100644
index 00000000000..60b900e9335
--- /dev/null
+++ b/addons/l10n_in/i18n/tr.po
@@ -0,0 +1,53 @@
+# Turkish 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-06-08 10:21+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: l10n_in
+#: model:ir.module.module,description:l10n_in.module_meta_information
+msgid ""
+"\n"
+"    Indian Accounting : chart of Account\n"
+"    "
+msgstr ""
+"\n"
+"    Hindistan Muhasebesi: Hesap planı\n"
+"    "
+
+#. module: l10n_in
+#: model:ir.module.module,shortdesc:l10n_in.module_meta_information
+msgid "Indian Chart of Account"
+msgstr "Hindistan hesap planı"
+
+#. module: l10n_in
+#: model:ir.actions.todo,note:l10n_in.config_call_account_template_in_minimal
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Bir Tablo Şablonundan bir Hesap Tablosu oluşturun. Firma adını girmeniz, "
+"hesaplarınızın ve banka hesaplarınızın kodlarının oluşturulması için rakam "
+"sayısını, yevmiyeleri oluşturmak için para birimini girmeniz istenecektir. "
+"Böylece sade bir hesap planı oluşturumuş olur.\n"
+"\t Bu sihirbaz, Mali Yönetim/Yapılandırma/Mali Muhasebe/Mali Hesaplar/Tablo "
+"Şablonundan Hesap planı Oluşturma menüsünden çalıştırılan sihirbaz ile "
+"aynıdır."
diff --git a/addons/l10n_in/l10n_in_wizard.xml b/addons/l10n_in/l10n_in_wizard.xml
index 1b6d22c6044..ec091ccecb9 100644
--- a/addons/l10n_in/l10n_in_wizard.xml
+++ b/addons/l10n_in/l10n_in_wizard.xml
@@ -8,6 +8,7 @@
 	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
 	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
 	        <field name="state">open</field>
+	        <field name="category_id" ref="account.category_accounting_configuration"/>
     	</record>
 
     </data>
diff --git a/addons/l10n_it/l10n_chart_it_generic.xml b/addons/l10n_it/l10n_chart_it_generic.xml
index aeca4c428c2..f1c96ccee68 100644
--- a/addons/l10n_it/l10n_chart_it_generic.xml
+++ b/addons/l10n_it/l10n_chart_it_generic.xml
@@ -7,6 +7,7 @@
 	        <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
 	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
 	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
+	        <field name="category_id" ref="account.category_accounting_configuration"/>
 	        <field name="state">open</field>
     	</record>
     </data>
diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml
index f0655f3dc99..bbe7949af49 100644
--- a/addons/l10n_lu/l10n_lu_wizard.xml
+++ b/addons/l10n_lu/l10n_lu_wizard.xml
@@ -4,7 +4,8 @@
 
     <record id="config_call_account_template_lu" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="restart">onskip</field>
+        <field name="type">special</field>
+        <field name="category_id" ref="account.category_accounting_configuration"/>
     </record>
 
     </data>
diff --git a/addons/l10n_ma/i18n/it.po b/addons/l10n_ma/i18n/it.po
index 05036e8c457..c83ed350ea7 100644
--- a/addons/l10n_ma/i18n/it.po
+++ b/addons/l10n_ma/i18n/it.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-13 12:14+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-05-25 16:19+0000\n"
+"Last-Translator: simone.sandri <lexluxsox@hotmail.it>\n"
 "Language-Team: Italian <it@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-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-26 04:36+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: l10n_ma
 #: sql_constraint:l10n.ma.line:0
@@ -52,6 +52,11 @@ msgid ""
 "cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet "
 "d'expertise comptable Seddik au cours du troisième trimestre 2010"
 msgstr ""
+"Questo modulo supporta il modello del grafico marocchino standard dei conti "
+"e può generare situazioni contabili in marocchino standard (saldo, CPC "
+"(entrate e rimborsi spese), equilibrio generale a 6 colonne, Ledger "
+"cumulativo ...). L'integrazione contabile è stata convalidata con l'aiuto "
+"della ditta contabile Seddik nel terzo trimestre del 2010"
 
 #. module: l10n_ma
 #: field:l10n.ma.report,line_ids:0
@@ -82,3 +87,21 @@ msgstr "Report"
 #: field:l10n.ma.line,code:0
 msgid "Variable Name"
 msgstr "Nome variabile"
+
+#~ msgid "immobilisations"
+#~ msgstr "Immobilizzazioni"
+
+#~ msgid "Cash"
+#~ msgstr "Contanti"
+
+#~ msgid "Tax"
+#~ msgstr "Tassa"
+
+#~ msgid "Expense"
+#~ msgstr "Spese"
+
+#~ msgid "View"
+#~ msgstr "Visualizza"
+
+#~ msgid "Income"
+#~ msgstr "Entrate"
diff --git a/addons/l10n_ma/l10n_ma_wizard.xml b/addons/l10n_ma/l10n_ma_wizard.xml
index 4524c36fb10..a59a2e9ca83 100644
--- a/addons/l10n_ma/l10n_ma_wizard.xml
+++ b/addons/l10n_ma/l10n_ma_wizard.xml
@@ -4,7 +4,8 @@
 
     <record id="config_call_account_template_ma" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="restart">onskip</field>
+        <field name="type">special</field>
+        <field name="category_id" ref="account.category_accounting_configuration"/>
     </record>
 
     </data>
diff --git a/addons/l10n_mx/i18n/tr.po b/addons/l10n_mx/i18n/tr.po
new file mode 100644
index 00000000000..e16ab74fb34
--- /dev/null
+++ b/addons/l10n_mx/i18n/tr.po
@@ -0,0 +1,48 @@
+# Turkish 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-07 06:07+0000\n"
+"PO-Revision-Date: 2011-06-08 10:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: l10n_mx
+#: model:ir.module.module,description:l10n_mx.module_meta_information
+msgid ""
+"This is the module to manage the accounting chart for Mexico in Open ERP."
+msgstr "Meksika için hesap tablolarını yönetmek için temel OpenERP modülü."
+
+#. module: l10n_mx
+#: model:ir.actions.todo,note:l10n_mx.config_call_account_template_mx_chart
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Bir Tablo Şablonundan bir Hesap Tablosu oluşturun. Firma adını girmeniz, "
+"hesaplarınızın ve banka hesaplarınızın kodlarının oluşturulması için rakam "
+"sayısını, yevmiyeleri oluşturmak için para birimini girmeniz istenecektir. "
+"Böylece sade bir hesap planı oluşturumuş olur.\n"
+"\t Bu sihirbaz, Mali Yönetim/Yapılandırma/Mali Muhasebe/Mali Hesaplar/Tablo "
+"Şablonundan Hesap planı Oluşturma menüsünden çalıştırılan sihirbaz ile "
+"aynıdır."
+
+#. module: l10n_mx
+#: model:ir.module.module,shortdesc:l10n_mx.module_meta_information
+msgid "Mexico - Chart of Account"
+msgstr "Meksika - Hesap planı"
diff --git a/addons/l10n_mx/l10n_chart_mx_wizard.xml b/addons/l10n_mx/l10n_chart_mx_wizard.xml
index 5ceb2f2076d..e1052a26d68 100644
--- a/addons/l10n_mx/l10n_chart_mx_wizard.xml
+++ b/addons/l10n_mx/l10n_chart_mx_wizard.xml
@@ -8,6 +8,7 @@
 	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
 	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
 	        <field name="state">open</field>
+	        <field name="category_id" ref="account.category_accounting_configuration"/>
     	</record>
 
     </data>
diff --git a/addons/l10n_nl/l10n_nl_wizard.xml b/addons/l10n_nl/l10n_nl_wizard.xml
index 18f024523d3..c6cfdf30598 100644
--- a/addons/l10n_nl/l10n_nl_wizard.xml
+++ b/addons/l10n_nl/l10n_nl_wizard.xml
@@ -13,6 +13,7 @@ Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit 4 ci
 * Dit is dezelfe configuratie wizard welke aangeroepen kan worden via Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.
 </field>
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
+        <field name="category_id" ref="account.category_accounting_configuration"/>
     </record>
 
     </data>
diff --git a/addons/l10n_pl/i18n/tr.po b/addons/l10n_pl/i18n/tr.po
new file mode 100644
index 00000000000..9ab8c30573f
--- /dev/null
+++ b/addons/l10n_pl/i18n/tr.po
@@ -0,0 +1,60 @@
+# Turkish 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-07 06:14+0000\n"
+"PO-Revision-Date: 2011-06-08 10:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: l10n_pl
+#: model:ir.module.module,description:l10n_pl.module_meta_information
+msgid ""
+"\n"
+"     This is the module to manage the accounting chart and taxes for Poland "
+"in Open ERP.\n"
+"     \n"
+"     To jest moduł do tworzenia wzorcowego planu kont i podstawowych "
+"ustawień do podatków\n"
+"     VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"     że wszystkie towary są w obrocie hurtowym.\n"
+"    "
+msgstr ""
+"\n"
+"     Polonya için hesap tablolarını yönetmek için temel OpenERP modülü.\n"
+"    "
+
+#. module: l10n_pl
+#: model:ir.module.module,shortdesc:l10n_pl.module_meta_information
+msgid "Poland - Chart of Accounts"
+msgstr "Polonya - Hesap planı"
+
+#. module: l10n_pl
+#: model:ir.actions.todo,note:l10n_pl.config_call_account_template_pl_chart
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Bir Tablo Şablonundan bir Hesap Tablosu oluşturun. Firma adını girmeniz, "
+"hesaplarınızın ve banka hesaplarınızın kodlarının oluşturulması için rakam "
+"sayısını, yevmiyeleri oluşturmak için para birimini girmeniz istenecektir. "
+"Böylece sade bir hesap planı oluşturumuş olur.\n"
+"\t Bu sihirbaz, Mali Yönetim/Yapılandırma/Mali Muhasebe/Mali Hesaplar/Tablo "
+"Şablonundan Hesap planı Oluşturma menüsünden çalıştırılan sihirbaz ile "
+"aynıdır."
diff --git a/addons/l10n_pl/l10n_chart_pl_wizard.xml b/addons/l10n_pl/l10n_chart_pl_wizard.xml
index 90589dfb45a..f2233cd67c1 100644
--- a/addons/l10n_pl/l10n_chart_pl_wizard.xml
+++ b/addons/l10n_pl/l10n_chart_pl_wizard.xml
@@ -8,6 +8,7 @@
 	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
 	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
 	        <field name="state">open</field>
+	        <field name="category_id" ref="account.category_accounting_configuration"/>
     	</record>
 
     </data>
diff --git a/addons/l10n_ro/l10n_chart_ro_wizard.xml b/addons/l10n_ro/l10n_chart_ro_wizard.xml
index a890e8eb81c..02a290522a9 100644
--- a/addons/l10n_ro/l10n_chart_ro_wizard.xml
+++ b/addons/l10n_ro/l10n_chart_ro_wizard.xml
@@ -8,6 +8,7 @@
 	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
 	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
 	        <field name="state">open</field>
+	        <field name="category_id" ref="account.category_accounting_configuration"/>
     	</record>
 
     </data>
diff --git a/addons/l10n_syscohada/__init__.py b/addons/l10n_syscohada/__init__.py
new file mode 100644
index 00000000000..ea9e9b47bc2
--- /dev/null
+++ b/addons/l10n_syscohada/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2010-2011 BAAMTU SARL (<http://www.baamtu.sn>).
+#    contact: leadsn@baamtu.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/>.
+#
+##############################################################################
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/l10n_syscohada/__openerp__.py b/addons/l10n_syscohada/__openerp__.py
new file mode 100644
index 00000000000..6cf85ed5f19
--- /dev/null
+++ b/addons/l10n_syscohada/__openerp__.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2010-2011 BAAMTU SARL (<http://www.baamtu.sn>).
+#    contact: leadsn@baamtu.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/>.
+#
+##############################################################################
+
+{
+    "name" : "OHADA - The accounting chart ",
+    "version" : "1.0",
+    "author" : "Baamtu Senegal",
+    "category" : "Localisation/Account Charts",
+    "description": """This module implements the accounting chart for OHADA area.
+    It allows any company or association to manage its financial accounting.
+    Countries that use OHADA are the following:
+    Benin, Burkina Faso, Cameroon, Central African Republic, Comoros, Congo,
+    Ivory Coast, Gabon, Guinea, Guinea Bissau,
+    Equatorial Guinea, Mali, Niger, Replica of Democratic Congo, Senegal, Chad, Togo.
+    """,
+    "website": "http://www.baamtu.com",
+    "depends" : ["account", "base_vat"],
+    "demo_xml" : [],
+    "init_xml":[],
+    "update_xml" : ["l10n_syscohada_data.xml","l10n_syscohada_wizard.xml"],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_syscohada/i18n/fr.po b/addons/l10n_syscohada/i18n/fr.po
new file mode 100644
index 00000000000..8a58faab1fa
--- /dev/null
+++ b/addons/l10n_syscohada/i18n/fr.po
@@ -0,0 +1,200 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_syscohada
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-05-09 10:31+0000\n"
+"PO-Revision-Date: 2011-06-20 13:17+0000\n"
+"Last-Translator: OpenERP Administrators <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-06-21 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: l10n_syscohada
+#: model:ir.actions.todo,note:l10n_syscohada.config_call_account_template_syscohada
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_asset
+msgid "Asset"
+msgstr "Actifs"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_income
+msgid "Income"
+msgstr "Produits"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_payable
+msgid "Payable"
+msgstr "À payer"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_stocks
+msgid "Actif circulant"
+msgstr "Actif circulant"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_dettes
+msgid "Dettes long terme"
+msgstr "Dettes long terme"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_tax
+msgid "Tax"
+msgstr "Taxes"
+
+#. module: l10n_syscohada
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "Erreur ! Vous ne pouvez pas créer des modéles de comptes récursifs"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_provision
+msgid "Provisions"
+msgstr "Provisions"
+
+#. module: l10n_syscohada
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "Erreur ! Vous ne pouvez pas créer de codes de taxe récursifs"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_commitment
+msgid "Engagements"
+msgstr "Engagements"
+
+#. module: l10n_syscohada
+#: model:ir.module.module,description:l10n_syscohada.module_meta_information
+msgid "This module implementes the accounting chart for OHADA area."
+msgstr ""
+"Ce module implémente le plan comptable général du système comptable de la "
+"zone OHAHA"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_expense
+msgid "Expense"
+msgstr "Charges"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_receivable
+msgid "Receivable"
+msgstr "Recevable"
+
+#. module: l10n_syscohada
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_immobilisations
+msgid "Immobilisations"
+msgstr "Immobilisations"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_equity
+msgid "Equity"
+msgstr "Capitaux propres"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_stock
+msgid "Stocks"
+msgstr "Stocks"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_cash
+msgid "Cash"
+msgstr "Liquidités"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_special
+msgid "Comptes spéciaux"
+msgstr "Comptes spéciaux"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_view
+msgid "View"
+msgstr "Vue"
+
+#. module: l10n_syscohada
+#: model:ir.module.module,shortdesc:l10n_syscohada.module_meta_information
+msgid "OHADA - Plan comptable général"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_cloture
+msgid "Cloture"
+msgstr "Clôture"
+
+#~ msgid "The journal must have centralised counterpart"
+#~ msgstr "Le journal attend une contrepartie centralisée"
+
+#~ msgid "Opening Entries Period"
+#~ msgstr "Période des écritures d'ouvertures"
+
+#~ msgid "Fiscal Year to close"
+#~ msgstr "Année fiscale à clôturer"
+
+#~ msgid "Generate Fiscal Year Opening Entries(Corrected)"
+#~ msgstr "Générer les écritures d'ouvertures d'exercice fiscal(Corrigé)"
+
+#~ msgid "Generated during fiscal year closing/opening process"
+#~ msgstr "Ecriture de report"
+
+#~ msgid "Opening Entries Journal"
+#~ msgstr "Journal des écritures d'ouverture"
+
+#~ msgid "The journal must have default credit and debit account"
+#~ msgstr "Le journal doit posséder un compte de crédit et débit par défaut"
+
+#~ msgid "Create entries"
+#~ msgstr "Créer les écritures"
+
+#~ msgid "Name of new entries"
+#~ msgstr "Nom des nouvelles entrées"
+
+#~ msgid "Closing of fiscal year cancelled, please check the box !"
+#~ msgstr "Clôture de l'exercice fiscal annulée, veuillez cocher la case !"
+
+#~ msgid "End of Fiscal Year Entry"
+#~ msgstr "Écriture de fin d'exercice fiscal"
+
+#~ msgid "The opening journal must not have any entry in the new fiscal year !"
+#~ msgstr ""
+#~ "Le journal d'ouverture ne doit pas contenir d'écriture dans le nouvel "
+#~ "exercice fiscal !"
+
+#~ msgid "Close Fiscal Year with new entries"
+#~ msgstr "Clôturer l'exercice fiscal avec de nouvelles écritures"
+
+#~ msgid "UserError"
+#~ msgstr "Erreur utilsateur"
+
+#~ msgid "New Fiscal Year"
+#~ msgstr "Nouvel exercice fiscal"
+
+#~ msgid "Check this box"
+#~ msgstr "Cocher cette case"
+
+#~ msgid "Are you sure you want to create entries?"
+#~ msgstr "Etes vous sûr de vouloir enrégistrer des écritures"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuler"
diff --git a/addons/l10n_syscohada/i18n/fr_FR.po b/addons/l10n_syscohada/i18n/fr_FR.po
new file mode 100644
index 00000000000..89dbc882ca9
--- /dev/null
+++ b/addons/l10n_syscohada/i18n/fr_FR.po
@@ -0,0 +1,240 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_syscohada
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-05-09 10:31+0000\n"
+"PO-Revision-Date: 2010-05-09 10:31+0000\n"
+"Last-Translator: Baamtu Sarl \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-09 10:31+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: l10n_syscohada
+#: model:ir.actions.todo,note:l10n_syscohada.config_call_account_template_syscohada
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_asset
+msgid "Asset"
+msgstr "Actifs"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_income
+msgid "Income"
+msgstr "Produits"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_payable
+msgid "Payable"
+msgstr "À payer"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_stocks
+msgid "Actif circulant"
+msgstr "Actif circulant"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_dettes
+msgid "Dettes long terme"
+msgstr "Dettes long terme"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_tax
+msgid "Tax"
+msgstr "Taxes"
+
+#. module: l10n_syscohada
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "Erreur ! Vous ne pouvez pas créer des modéles de comptes récursifs"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_provision
+msgid "Provisions"
+msgstr "Provisions"
+
+#. module: l10n_syscohada
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "Erreur ! Vous ne pouvez pas créer de codes de taxe récursifs"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_commitment
+msgid "Engagements"
+msgstr "Engagements"
+
+#. module: l10n_syscohada
+#: model:ir.module.module,description:l10n_syscohada.module_meta_information
+msgid "This module implementes the accounting chart for OHADA area."
+msgstr "Ce module implémente le plan comptable général du système comptable de la zone OHAHA"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_expense
+msgid "Expense"
+msgstr "Charges"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_receivable
+msgid "Receivable"
+msgstr "Recevable"
+
+#. module: l10n_syscohada
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
+
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_immobilisations
+msgid "Immobilisations"
+msgstr "Immobilisations"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_equity
+msgid "Equity"
+msgstr "Capitaux propres"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_stock
+msgid "Stocks"
+msgstr "Stocks"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_cash
+msgid "Cash"
+msgstr "Liquidités"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_special
+msgid "Comptes spéciaux"
+msgstr "Comptes spéciaux"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_view
+msgid "View"
+msgstr "Vue"
+
+#. module: l10n_syscohada
+#: model:ir.module.module,shortdesc:l10n_syscohada.module_meta_information
+msgid "OHADA - Plan comptable général"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_cloture
+msgid "Cloture"
+msgstr "Clôture"
+
+#. module: l10n_syscohada
+#: code:addons/l10n_syscohada/wizard/wizard_fiscalyear_close.py:0
+#, python-format
+msgid "The journal must have centralised counterpart"
+msgstr "Le journal attend une contrepartie centralisée"
+
+#. module: l10n_syscohada
+#: wizard_field:account.fiscalyear.close_corrected,init,period_id:0
+msgid "Opening Entries Period"
+msgstr "Période des écritures d'ouvertures"
+
+#. module: l10n_syscohada
+#: wizard_field:account.fiscalyear.close_corrected,init,fy_id:0
+msgid "Fiscal Year to close"
+msgstr "Année fiscale à clôturer"
+
+#. module: l10n_syscohada
+#: model:ir.actions.wizard,name:l10n_syscohada.wizard_fiscalyear_close_corrected
+#: model:ir.ui.menu,name:l10n_syscohada.menu_wizard_fy_close_corrected
+msgid "Generate Fiscal Year Opening Entries(Corrected)"
+msgstr "Générer les écritures d'ouvertures d'exercice fiscal(Corrigé)"
+
+#. module: l10n_syscohada
+#: field:account.move.line,fy_opening:0
+msgid "Generated during fiscal year closing/opening process"
+msgstr "Ecriture de report"
+
+#. module: l10n_syscohada
+#: wizard_field:account.fiscalyear.close_corrected,init,journal_id:0
+msgid "Opening Entries Journal"
+msgstr "Journal des écritures d'ouverture"
+
+#. module: l10n_syscohada
+#: code:addons/l10n_syscohada/wizard/wizard_fiscalyear_close.py:0
+#, python-format
+msgid "The journal must have default credit and debit account"
+msgstr "Le journal doit posséder un compte de crédit et débit par défaut"
+
+#. module: l10n_syscohada
+#: wizard_button:account.fiscalyear.close_corrected,init,close:0
+msgid "Create entries"
+msgstr "Créer les écritures"
+
+#. module: l10n_syscohada
+#: wizard_field:account.fiscalyear.close_corrected,init,report_name:0
+msgid "Name of new entries"
+msgstr "Nom des nouvelles entrées"
+
+#. module: l10n_syscohada
+#: code:addons/l10n_syscohada/wizard/wizard_fiscalyear_close.py:0
+#, python-format
+msgid "Closing of fiscal year cancelled, please check the box !"
+msgstr "Clôture de l'exercice fiscal annulée, veuillez cocher la case !"
+
+#. module: l10n_syscohada
+#: code:addons/l10n_syscohada/wizard/wizard_fiscalyear_close.py:0
+#, python-format
+msgid "End of Fiscal Year Entry"
+msgstr "Écriture de fin d'exercice fiscal"
+
+#. module: l10n_syscohada
+#: code:addons/l10n_syscohada/wizard/wizard_fiscalyear_close.py:0
+#, python-format
+msgid "The opening journal must not have any entry in the new fiscal year !"
+msgstr "Le journal d'ouverture ne doit pas contenir d'écriture dans le nouvel exercice fiscal !"
+
+#. module: l10n_syscohada
+#: wizard_view:account.fiscalyear.close_corrected,init:0
+msgid "Close Fiscal Year with new entries"
+msgstr "Clôturer l'exercice fiscal avec de nouvelles écritures"
+
+#. module: l10n_syscohada
+#: code:addons/l10n_syscohada/wizard/wizard_fiscalyear_close.py:0
+#, python-format
+msgid "UserError"
+msgstr "Erreur utilsateur"
+
+#. module: l10n_syscohada
+#: wizard_field:account.fiscalyear.close_corrected,init,fy2_id:0
+msgid "New Fiscal Year"
+msgstr "Nouvel exercice fiscal"
+
+#. module: l10n_syscohada
+#: wizard_field:account.fiscalyear.close_corrected,init,sure:0
+msgid "Check this box"
+msgstr "Cocher cette case"
+
+#. module: l10n_syscohada
+#: wizard_view:account.fiscalyear.close_corrected,init:0
+msgid "Are you sure you want to create entries?"
+msgstr "Etes vous sûr de vouloir enrégistrer des écritures"
+
+#. module: l10n_syscohada
+#: wizard_button:account.fiscalyear.close_corrected,init,end:0
+msgid "Cancel"
+msgstr "Annuler"
\ No newline at end of file
diff --git a/addons/l10n_syscohada/i18n/l10n_syscohada.pot b/addons/l10n_syscohada/i18n/l10n_syscohada.pot
new file mode 100644
index 00000000000..824ff010158
--- /dev/null
+++ b/addons/l10n_syscohada/i18n/l10n_syscohada.pot
@@ -0,0 +1,137 @@
+#, 
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-05-09 10:31+0000\n"
+"PO-Revision-Date: 2010-05-09 10:31+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-09 10:31+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: l10n_syscohada
+#: model:ir.actions.todo,note:l10n_syscohada.config_call_account_template_syscohada
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_asset
+msgid "Asset"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_payable
+msgid "Payable"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_stocks
+msgid "Actif circulant"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_dettes
+msgid "Dettes long terme"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_tax
+msgid "Tax"
+msgstr ""
+
+#. module: l10n_syscohada
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_provision
+msgid "Provisions"
+msgstr ""
+
+#. module: l10n_syscohada
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_commitment
+msgid "Engagements"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:ir.module.module,description:l10n_syscohada.module_meta_information
+msgid "This module implementes the accounting chart for OHADA area."
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_expense
+msgid "Expense"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_receivable
+msgid "Receivable"
+msgstr ""
+
+#. module: l10n_syscohada
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_immobilisations
+msgid "Immobilisations"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_equity
+msgid "Equity"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_stock
+msgid "Stocks"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_cash
+msgid "Cash"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_special
+msgid "Comptes spéciaux"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_view
+msgid "View"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:ir.module.module,shortdesc:l10n_syscohada.module_meta_information
+msgid "OHADA - Plan comptable général"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_cloture
+msgid "Cloture"
+msgstr ""
\ No newline at end of file
diff --git a/addons/l10n_syscohada/l10n_syscohada_data.xml b/addons/l10n_syscohada/l10n_syscohada_data.xml
new file mode 100644
index 00000000000..1d8a1564348
--- /dev/null
+++ b/addons/l10n_syscohada/l10n_syscohada_data.xml
@@ -0,0 +1,1945 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <openerp> 
+<data noupdate="0">
+ <record id="account_type_dettes" model="account.account.type">
+  <field name="name">Dettes long terme</field> 
+  <field name="code">dettes</field> 
+  <field name="report_type">liability</field>
+  <field name="close_method">balance</field> 
+  </record>
+ <record id="account_type_immobilisations" model="account.account.type">
+  <field name="name">Immobilisations</field> 
+  <field name="code">immobilization</field> 
+  <field name="report_type">asset</field>
+  <field name="close_method">balance</field> 
+  </record> 
+ <record id="account_type_stock" model="account.account.type">
+  <field name="name">Stocks</field> 
+  <field name="code">stocks</field>
+  <field name="report_type">asset</field> 
+  <field name="close_method">balance</field> 
+  </record> 
+ <record id="account_type_cloture" model="account.account.type">
+  <field name="name">Cloture</field> 
+  <field name="code">cloture</field> 
+  <field name="report_type">liability</field>
+  <field name="close_method">balance</field> 
+  </record>
+  <record model="account.account.type" id="account_type_receivable">
+  <field name="name">Receivable</field> 
+  <field name="code">receivable</field> 
+  <field name="report_type">asset</field>
+  <field name="close_method">unreconciled</field> 
+  </record>
+ <record model="account.account.type" id="account_type_payable">
+  <field name="name">Payable</field> 
+  <field name="code">payable</field> 
+  <field name="report_type">liability</field>
+  <field name="close_method">unreconciled</field> 
+  </record>
+ <record model="account.account.type" id="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">
+  <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="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="account_type_tax">
+  <field name="name">Tax</field> 
+  <field name="code">tax</field> 
+  <field name="close_method">unreconciled</field> 
+  </record>
+ <record model="account.account.type" id="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="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="account_type_equity">
+  <field name="name">Equity</field> 
+  <field name="code">equity</field> 
+  <field name="report_type">asset</field>
+  <field name="close_method">balance</field> 
+  </record>
+ <record model="account.account.type" id="account_type_provision">
+  <field name="name">Provisions</field> 
+  <field name="code">provision</field> 
+  <field name="report_type">liability</field>
+  <field name="close_method">balance</field> 
+  </record>
+ <record model="account.account.type" id="account_type_commitment">
+  <field name="name">Engagements</field> 
+  <field name="code">commitment</field> 
+  <field name="close_method">balance</field> 
+  </record>
+ <record model="account.account.type" id="account_type_stocks">
+  <field name="name">Actif circulant</field> 
+  <field name="code">current asset</field> 
+  <field name="report_type">asset</field>
+  <field name="close_method">balance</field> 
+  </record>
+ <record model="account.account.type" id="account_type_special">
+  <field name="name">Comptes spéciaux</field> 
+  <field name="code">special</field> 
+  <field name="close_method">none</field> 
+  </record>
+<record id="pcg_0" model="account.account.template">
+  <field name="name">Plan Comptable SYSCOA</field> 
+  <field name="code">0</field> 
+  <field name="type">view</field> 
+  <field name="user_type" ref="l10n_syscohada.account_type_view" /> 
+  </record>
+ <record id="pcg_classes_1_a_5" model="account.account.template">
+  <field name="name">Comptes de bilan</field> 
+  <field name="code">Classes 1 à 5</field> 
+  <field name="type">view</field> 
+  <field name="user_type" ref="l10n_syscohada.account_type_view" /> 
+  <field name="parent_id" ref="pcg_0" /> 
+  </record>
+<record id="pcg_classes_6_et_7" model="account.account.template">
+  <field name="name">Comptes de gestion</field> 
+  <field name="code">Classes 6 et 7</field> 
+  <field name="type">view</field> 
+  <field name="user_type" ref="l10n_syscohada.account_type_view" /> 
+  <field name="parent_id" ref="pcg_0" /> 
+  </record>
+ <record id="pcg_classe_1" model="account.account.template">
+  <field name="name">Comptes de capitaux</field> 
+  <field name="code">Classe 1</field> 
+  <field name="type">view</field> 
+  <field name="user_type" ref="l10n_syscohada.account_type_view" /> 
+  <field name="note">Capitaux propres, autres fonds propres, emprunts et dettes assimilées</field> 
+  <field name="parent_id" ref="pcg_classes_1_a_5" /> 
+  </record> 
+ <record id="pcg_classe_2" model="account.account.template">
+  <field name="name">Comptes d'immobilisations</field> 
+  <field name="code">Classe 2</field> 
+  <field name="type">view</field> 
+  <field name="user_type" ref="l10n_syscohada.account_type_view" /> 
+  <field name="note">Immobilisations incorporelles, corporelles, financières et frais d'établissement</field> 
+  <field name="parent_id" ref="pcg_classes_1_a_5" /> 
+  </record>	
+<record id="pcg_classe_3" model="account.account.template">
+  <field name="name">Comptes de stocks et d'en-cours</field> 
+  <field name="code">Classe 3</field> 
+  <field name="type">view</field> 
+  <field name="user_type" ref="l10n_syscohada.account_type_view" /> 
+  <field name="parent_id" ref="pcg_classes_1_a_5" /> 
+  </record>
+<record id="pcg_classe_4" model="account.account.template">
+  <field name="name">Comptes de tiers</field> 
+  <field name="code">Classe 4</field> 
+  <field name="type">view</field> 
+  <field name="user_type" ref="l10n_syscohada.account_type_view" /> 
+  <field name="parent_id" ref="pcg_classes_1_a_5" /> 
+  </record>
+<record id="pcg_classe_5" model="account.account.template">
+  <field name="name">Comptes financiers</field> 
+  <field name="code">Classe 5</field> 
+  <field name="type">view</field> 
+  <field name="user_type" ref="l10n_syscohada.account_type_view" /> 
+  <field name="parent_id" ref="pcg_classes_1_a_5" /> 
+  </record>
+<record id="pcg_classe_6" model="account.account.template">
+  <field name="name">Comptes de charges</field> 
+  <field name="code">Classe 6</field> 
+  <field name="type">view</field> 
+  <field name="user_type" ref="l10n_syscohada.account_type_view" /> 
+  <field name="parent_id" ref="pcg_classes_6_et_7" /> 
+  </record>
+<record id="pcg_classe_7" model="account.account.template">
+  <field name="name">Comptes de produits</field> 
+  <field name="code">Classe 7</field> 
+  <field name="type">view</field> 
+  <field name="user_type" ref="l10n_syscohada.account_type_view" /> 
+  <field name="parent_id" ref="pcg_classes_6_et_7" /> 
+  </record>
+<record id="pcg_classe_8" model="account.account.template">
+  <field name="name">Comptes spéciaux</field> 
+  <field name="code">Classes 8</field> 
+  <field name="type">view</field> 
+  <field name="user_type" ref="l10n_syscohada.account_type_view" /> 
+  <field name="parent_id" ref="pcg_0" /> 
+  </record>
+<record id="pcg_classe_9" model="account.account.template">
+	<field name="name">Comptes des engagements hors bilan et comptabilité analytique</field>
+	<field name="code">Classes 9</field>
+	<field name="type">view</field>
+	<field name="user_type" ref="l10n_syscohada.account_type_view" />
+	<field name="parent_id" ref="pcg_0" />
+</record>   
+<record id="pcg_10" model="account.account.template"><field name="name">CAPITAL</field><field name="code">10</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_classe_1" /></record>
+<record id="pcg_101" model="account.account.template"><field name="name">CAPITAL SOCIAL</field><field name="code">101</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_10" /></record>
+<record id="pcg_1011" model="account.account.template"><field name="name">Capital souscrit, non appelé</field><field name="code">1011</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_101" /></record>
+<record id="pcg_1012" model="account.account.template"><field name="name">Capital souscrit, appelé, non versé</field><field name="code">1012</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_101" /></record>
+<record id="pcg_1013" model="account.account.template"><field name="name">Capital souscrit, appelé, versé, non amorti</field><field name="code">1013</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_101" /></record>
+<record id="pcg_1014" model="account.account.template"><field name="name">Capital souscrit, appelé, versé, amorti</field><field name="code">1014</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_101" /></record>
+<record id="pcg_1018" model="account.account.template"><field name="name">Capital souscrit soumis à des conditions particulières</field><field name="code">1018</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_101" /></record>
+<record id="pcg_102" model="account.account.template"><field name="name">CAPITAL PAR DOTATION</field><field name="code">102</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_10" /></record>
+<record id="pcg_1021" model="account.account.template"><field name="name">Dotation initiale</field><field name="code">1021</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_102" /></record>
+<record id="pcg_1022" model="account.account.template"><field name="name">Dotations complémentaires</field><field name="code">1022</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_102" /></record>
+<record id="pcg_1028" model="account.account.template"><field name="name">Autres dotations</field><field name="code">1028</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_102" /></record>
+<record id="pcg_103" model="account.account.template"><field name="name">CAPITAL PERSONNEL</field><field name="code">103</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_10" /></record>
+<record id="pcg_104" model="account.account.template"><field name="name">COMPTE DE L'EXPLOITANT</field><field name="code">104</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_10" /></record>
+<record id="pcg_1041" model="account.account.template"><field name="name">Apports temporaires</field><field name="code">1041</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_104" /></record>
+<record id="pcg_1042" model="account.account.template"><field name="name">Opérations courantes</field><field name="code">1042</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_104" /></record>
+<record id="pcg_1043" model="account.account.template"><field name="name">Rémunérations, impôts et autres charges personnelles</field><field name="code">1043</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_104" /></record>
+<record id="pcg_1047" model="account.account.template"><field name="name">Prélèvements d’autoconsommation</field><field name="code">1047</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_104" /></record>
+<record id="pcg_1048" model="account.account.template"><field name="name">Autres prélèvements</field><field name="code">1048</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_104" /></record>
+<record id="pcg_105" model="account.account.template"><field name="name">PRIMES LIÉES AUX CAPITAUX PROPRES</field><field name="code">105</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_10" /></record>
+<record id="pcg_1051" model="account.account.template"><field name="name">Primes d'émission</field><field name="code">1051</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_105" /></record>
+<record id="pcg_1052" model="account.account.template"><field name="name">Primes d'apport</field><field name="code">1052</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_105" /></record>
+<record id="pcg_1053" model="account.account.template"><field name="name">Primes de fusion</field><field name="code">1053</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_105" /></record>
+<record id="pcg_1054" model="account.account.template"><field name="name">Primes de conversion</field><field name="code">1054</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_105" /></record>
+<record id="pcg_1058" model="account.account.template"><field name="name">Autres primes</field><field name="code">1058</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_105" /></record>
+<record id="pcg_106" model="account.account.template"><field name="name">ÉCARTS DE RÉÉVALUATION</field><field name="code">106</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_10" /></record>
+<record id="pcg_1061" model="account.account.template"><field name="name">Écarts de réévaluation légale</field><field name="code">1061</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_106" /></record>
+<record id="pcg_1062" model="account.account.template"><field name="name">Écarts de réévaluation libre</field><field name="code">1062</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_106" /></record>
+<record id="pcg_109" model="account.account.template"><field name="name">ACTIONNAIRES, CAPITAL SOUSCRIT, NON APPELÉ</field><field name="code">109</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_10" /></record>
+<record id="pcg_11" model="account.account.template"><field name="name">RÉSERVES</field><field name="code">11</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_classe_1" /></record>
+<record id="pcg_111" model="account.account.template"><field name="name">RÉSERVE LÉGALE</field><field name="code">111</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_11" /></record>
+<record id="pcg_112" model="account.account.template"><field name="name">RÉSERVES STATUTAIRES OU CONTRACTUELLES</field><field name="code">112</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_11" /></record>
+<record id="pcg_113" model="account.account.template"><field name="name">RÉSERVES RÉGLEMENTÉES</field><field name="code">113</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_11" /></record>
+<record id="pcg_1131" model="account.account.template"><field name="name">Réserves de plus-values nettes à long terme</field><field name="code">1131</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_113" /></record>
+<record id="pcg_1133" model="account.account.template"><field name="name">Réserves consécutives à l'octroi de subventions d'investissement</field><field name="code">1133</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_113" /></record>
+<record id="pcg_1138" model="account.account.template"><field name="name">Autres réserves réglementées</field><field name="code">1138</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_113" /></record>
+<record id="pcg_118" model="account.account.template"><field name="name">AUTRES RÉSERVES</field><field name="code">118</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_11" /></record>
+<record id="pcg_1181" model="account.account.template"><field name="name">Réserves facultatives</field><field name="code">1181</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_118" /></record>
+<record id="pcg_1188" model="account.account.template"><field name="name">Réserves diverses</field><field name="code">1188</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_118" /></record>
+<record id="pcg_12" model="account.account.template"><field name="name">REPORT À NOUVEAU</field><field name="code">12</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_classe_1" /></record>
+<record id="pcg_121" model="account.account.template"><field name="name">REPORT À NOUVEAU CRÉDITEUR</field><field name="code">121</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_12" /></record>
+<record id="pcg_129" model="account.account.template"><field name="name">REPORT À NOUVEAU DÉBITEUR</field><field name="code">129</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_12" /></record>
+<record id="pcg_1291" model="account.account.template"><field name="name">Perte nette à reporter</field><field name="code">1291</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_129" /></record>
+<record id="pcg_1292" model="account.account.template"><field name="name">Perte - Amortissements réputés différés</field><field name="code">1292</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_129" /></record>
+<record id="pcg_13" model="account.account.template"><field name="name">RÉSULTAT NET DE L'EXERCICE</field><field name="code">13</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_classe_1" /></record>
+<record id="pcg_130" model="account.account.template"><field name="name">RÉSULTAT EN INSANCE D’AFFECTATION</field><field name="code">130</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_13" /></record>
+<record id="pcg_1301" model="account.account.template"><field name="name">Résultat en instance d'affectation : Bénéfice</field><field name="code">1301</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_130" /></record>
+<record id="pcg_1309" model="account.account.template"><field name="name">Résultat en instance d'affectation : Perte</field><field name="code">1309</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_130" /></record>
+<record id="pcg_131" model="account.account.template"><field name="name">RÉSULTAT NET : BÉNÉFICE</field><field name="code">131</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_13" /></record>
+<record id="pcg_132" model="account.account.template"><field name="name">MARGE BRUTE (M.B.)</field><field name="code">132</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_13" /></record>
+<record id="pcg_1321" model="account.account.template"><field name="name">Marge brute sur marchandises</field><field name="code">1321</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_132" /></record>
+<record id="pcg_1322" model="account.account.template"><field name="name">Marge brute sur matières</field><field name="code">1322</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_132" /></record>
+<record id="pcg_133" model="account.account.template"><field name="name">VALEUR AJOUTÉE (V.A.)</field><field name="code">133</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_13" /></record>
+<record id="pcg_134" model="account.account.template"><field name="name">EXCÉDENT BRUT D'EXPLOITATION (E.B.E.)</field><field name="code">134</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_13" /></record>
+<record id="pcg_135" model="account.account.template"><field name="name">RÉSULTAT D'EXPLOITATION (R.E.)</field><field name="code">135</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_13" /></record>
+<record id="pcg_136" model="account.account.template"><field name="name">RÉSULTAT FINANCIER (R.F.)</field><field name="code">136</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_13" /></record>
+<record id="pcg_137" model="account.account.template"><field name="name">RÉSULTAT DES ACTIVITÉS ORDINAIRES (R.A.O.)</field><field name="code">137</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_13" /></record>
+<record id="pcg_138" model="account.account.template"><field name="name">RÉSULTAT HORS ACTIVITÉS ORDINAIRES (R.H.A.O.)</field><field name="code">138</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_13" /></record>
+<record id="pcg_139" model="account.account.template"><field name="name">RÉSULTAT NET : PERTE</field><field name="code">139</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_13" /></record>
+<record id="pcg_14" model="account.account.template"><field name="name">SUBVENTIONS D'INVESTISSEMENT</field><field name="code">14</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_classe_1" /></record>
+<record id="pcg_141" model="account.account.template"><field name="name">SUBVENTIONS D'ÉQUIPEMENT A</field><field name="code">141</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_14" /></record>
+<record id="pcg_1411" model="account.account.template"><field name="name">État</field><field name="code">1411</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_141" /></record>
+<record id="pcg_1412" model="account.account.template"><field name="name">Régions</field><field name="code">1412</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_141" /></record>
+<record id="pcg_1413" model="account.account.template"><field name="name">Départements</field><field name="code">1413</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_141" /></record>
+<record id="pcg_1414" model="account.account.template"><field name="name">Communes et collectivités publiques décentralisées</field><field name="code">1414</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_141" /></record>
+<record id="pcg_1415" model="account.account.template"><field name="name">Entreprises publiques ou mixtes</field><field name="code">1415</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_141" /></record>
+<record id="pcg_1416" model="account.account.template"><field name="name">Entreprises et organismes privés</field><field name="code">1416</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_141" /></record>
+<record id="pcg_1417" model="account.account.template"><field name="name">Organismes internationaux</field><field name="code">1417</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_141" /></record>
+<record id="pcg_1418" model="account.account.template"><field name="name">Autres</field><field name="code">1418</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_141" /></record>
+<record id="pcg_142" model="account.account.template"><field name="name">SUBVENTIONS D'ÉQUIPEMENT B</field><field name="code">142</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_14" /></record>
+<record id="pcg_148" model="account.account.template"><field name="name">AUTRES SUBVENTIONS D'INVESTISSEMENT</field><field name="code">148</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_equity" /><field name="parent_id" ref="pcg_14" /></record>
+<record id="pcg_15" model="account.account.template"><field name="name">PROVISIONS RÉGLEMENTÉES ET FONDS ASSIMILÉS</field><field name="code">15</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_classe_1" /></record>
+<record id="pcg_151" model="account.account.template"><field name="name">AMORTISSEMENTS DÉROGATOIRES</field><field name="code">151</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_15" /></record>
+<record id="pcg_152" model="account.account.template"><field name="name">PLUS-VALUES DE CESSION À RÉINVESTIR</field><field name="code">152</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_15" /></record>
+<record id="pcg_153" model="account.account.template"><field name="name">FONDS RÉGLEMENTÉS</field><field name="code">153</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_15" /></record>
+<record id="pcg_1531" model="account.account.template"><field name="name">Fonds National</field><field name="code">1531</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_153" /></record>
+<record id="pcg_1532" model="account.account.template"><field name="name">Prélèvement pour le Budget</field><field name="code">1532</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_153" /></record>
+<record id="pcg_154" model="account.account.template"><field name="name">PROVISION SPÉCIALE DE RÉÉVALUATION</field><field name="code">154</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_15" /></record>
+<record id="pcg_155" model="account.account.template"><field name="name">PROVISIONS RÉGLEMENTÉES RELATIVES AUX IMMOBILISATIONS</field><field name="code">155</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_15" /></record>
+<record id="pcg_1551" model="account.account.template"><field name="name">Reconstitution des gisements miniers et pétroliers</field><field name="code">1551</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_155" /></record>
+<record id="pcg_156" model="account.account.template"><field name="name">PROVISIONS RÉGLEMENTÉES RELATIVES AUX STOCKS</field><field name="code">156</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_15" /></record>
+<record id="pcg_1561" model="account.account.template"><field name="name">Hausse de prix</field><field name="code">1561</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_156" /></record>
+<record id="pcg_1562" model="account.account.template"><field name="name">Fluctuation des cours</field><field name="code">1562</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_156" /></record>
+<record id="pcg_157" model="account.account.template"><field name="name">PROVISIONS POUR INVESTISSEMENT</field><field name="code">157</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_15" /></record>
+<record id="pcg_158" model="account.account.template"><field name="name">AUTRES PROVISIONS ET FONDS RÉGLEMENTES</field><field name="code">158</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_15" /></record>
+<record id="pcg_16" model="account.account.template"><field name="name">EMPRUNTS ET DETTES ASSIMILÉES</field><field name="code">16</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_classe_1" /></record>
+<record id="pcg_161" model="account.account.template"><field name="name">EMPRUNTS OBLIGATAIRES</field><field name="code">161</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_16" /></record>
+<record id="pcg_1611" model="account.account.template"><field name="name">Emprunts obligataires ordinaires</field><field name="code">1611</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_161" /></record>
+<record id="pcg_1612" model="account.account.template"><field name="name">Emprunts obligataires convertibles</field><field name="code">1612</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_161" /></record>
+<record id="pcg_1618" model="account.account.template"><field name="name">Autres emprunts obligataires</field><field name="code">1618</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_161" /></record>
+<record id="pcg_162" model="account.account.template"><field name="name">EMPRUNTS ET DETTES AUPRÈS DES ÉTABLISSEMENTS DE CRÉDIT</field><field name="code">162</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_16" /></record>
+<record id="pcg_163" model="account.account.template"><field name="name">AVANCES REÇUES DE L'ÉTAT</field><field name="code">163</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_16" /></record>
+<record id="pcg_164" model="account.account.template"><field name="name">AVANCES REÇUES ET COMPTES COURANTS BLOQUÉS</field><field name="code">164</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_16" /></record>
+<record id="pcg_165" model="account.account.template"><field name="name">DÉPÔTS ET CAUTIONNEMENTS RECUS</field><field name="code">165</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_16" /></record>
+<record id="pcg_1651" model="account.account.template"><field name="name">Dépôts</field><field name="code">1651</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_165" /></record>
+<record id="pcg_1652" model="account.account.template"><field name="name">Cautionnements</field><field name="code">1652</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_165" /></record>
+<record id="pcg_166" model="account.account.template"><field name="name">INTÉRÊTS COURUS</field><field name="code">166</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_16" /></record>
+<record id="pcg_1661" model="account.account.template"><field name="name">sur emprunts obligataires</field><field name="code">1661</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_166" /></record>
+<record id="pcg_1662" model="account.account.template"><field name="name">sur emprunts et dettes auprès des établissements de crédit</field><field name="code">1662</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_166" /></record>
+<record id="pcg_1663" model="account.account.template"><field name="name">sur avances reçues de l'État</field><field name="code">1663</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_166" /></record>
+<record id="pcg_1664" model="account.account.template"><field name="name">sur avances reçues et comptes courants bloqués</field><field name="code">1664</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_166" /></record>
+<record id="pcg_1665" model="account.account.template"><field name="name">sur dépôts et cautionnements reçus</field><field name="code">1665</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_166" /></record>
+<record id="pcg_1667" model="account.account.template"><field name="name">sur avances assorties de conditions particulières</field><field name="code">1667</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_166" /></record>
+<record id="pcg_1668" model="account.account.template"><field name="name">sur autres emprunts et dettes</field><field name="code">1668</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_166" /></record>
+<record id="pcg_167" model="account.account.template"><field name="name">AVANCES ASSORTIES DE CONDITIONS PARTICULIÈRES</field><field name="code">167</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_16" /></record>
+<record id="pcg_1671" model="account.account.template"><field name="name">Avances bloquées pour augmentation du capital</field><field name="code">1671</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_167" /></record>
+<record id="pcg_1672" model="account.account.template"><field name="name">Avances conditionnées par l'État</field><field name="code">1672</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_167" /></record>
+<record id="pcg_1673" model="account.account.template"><field name="name">Avances conditionnées par les autres organismes africains</field><field name="code">1673</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_167" /></record>
+<record id="pcg_1674" model="account.account.template"><field name="name">Avances conditionnées par les organismes internationaux</field><field name="code">1674</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_167" /></record>
+<record id="pcg_1676" model="account.account.template"><field name="name">Droits du concédant exigibles en nature</field><field name="code">1676</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_167" /></record>
+<record id="pcg_168" model="account.account.template"><field name="name">AUTRES EMPRUNTS ET DETTES</field><field name="code">168</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_16" /></record>
+<record id="pcg_1681" model="account.account.template"><field name="name">Rentes viagères capitalisées</field><field name="code">1681</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_168" /></record>
+<record id="pcg_1682" model="account.account.template"><field name="name">Billets de fonds</field><field name="code">1682</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_168" /></record>
+<record id="pcg_1683" model="account.account.template"><field name="name">Dettes consécutives à des titres empruntés</field><field name="code">1683</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_168" /></record>
+<record id="pcg_1684" model="account.account.template"><field name="name">Dettes du concédant exigibles en nature</field><field name="code">1684</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_168" /></record>
+<record id="pcg_1685" model="account.account.template"><field name="name">Emprunts participatifs</field><field name="code">1685</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_168" /></record>
+<record id="pcg_1686" model="account.account.template"><field name="name">Participation des travailleurs aux bénéfices</field><field name="code">1686</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_168" /></record>
+<record id="pcg_17" model="account.account.template"><field name="name">DETTES DE CRÉDIT - BAIL ET CONTRATS ASSIMILÉS</field><field name="code">17</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_classe_1" /></record>
+<record id="pcg_172" model="account.account.template"><field name="name">EMPRUNTS ÉQUIVALENTS DE CRÉDIT - BAIL IMMOBILIER</field><field name="code">172</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_17" /></record>
+<record id="pcg_173" model="account.account.template"><field name="name">EMPRUNTS ÉQUIVALENTS DE CRÉDIT - BAIL MOBILIER</field><field name="code">173</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_17" /></record>
+<record id="pcg_176" model="account.account.template"><field name="name">INTÉRÊTS COURUS</field><field name="code">176</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_17" /></record>
+<record id="pcg_1762" model="account.account.template"><field name="name">sur emprunts équivalents de crédit – bail immobilier</field><field name="code">1762</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_176" /></record>
+<record id="pcg_1763" model="account.account.template"><field name="name">sur emprunts équivalents de crédit – bail mobilier</field><field name="code">1763</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_176" /></record>
+<record id="pcg_1768" model="account.account.template"><field name="name">sur emprunts équivalents d’autres contrats</field><field name="code">1768</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_176" /></record>
+<record id="pcg_178" model="account.account.template"><field name="name">EMPRUNTS ÉQUIVALENTS D’AUTRES CONTRATS</field><field name="code">178</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_17" /></record>
+<record id="pcg_18" model="account.account.template"><field name="name">DETTES LIÉES À DES PARTICIPATIONS ET COMPTES DE LIAISON DES ETABLISSEMENTS ET SOCIÉTÉS EN PARTICIPATION</field><field name="code">18</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_classe_1" /></record>
+<record id="pcg_181" model="account.account.template"><field name="name">DETTES LIÉES À DES PARTICIPATIONS</field><field name="code">181</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_18" /></record>
+<record id="pcg_1811" model="account.account.template"><field name="name">Dettes liées à des participations (groupe)</field><field name="code">1811</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_181" /></record>
+<record id="pcg_1812" model="account.account.template"><field name="name">Dettes liées à des participations (hors groupe)</field><field name="code">1812</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_181" /></record>
+<record id="pcg_182" model="account.account.template"><field name="name">DETTES LIÉES À DES SOCIÉTÉS EN PARTICIPATION</field><field name="code">182</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_18" /></record>
+<record id="pcg_183" model="account.account.template"><field name="name">INTÉRÊTS COURUS SUR DETTES LIÉES À DES PARTICIPATIONS</field><field name="code">183</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_18" /></record>
+<record id="pcg_184" model="account.account.template"><field name="name">COMPTES PERMANENTS BLOQUÉS DES ÉTABLISSEMENTS ET SUCCURSALES</field><field name="code">184</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_18" /></record>
+<record id="pcg_185" model="account.account.template"><field name="name">COMPTES PERMANENTS NON BLOQUÉS DES ÉTABLISSEMENTS ET SUCCURSALES</field><field name="code">185</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_18" /></record>
+<record id="pcg_186" model="account.account.template"><field name="name">COMPTES DE LIAISON CHARGES</field><field name="code">186</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_18" /></record>
+<record id="pcg_187" model="account.account.template"><field name="name">COMPTES DE LIAISON PRODUITS</field><field name="code">187</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_18" /></record>
+<record id="pcg_188" model="account.account.template"><field name="name">COMPTES DE LIAISON DES SOCIÉTÉS EN PARTICIPATION</field><field name="code">188</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_18" /></record>
+<record id="pcg_19" model="account.account.template"><field name="name">PROVISIONS FINANCIERES POUR RISQUES ET CHARGES</field><field name="code">19</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_classe_1" /></record>
+<record id="pcg_191" model="account.account.template"><field name="name">PROVISIONS POUR LITIGES</field><field name="code">191</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_19" /></record>
+<record id="pcg_192" model="account.account.template"><field name="name">PROVISIONS POUR GARANTIES DONNÉES AUX CLIENTS</field><field name="code">192</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_19" /></record>
+<record id="pcg_193" model="account.account.template"><field name="name">PROVISIONS POUR PERTES SUR MARCHÉS À ACHÈVEMENT FUTUR</field><field name="code">193</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_19" /></record>
+<record id="pcg_194" model="account.account.template"><field name="name">PROVISIONS POUR PERTES DE CHANGE</field><field name="code">194</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_19" /></record>
+<record id="pcg_195" model="account.account.template"><field name="name">PROVISIONS POUR IMPÔTS</field><field name="code">195</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_19" /></record>
+<record id="pcg_196" model="account.account.template"><field name="name">PROVISIONS POUR PENSIONS ET OBLIGATIONS SIMILAIRES</field><field name="code">196</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_19" /></record>
+<record id="pcg_197" model="account.account.template"><field name="name">PROVISIONS POUR CHARGES À REPARTIR SUR PLUSIEURS EXERCICES</field><field name="code">197</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_19" /></record>
+<record id="pcg_1971" model="account.account.template"><field name="name">Provisions pour grosses réparations</field><field name="code">1971</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_197" /></record>
+<record id="pcg_198" model="account.account.template"><field name="name">AUTRES PROVISIONS FINANCIÈRES POUR RISQUES ET CHARGES</field><field name="code">198</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_19" /></record>
+<record id="pcg_1981" model="account.account.template"><field name="name">Provisions pour amendes et pénalités</field><field name="code">1981</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_198" /></record>
+<record id="pcg_1982" model="account.account.template"><field name="name">Provisions pour renouvellement des immobilisations (entreprises concessionnaires)</field><field name="code">1982</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_198" /></record>
+<record id="pcg_1983" model="account.account.template"><field name="name">Provisions de propre assureur</field><field name="code">1983</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_198" /></record>
+<record id="pcg_1988" model="account.account.template"><field name="name">Autres provisions financières pour risques et charges</field><field name="code">1988</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_provision" /><field name="parent_id" ref="pcg_198" /></record>
+<record id="pcg_20" model="account.account.template"><field name="name">CHARGES IMMOBILISÉES</field><field name="code">20</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_classe_2" /></record>
+<record id="pcg_201" model="account.account.template"><field name="name">FRAIS D'ÉTABLISSEMENT</field><field name="code">201</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_20" /></record>
+<record id="pcg_2011" model="account.account.template"><field name="name">Frais de constitution</field><field name="code">2011</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_201" /></record>
+<record id="pcg_2012" model="account.account.template"><field name="name">Frais de prospection</field><field name="code">2012</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_201" /></record>
+<record id="pcg_2013" model="account.account.template"><field name="name">Frais de publicité et de lancement</field><field name="code">2013</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_201" /></record>
+<record id="pcg_2014" model="account.account.template"><field name="name">Frais de fonctionnement antérieurs au démarrage</field><field name="code">2014</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_201" /></record>
+<record id="pcg_2015" model="account.account.template"><field name="name">Frais de modification du capital (fusions, scissions, transformations)</field><field name="code">2015</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_201" /></record>
+<record id="pcg_2016" model="account.account.template"><field name="name">Frais d'entrée à la Bourse</field><field name="code">2016</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_201" /></record>
+<record id="pcg_2017" model="account.account.template"><field name="name">Frais de restructuration</field><field name="code">2017</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_201" /></record>
+<record id="pcg_2018" model="account.account.template"><field name="name">Frais divers d'établissement</field><field name="code">2018</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_201" /></record>
+<record id="pcg_202" model="account.account.template"><field name="name">CHARGES À RÉPARTIR SUR PLUSIEURS EXERCICES</field><field name="code">202</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_20" /></record>
+<record id="pcg_2021" model="account.account.template"><field name="name">Charges différées</field><field name="code">2021</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_202" /></record>
+<record id="pcg_2022" model="account.account.template"><field name="name">Frais d'acquisition d'immobilisations</field><field name="code">2022</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_202" /></record>
+<record id="pcg_2026" model="account.account.template"><field name="name">Frais d'émission des emprunts</field><field name="code">2026</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_202" /></record>
+<record id="pcg_2028" model="account.account.template"><field name="name">Charges à étaler</field><field name="code">2028</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_202" /></record>
+<record id="pcg_206" model="account.account.template"><field name="name">PRIMES DE REMBOURSEMENT DES OBLIGATIONS</field><field name="code">206</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_20" /></record>
+<record id="pcg_2061" model="account.account.template"><field name="name">Obligations ordinaires</field><field name="code">2061</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_206" /></record>
+<record id="pcg_2062" model="account.account.template"><field name="name">Obligations convertibles</field><field name="code">2062</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_206" /></record>
+<record id="pcg_2068" model="account.account.template"><field name="name">Autres emprunts obligataires</field><field name="code">2068</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_206" /></record>
+<record id="pcg_21" model="account.account.template"><field name="name">IMMOBILISATIONS INCORPORELLES</field><field name="code">21</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_classe_2" /></record>
+<record id="pcg_211" model="account.account.template"><field name="name">FRAIS DE RECHERCHE ET DE DÉVELOPPEMENT</field><field name="code">211</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_21" /></record>
+<record id="pcg_212" model="account.account.template"><field name="name">BREVETS, LICENCES, CONCESSIONS ET DROITS SIMILAIRES</field><field name="code">212</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_21" /></record>
+<record id="pcg_213" model="account.account.template"><field name="name">LOGICIELS</field><field name="code">213</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_21" /></record>
+<record id="pcg_214" model="account.account.template"><field name="name">MARQUES</field><field name="code">214</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_21" /></record>
+<record id="pcg_215" model="account.account.template"><field name="name">FONDS COMMERCIAL</field><field name="code">215</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_21" /></record>
+<record id="pcg_216" model="account.account.template"><field name="name">DROIT AU BAIL</field><field name="code">216</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_21" /></record>
+<record id="pcg_217" model="account.account.template"><field name="name">INVESTISSEMENTS DE CRÉATION</field><field name="code">217</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_21" /></record>
+<record id="pcg_218" model="account.account.template"><field name="name">AUTRES DROITS ET VALEURS INCORPORELS</field><field name="code">218</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_21" /></record>
+<record id="pcg_219" model="account.account.template"><field name="name">IMMOBILISATIONS INCORPORELLES EN COURS</field><field name="code">219</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_21" /></record>
+<record id="pcg_2191" model="account.account.template"><field name="name">Frais de recherche et de développement</field><field name="code">2191</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_219" /></record>
+<record id="pcg_2193" model="account.account.template"><field name="name">Logiciels</field><field name="code">2193</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_219" /></record>
+<record id="pcg_2198" model="account.account.template"><field name="name">Autres droits et valeurs incorporels</field><field name="code">2198</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_219" /></record>
+<record id="pcg_22" model="account.account.template"><field name="name">TERRAINS</field><field name="code">22</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_classe_2" /></record>
+<record id="pcg_221" model="account.account.template"><field name="name">TERRAINS AGRICOLES ET FORESTIERS</field><field name="code">221</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_22" /></record>
+<record id="pcg_2211" model="account.account.template"><field name="name">Terrains d'exploitation agricole</field><field name="code">2211</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_221" /></record>
+<record id="pcg_2212" model="account.account.template"><field name="name">Terrains d'exploitation forestière</field><field name="code">2212</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_221" /></record>
+<record id="pcg_2218" model="account.account.template"><field name="name">Autres terrains</field><field name="code">2218</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_221" /></record>
+<record id="pcg_222" model="account.account.template"><field name="name">TERRAINS NUS</field><field name="code">222</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_22" /></record>
+<record id="pcg_2221" model="account.account.template"><field name="name">Terrains à bâtir</field><field name="code">2221</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_222" /></record>
+<record id="pcg_2228" model="account.account.template"><field name="name">Autres terrains nus</field><field name="code">2228</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_222" /></record>
+<record id="pcg_223" model="account.account.template"><field name="name">TERRAINS BÂTIS</field><field name="code">223</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_22" /></record>
+<record id="pcg_2231" model="account.account.template"><field name="name">pour bâtiments industriels et agricoles</field><field name="code">2231</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_223" /></record>
+<record id="pcg_2232" model="account.account.template"><field name="name">pour bâtiments administratifs et commerciaux</field><field name="code">2232</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_223" /></record>
+<record id="pcg_2234" model="account.account.template"><field name="name">pour bâtiments affectés aux autres opérations professionnelles</field><field name="code">2234</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_223" /></record>
+<record id="pcg_2235" model="account.account.template"><field name="name">pour bâtiments affectés aux autres opérations non professionnelles</field><field name="code">2235</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_223" /></record>
+<record id="pcg_2238" model="account.account.template"><field name="name">Autres terrains bâtis</field><field name="code">2238</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_223" /></record>
+<record id="pcg_224" model="account.account.template"><field name="name">TRAVAUX DE MISE EN VALEUR DES TERRAINS</field><field name="code">224</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_22" /></record>
+<record id="pcg_2241" model="account.account.template"><field name="name">Plantation d'arbres et d'arbustes</field><field name="code">2241</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_224" /></record>
+<record id="pcg_2248" model="account.account.template"><field name="name">Autres travaux</field><field name="code">2248</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_224" /></record>
+<record id="pcg_225" model="account.account.template"><field name="name">TERRAINS DE GISEMENT</field><field name="code">225</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_22" /></record>
+<record id="pcg_2251" model="account.account.template"><field name="name">Carrières</field><field name="code">2251</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_225" /></record>
+<record id="pcg_226" model="account.account.template"><field name="name">TERRAINS AMÉNAGÉS</field><field name="code">226</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_22" /></record>
+<record id="pcg_2261" model="account.account.template"><field name="name">Parkings</field><field name="code">2261</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_226" /></record>
+<record id="pcg_227" model="account.account.template"><field name="name">TERRAINS MIS EN CONCESSION</field><field name="code">227</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_22" /></record>
+<record id="pcg_228" model="account.account.template"><field name="name">AUTRES TERRAINS</field><field name="code">228</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_22" /></record>
+<record id="pcg_2281" model="account.account.template"><field name="name">Terrains des immeubles de rapport</field><field name="code">2281</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_228" /></record>
+<record id="pcg_2285" model="account.account.template"><field name="name">Terrains des logements affectés au personnel</field><field name="code">2285</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_228" /></record>
+<record id="pcg_2288" model="account.account.template"><field name="name">Autres terrains</field><field name="code">2288</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_228" /></record>
+<record id="pcg_229" model="account.account.template"><field name="name">AMÉNAGEMENTS DE TERRAINS EN COURS</field><field name="code">229</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_22" /></record>
+<record id="pcg_2291" model="account.account.template"><field name="name">Terrains agricoles et forestiers</field><field name="code">2291</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_229" /></record>
+<record id="pcg_2292" model="account.account.template"><field name="name">Terrains nus</field><field name="code">2292</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_229" /></record>
+<record id="pcg_2295" model="account.account.template"><field name="name">Terrains de gisement</field><field name="code">2295</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_229" /></record>
+<record id="pcg_2298" model="account.account.template"><field name="name">Autres terrains</field><field name="code">2298</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_229" /></record>
+<record id="pcg_23" model="account.account.template"><field name="name">BÂTIMENTS, INSTALLATIONS TECHNIQUES ET AGENCEMENTS</field><field name="code">23</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_classe_2" /></record>
+<record id="pcg_231" model="account.account.template"><field name="name">BÂTIMENTS INDUSTRIELS, AGRICOLES, ADMINISTRATIFS ET COMMERCIAUX SUR SOL PROPRE</field><field name="code">231</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_23" /></record>
+<record id="pcg_2311" model="account.account.template"><field name="name">Bâtiments industriels</field><field name="code">2311</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_231" /></record>
+<record id="pcg_2312" model="account.account.template"><field name="name">Bâtiments agricoles</field><field name="code">2312</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_231" /></record>
+<record id="pcg_2313" model="account.account.template"><field name="name">Bâtiments administratifs et commerciaux</field><field name="code">2313</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_231" /></record>
+<record id="pcg_2314" model="account.account.template"><field name="name">Bâtiments affectés au logement du personnel</field><field name="code">2314</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_231" /></record>
+<record id="pcg_2315" model="account.account.template"><field name="name">Immeubles de rapport</field><field name="code">2315</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_231" /></record>
+<record id="pcg_232" model="account.account.template"><field name="name">BÂTIMENTS INDUSTRIELS, AGRICOLES, ADMINISTRATIFS ET COMMERCIAUX SUR SOL D’AUTRUI</field><field name="code">232</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_23" /></record>
+<record id="pcg_2321" model="account.account.template"><field name="name">Bâtiments industriels</field><field name="code">2321</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_232" /></record>
+<record id="pcg_2322" model="account.account.template"><field name="name">Bâtiments agricoles</field><field name="code">2322</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_232" /></record>
+<record id="pcg_2323" model="account.account.template"><field name="name">Bâtiments administratifs et commerciaux</field><field name="code">2323</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_232" /></record>
+<record id="pcg_2324" model="account.account.template"><field name="name">Bâtiments affectés au logement du personnel</field><field name="code">2324</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_232" /></record>
+<record id="pcg_2325" model="account.account.template"><field name="name">Immeubles de rapport</field><field name="code">2325</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_232" /></record>
+<record id="pcg_233" model="account.account.template"><field name="name">OUVRAGES D’INFRASTRUCTURE</field><field name="code">233</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_23" /></record>
+<record id="pcg_2331" model="account.account.template"><field name="name">Voies de terre</field><field name="code">2331</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_233" /></record>
+<record id="pcg_2332" model="account.account.template"><field name="name">Voies de fer</field><field name="code">2332</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_233" /></record>
+<record id="pcg_2333" model="account.account.template"><field name="name">Voies d’eau</field><field name="code">2333</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_233" /></record>
+<record id="pcg_2334" model="account.account.template"><field name="name">Barrages, Digues</field><field name="code">2334</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_233" /></record>
+<record id="pcg_2335" model="account.account.template"><field name="name">Pistes d’aérodrome</field><field name="code">2335</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_233" /></record>
+<record id="pcg_2338" model="account.account.template"><field name="name">Autres</field><field name="code">2338</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_233" /></record>
+<record id="pcg_234" model="account.account.template"><field name="name">INSTALLATIONS TECHNIQUES</field><field name="code">234</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_23" /></record>
+<record id="pcg_2341" model="account.account.template"><field name="name">Installations complexes spécialisées sur sol propre</field><field name="code">2341</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_234" /></record>
+<record id="pcg_2342" model="account.account.template"><field name="name">Installations complexes spécialisées sur sol d’autrui</field><field name="code">2342</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_234" /></record>
+<record id="pcg_2343" model="account.account.template"><field name="name">Installations à caractère spécifique sur sol propre</field><field name="code">2343</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_234" /></record>
+<record id="pcg_2344" model="account.account.template"><field name="name">Installations à caractère spécifique sur sol d’autrui</field><field name="code">2344</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_234" /></record>
+<record id="pcg_235" model="account.account.template"><field name="name">AMENAGEMENTS DE BUREAUX</field><field name="code">235</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_23" /></record>
+<record id="pcg_2351" model="account.account.template"><field name="name">Installations générales</field><field name="code">2351</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_235" /></record>
+<record id="pcg_2358" model="account.account.template"><field name="name">Autres</field><field name="code">2358</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_235" /></record>
+<record id="pcg_237" model="account.account.template"><field name="name">BÂTIMENTS INDUSTRIELS, AGRICOLES ET COMMERCIAUX MIS EN CONCESSION</field><field name="code">237</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_23" /></record>
+<record id="pcg_238" model="account.account.template"><field name="name">AUTRES INSTALLATIONS ET AGENCEMENTS</field><field name="code">238</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_23" /></record>
+<record id="pcg_239" model="account.account.template"><field name="name">BÂTIMENTS ET INSTALLATIONS EN COURS</field><field name="code">239</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_23" /></record>
+<record id="pcg_24" model="account.account.template"><field name="name">MATÉRIEL</field><field name="code">24</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_classe_2" /></record>
+<record id="pcg_241" model="account.account.template"><field name="name">MATÉRIEL ET OUTILLAGE INDUSTRIEL ET COMMERCIAL</field><field name="code">241</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_24" /></record>
+<record id="pcg_2411" model="account.account.template"><field name="name">Matériel industriel</field><field name="code">2411</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_241" /></record>
+<record id="pcg_2412" model="account.account.template"><field name="name">Outillage industriel</field><field name="code">2412</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_241" /></record>
+<record id="pcg_2413" model="account.account.template"><field name="name">Matériel commercial</field><field name="code">2413</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_241" /></record>
+<record id="pcg_2414" model="account.account.template"><field name="name">Outillage commercial</field><field name="code">2414</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_241" /></record>
+<record id="pcg_242" model="account.account.template"><field name="name">MATÉRIEL ET OUTILLAGE AGRICOLE</field><field name="code">242</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_24" /></record>
+<record id="pcg_2421" model="account.account.template"><field name="name">Matériel agricole</field><field name="code">2421</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_242" /></record>
+<record id="pcg_2422" model="account.account.template"><field name="name">Outillage agricole</field><field name="code">2422</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_242" /></record>
+<record id="pcg_243" model="account.account.template"><field name="name">MATÉRIEL D’EMBALLAGE RÉCUPÉRABLE ET IDENTIFIABLE</field><field name="code">243</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_24" /></record>
+<record id="pcg_244" model="account.account.template"><field name="name">MATÉRIEL ET MOBILIER</field><field name="code">244</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_24" /></record>
+<record id="pcg_2441" model="account.account.template"><field name="name">Matériel de bureau</field><field name="code">2441</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_244" /></record>
+<record id="pcg_2442" model="account.account.template"><field name="name">Matériel informatique</field><field name="code">2442</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_244" /></record>
+<record id="pcg_2443" model="account.account.template"><field name="name">Matériel bureautique</field><field name="code">2443</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_244" /></record>
+<record id="pcg_2444" model="account.account.template"><field name="name">Mobilier de bureau</field><field name="code">2444</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_244" /></record>
+<record id="pcg_2446" model="account.account.template"><field name="name">Matériel et mobilier des immeubles de rapport</field><field name="code">2446</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_244" /></record>
+<record id="pcg_2447" model="account.account.template"><field name="name">Matériel et mobilier des logements du personnel</field><field name="code">2447</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_244" /></record>
+<record id="pcg_245" model="account.account.template"><field name="name">MATÉRIEL DE TRANSPORT</field><field name="code">245</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_24" /></record>
+<record id="pcg_2451" model="account.account.template"><field name="name">Matériel automobile</field><field name="code">2451</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_245" /></record>
+<record id="pcg_2452" model="account.account.template"><field name="name">Matériel ferroviaire</field><field name="code">2452</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_245" /></record>
+<record id="pcg_2453" model="account.account.template"><field name="name">Matériel fluvial, lagunaire</field><field name="code">2453</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_245" /></record>
+<record id="pcg_2454" model="account.account.template"><field name="name">Matériel naval</field><field name="code">2454</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_245" /></record>
+<record id="pcg_2455" model="account.account.template"><field name="name">Matériel aérien</field><field name="code">2455</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_245" /></record>
+<record id="pcg_2456" model="account.account.template"><field name="name">Matériel hippomobile</field><field name="code">2456</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_245" /></record>
+<record id="pcg_2458" model="account.account.template"><field name="name">Autres (vélo, mobylette, moto)</field><field name="code">2458</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_245" /></record>
+<record id="pcg_246" model="account.account.template"><field name="name">IMMOBILISATIONS ANIMALES ET AGRICOLES</field><field name="code">246</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_24" /></record>
+<record id="pcg_2461" model="account.account.template"><field name="name">Cheptel, animaux de trait</field><field name="code">2461</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_246" /></record>
+<record id="pcg_2462" model="account.account.template"><field name="name">Cheptel, animaux reproducteurs</field><field name="code">2462</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_246" /></record>
+<record id="pcg_2463" model="account.account.template"><field name="name">Animaux de garde</field><field name="code">2463</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_246" /></record>
+<record id="pcg_2465" model="account.account.template"><field name="name">Plantations agricoles</field><field name="code">2465</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_246" /></record>
+<record id="pcg_2468" model="account.account.template"><field name="name">Autres</field><field name="code">2468</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_246" /></record>
+<record id="pcg_247" model="account.account.template"><field name="name">AGENCEMENTS ET AMÉNAGEMENTS DU MATÉRIEL</field><field name="code">247</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_24" /></record>
+<record id="pcg_248" model="account.account.template"><field name="name">AUTRES MATÉRIELS</field><field name="code">248</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_24" /></record>
+<record id="pcg_2481" model="account.account.template"><field name="name">Collections et oeuvres d’art</field><field name="code">2481</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_248" /></record>
+<record id="pcg_249" model="account.account.template"><field name="name">MATÉRIEL EN COURS</field><field name="code">249</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_24" /></record>
+<record id="pcg_2491" model="account.account.template"><field name="name">Matériel et outillage industriel et commercial</field><field name="code">2491</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_249" /></record>
+<record id="pcg_2492" model="account.account.template"><field name="name">Matériel et outillage agricole</field><field name="code">2492</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_249" /></record>
+<record id="pcg_2493" model="account.account.template"><field name="name">Matériel d’emballage récupérable et identifiable</field><field name="code">2493</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_249" /></record>
+<record id="pcg_2494" model="account.account.template"><field name="name">Matériel et mobilier de bureau</field><field name="code">2494</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_249" /></record>
+<record id="pcg_2495" model="account.account.template"><field name="name">Matériel de transport</field><field name="code">2495</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_249" /></record>
+<record id="pcg_2496" model="account.account.template"><field name="name">Immobilisations animales et agricoles</field><field name="code">2496</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_249" /></record>
+<record id="pcg_2497" model="account.account.template"><field name="name">Agencements et aménagements du matériel</field><field name="code">2497</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_249" /></record>
+<record id="pcg_2498" model="account.account.template"><field name="name">Autres matériels</field><field name="code">2498</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_249" /></record>
+<record id="pcg_25" model="account.account.template"><field name="name">AVANCES ET ACOMPTES VERSÉS SUR IMMOBILISATIONS</field><field name="code">25</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_classe_2" /></record>
+<record id="pcg_251" model="account.account.template"><field name="name">AVANCES ET ACOMPTES VERSÉS SUR IMMOBILISATIONS INCORPORELLES</field><field name="code">251</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_25" /></record>
+<record id="pcg_252" model="account.account.template"><field name="name">AVANCES ET ACOMPTES VERSÉS SUR IMMOBILISATIONS CORPORELLES</field><field name="code">252</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_25" /></record>
+<record id="pcg_26" model="account.account.template"><field name="name">TITRES DE PARTICIPATION</field><field name="code">26</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_classe_2" /></record>
+<record id="pcg_261" model="account.account.template"><field name="name">TITRES DE PARTICIPATION DANS DES SOCIÉTÉS SOUS CONTRÔLE EXCLUSIF</field><field name="code">261</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_26" /></record>
+<record id="pcg_262" model="account.account.template"><field name="name">TITRES DE PARTICIPATION DANS DES SOCIÉTÉS SOUS CONTRÔLE CONJOINT</field><field name="code">262</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_26" /></record>
+<record id="pcg_263" model="account.account.template"><field name="name">TITRES DE PARTICIPATION DANS DES SOCIÉTÉS CONFÉRANT UNE INFLUENCE NOTABLE</field><field name="code">263</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_26" /></record>
+<record id="pcg_265" model="account.account.template"><field name="name">PARTICIPATIONS DANS DES ORGANISMES PROFESSIONNELS</field><field name="code">265</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_26" /></record>
+<record id="pcg_266" model="account.account.template"><field name="name">PARTS DANS DES GROUPEMENTS D’INTÉRÊT ÉCONOMIQUE (G.I.E.)</field><field name="code">266</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_26" /></record>
+<record id="pcg_268" model="account.account.template"><field name="name">AUTRES TITRES DE PARTICIPATION</field><field name="code">268</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_26" /></record>
+<record id="pcg_27" model="account.account.template"><field name="name">AUTRES IMMOBLISATIONS FINANCIÈRES</field><field name="code">27</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_classe_2" /></record>
+<record id="pcg_271" model="account.account.template"><field name="name">PRÊTS ET CRÉANCES NON COMMERCIALES</field><field name="code">271</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_27" /></record>
+<record id="pcg_2711" model="account.account.template"><field name="name">Prêts participatifs</field><field name="code">2711</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_271" /></record>
+<record id="pcg_2712" model="account.account.template"><field name="name">Prêts aux associés</field><field name="code">2712</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_271" /></record>
+<record id="pcg_2713" model="account.account.template"><field name="name">Billets de fonds</field><field name="code">2713</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_271" /></record>
+<record id="pcg_2714" model="account.account.template"><field name="name">Titres prêtés</field><field name="code">2714</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_271" /></record>
+<record id="pcg_272" model="account.account.template"><field name="name">PRÊTS AU PERSONNEL</field><field name="code">272</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_27" /></record>
+<record id="pcg_2721" model="account.account.template"><field name="name">Prêts immobiliers</field><field name="code">2721</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_272" /></record>
+<record id="pcg_2722" model="account.account.template"><field name="name">Prêts mobiliers et d’installation</field><field name="code">2722</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_272" /></record>
+<record id="pcg_2728" model="account.account.template"><field name="name">Autres prêts (frais d’études…)</field><field name="code">2728</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_272" /></record>
+<record id="pcg_273" model="account.account.template"><field name="name">CRÉANCES SUR L’ÉTAT</field><field name="code">273</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_27" /></record>
+<record id="pcg_2731" model="account.account.template"><field name="name">Retenues de garantie</field><field name="code">2731</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_273" /></record>
+<record id="pcg_2733" model="account.account.template"><field name="name">Fonds réglementé</field><field name="code">2733</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_273" /></record>
+<record id="pcg_2738" model="account.account.template"><field name="name">Autres</field><field name="code">2738</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_273" /></record>
+<record id="pcg_274" model="account.account.template"><field name="name">TITRES IMMOBILISÉS</field><field name="code">274</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_27" /></record>
+<record id="pcg_2741" model="account.account.template"><field name="name">Titres immobilisés de l’activité de portefeuille (T.I.A.P.)</field><field name="code">2741</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_274" /></record>
+<record id="pcg_2742" model="account.account.template"><field name="name">Titres participatifs</field><field name="code">2742</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_274" /></record>
+<record id="pcg_2743" model="account.account.template"><field name="name">Certificats d’investissement</field><field name="code">2743</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_274" /></record>
+<record id="pcg_2744" model="account.account.template"><field name="name">Parts de fonds commun de placement (F.C.P.)</field><field name="code">2744</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_274" /></record>
+<record id="pcg_2748" model="account.account.template"><field name="name">Autres titres immobilisés</field><field name="code">2748</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_274" /></record>
+<record id="pcg_275" model="account.account.template"><field name="name">DÉPÔTS ET CAUTIONNEMENTS VERSÉS</field><field name="code">275</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_27" /></record>
+<record id="pcg_2751" model="account.account.template"><field name="name">Dépôts pour loyers d’avance</field><field name="code">2751</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_275" /></record>
+<record id="pcg_2752" model="account.account.template"><field name="name">Dépôts pour l’électricité</field><field name="code">2752</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_275" /></record>
+<record id="pcg_2753" model="account.account.template"><field name="name">Dépôts pour l’eau</field><field name="code">2753</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_275" /></record>
+<record id="pcg_2754" model="account.account.template"><field name="name">Dépôts pour le gaz</field><field name="code">2754</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_275" /></record>
+<record id="pcg_2755" model="account.account.template"><field name="name">Dépôts pour le téléphone, le télex, la télécopie</field><field name="code">2755</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_275" /></record>
+<record id="pcg_2756" model="account.account.template"><field name="name">Cautionnements sur marchés publics</field><field name="code">2756</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_275" /></record>
+<record id="pcg_2757" model="account.account.template"><field name="name">Cautionnements sur autres opérations</field><field name="code">2757</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_275" /></record>
+<record id="pcg_2758" model="account.account.template"><field name="name">Autres dépôts et cautionnements</field><field name="code">2758</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_275" /></record>
+<record id="pcg_276" model="account.account.template"><field name="name">INTÉRÊTS COURUS</field><field name="code">276</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_27" /></record>
+<record id="pcg_2761" model="account.account.template"><field name="name">Prêts et créances non commerciales</field><field name="code">2761</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_276" /></record>
+<record id="pcg_2762" model="account.account.template"><field name="name">Prêts au personnel</field><field name="code">2762</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_276" /></record>
+<record id="pcg_2763" model="account.account.template"><field name="name">Créances sur l'Etat</field><field name="code">2763</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_276" /></record>
+<record id="pcg_2764" model="account.account.template"><field name="name">Titres immobilisés</field><field name="code">2764</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_276" /></record>
+<record id="pcg_2765" model="account.account.template"><field name="name">Dépôts et cautionnements versés</field><field name="code">2765</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_276" /></record>
+<record id="pcg_2767" model="account.account.template"><field name="name">Créances rattachées à des participations</field><field name="code">2767</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_276" /></record>
+<record id="pcg_2768" model="account.account.template"><field name="name">Immobilisations financières diverses</field><field name="code">2768</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_276" /></record>
+<record id="pcg_277" model="account.account.template"><field name="name">CRÉANCES RATTACHÉES À DES PARTICIPATIONS ET AVANCES À DES G.I.E.</field><field name="code">277</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_27" /></record>
+<record id="pcg_2771" model="account.account.template"><field name="name">Créances rattachées à des participations (groupe)</field><field name="code">2771</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_277" /></record>
+<record id="pcg_2772" model="account.account.template"><field name="name">Créances rattachées à des participations (hors groupe)</field><field name="code">2772</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_277" /></record>
+<record id="pcg_2773" model="account.account.template"><field name="name">Créances rattachées à des sociétés en participation</field><field name="code">2773</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_277" /></record>
+<record id="pcg_2774" model="account.account.template"><field name="name">Avances à des Groupements d'intérêt économique (G.I.E.)</field><field name="code">2774</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_277" /></record>
+<record id="pcg_278" model="account.account.template"><field name="name">IMMOBILISATIONS FINANCIÈRES DIVERSES</field><field name="code">278</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_27" /></record>
+<record id="pcg_2781" model="account.account.template"><field name="name">Créances diverses groupe</field><field name="code">2781</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_278" /></record>
+<record id="pcg_2782" model="account.account.template"><field name="name">Créances divers hors groupe</field><field name="code">2782</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_278" /></record>
+<record id="pcg_2785" model="account.account.template"><field name="name">Or et métaux précieux ()</field><field name="code">2785</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_278" /></record>
+<record id="pcg_28" model="account.account.template"><field name="name">AMORTISSEMENTS</field><field name="code">28</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_classe_2" /></record>
+<record id="pcg_281" model="account.account.template"><field name="name">AMORTISSEMENTS DES IMMOBILISATIONS INCORPORELLES</field><field name="code">281</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_28" /></record>
+<record id="pcg_2811" model="account.account.template"><field name="name">Amortissements des frais de recherche et de développement</field><field name="code">2811</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_281" /></record>
+<record id="pcg_2812" model="account.account.template"><field name="name">Amortissements des brevets, licences, concessions et droits similaires</field><field name="code">2812</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_281" /></record>
+<record id="pcg_2813" model="account.account.template"><field name="name">Amortissements des logiciels</field><field name="code">2813</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_281" /></record>
+<record id="pcg_2814" model="account.account.template"><field name="name">Amortissements des marques</field><field name="code">2814</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_281" /></record>
+<record id="pcg_2815" model="account.account.template"><field name="name">Amortissements du fonds commercial</field><field name="code">2815</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_281" /></record>
+<record id="pcg_2816" model="account.account.template"><field name="name">Amortissements du droit au bail</field><field name="code">2816</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_281" /></record>
+<record id="pcg_2817" model="account.account.template"><field name="name">Amortissements des investissements de création</field><field name="code">2817</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_281" /></record>
+<record id="pcg_2818" model="account.account.template"><field name="name">Amortissements des autres droits et valeurs incorporels</field><field name="code">2818</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_281" /></record>
+<record id="pcg_282" model="account.account.template"><field name="name">AMORTISSEMENTS DES TERRAINS</field><field name="code">282</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_28" /></record>
+<record id="pcg_2821" model="account.account.template"><field name="name">Amortissements des terrains agricoles et forestiers</field><field name="code">2821</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_282" /></record>
+<record id="pcg_2824" model="account.account.template"><field name="name">Amortissements des travaux de mise en valeur des terrains</field><field name="code">2824</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_282" /></record>
+<record id="pcg_2825" model="account.account.template"><field name="name">Amortissements des terrains de gisement</field><field name="code">2825</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_282" /></record>
+<record id="pcg_283" model="account.account.template"><field name="name">AMORTISSEMENTS DES BÂTIMENTS, INSTALLATIONS TECHNIQUES ET AGENCEMENTS</field><field name="code">283</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_28" /></record>
+<record id="pcg_2831" model="account.account.template"><field name="name">Amortissements des bâtiments industriels, agricoles, administratifs et commerciaux sur sol propre</field><field name="code">2831</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_283" /></record>
+<record id="pcg_2832" model="account.account.template"><field name="name">Amortissements des bâtiments industriels, agricoles, administratifs et commerciaux sur sol d'autrui</field><field name="code">2832</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_283" /></record>
+<record id="pcg_2833" model="account.account.template"><field name="name">Amortissements des ouvrages d'infrastructure</field><field name="code">2833</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_283" /></record>
+<record id="pcg_2834" model="account.account.template"><field name="name">Amortissements des installations techniques</field><field name="code">2834</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_283" /></record>
+<record id="pcg_2835" model="account.account.template"><field name="name">Amortissements des aménagements de bureaux</field><field name="code">2835</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_283" /></record>
+<record id="pcg_2837" model="account.account.template"><field name="name">Amortissements des bâtiments industriels, agricoles et commerciaux mis en concession</field><field name="code">2837</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_283" /></record>
+<record id="pcg_2838" model="account.account.template"><field name="name">Amortissements des autres installations et agencements</field><field name="code">2838</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_283" /></record>
+<record id="pcg_284" model="account.account.template"><field name="name">AMORTISSEMENTS DU MATÉRIEL</field><field name="code">284</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_28" /></record>
+<record id="pcg_2841" model="account.account.template"><field name="name">Amortissements du matériel et outillage industriel et commercial</field><field name="code">2841</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_284" /></record>
+<record id="pcg_2842" model="account.account.template"><field name="name">Amortissements du matériel et outillage agricole</field><field name="code">2842</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_284" /></record>
+<record id="pcg_2843" model="account.account.template"><field name="name">Amortissements du matériel d'emballage récupérable et identifiable</field><field name="code">2843</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_284" /></record>
+<record id="pcg_2844" model="account.account.template"><field name="name">Amortissements du matériel et mobilier</field><field name="code">2844</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_284" /></record>
+<record id="pcg_2845" model="account.account.template"><field name="name">Amortissements du matériel de transport</field><field name="code">2845</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_284" /></record>
+<record id="pcg_2846" model="account.account.template"><field name="name">Amortissements des immobilisations animales et agricoles</field><field name="code">2846</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_284" /></record>
+<record id="pcg_2847" model="account.account.template"><field name="name">Amortissements des agencements et aménagements du matériel</field><field name="code">2847</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_284" /></record>
+<record id="pcg_2848" model="account.account.template"><field name="name">Amortissements des autres matériels</field><field name="code">2848</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_284" /></record>
+<record id="pcg_29" model="account.account.template"><field name="name">PROVISIONS POUR DEPRECIATION</field><field name="code">29</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_classe_2" /></record>
+<record id="pcg_291" model="account.account.template"><field name="name">PROVISIONS POUR DÉPRÉCIATION DES IMMOBILISATIONS INCORPORELLES</field><field name="code">291</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_29" /></record>
+<record id="pcg_2912" model="account.account.template"><field name="name">Provisions pour dépréciation des brevets, licences, concessions et droits similaires</field><field name="code">2912</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_291" /></record>
+<record id="pcg_2913" model="account.account.template"><field name="name">Provisions pour dépréciation des logiciels</field><field name="code">2913</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_291" /></record>
+<record id="pcg_2914" model="account.account.template"><field name="name">Provisions pour dépréciation des marques</field><field name="code">2914</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_291" /></record>
+<record id="pcg_2915" model="account.account.template"><field name="name">Provisions pour dépréciation du fonds commercial</field><field name="code">2915</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_291" /></record>
+<record id="pcg_2916" model="account.account.template"><field name="name">Provisions pour dépréciation du droit au bail</field><field name="code">2916</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_291" /></record>
+<record id="pcg_2917" model="account.account.template"><field name="name">Provisions pour dépréciation des investissements de création</field><field name="code">2917</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_291" /></record>
+<record id="pcg_2918" model="account.account.template"><field name="name">Provisions pour dépréciation des autres droits et valeurs incorporels</field><field name="code">2918</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_291" /></record>
+<record id="pcg_2919" model="account.account.template"><field name="name">Provisions pour dépréciation des immobilisations incorporelles en cours</field><field name="code">2919</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_291" /></record>
+<record id="pcg_292" model="account.account.template"><field name="name">PROVISIONS POUR DÉPRÉCIATION DES TERRAINS</field><field name="code">292</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_29" /></record>
+<record id="pcg_2921" model="account.account.template"><field name="name">Provisions pour dépréciation des terrains agricoles et forestiers</field><field name="code">2921</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_292" /></record>
+<record id="pcg_2922" model="account.account.template"><field name="name">Provisions pour dépréciation des terrains nus</field><field name="code">2922</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_292" /></record>
+<record id="pcg_2923" model="account.account.template"><field name="name">Provisions pour dépréciation des terrains bâtis</field><field name="code">2923</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_292" /></record>
+<record id="pcg_2924" model="account.account.template"><field name="name">Provisions pour dépréciation des travaux de mise en valeur des terrains</field><field name="code">2924</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_292" /></record>
+<record id="pcg_2925" model="account.account.template"><field name="name">Provisions pour dépréciation des terrains de gisement</field><field name="code">2925</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_292" /></record>
+<record id="pcg_2926" model="account.account.template"><field name="name">Provisions pour dépréciation des terrains aménagés</field><field name="code">2926</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_292" /></record>
+<record id="pcg_2927" model="account.account.template"><field name="name">Provisions pour dépréciation des terrains mis en concession</field><field name="code">2927</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_292" /></record>
+<record id="pcg_2928" model="account.account.template"><field name="name">Provisions pour dépréciation des autres terrains</field><field name="code">2928</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_292" /></record>
+<record id="pcg_2929" model="account.account.template"><field name="name">Provisions pour dépréciation des aménagements de terrains en cours</field><field name="code">2929</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_292" /></record>
+<record id="pcg_293" model="account.account.template"><field name="name">PROVISIONS POUR DÉPRÉCIATION DES BÂTIMENTS, INSTALLATIONS TECHNIQUES ET AGENCEMENTS</field><field name="code">293</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_29" /></record>
+<record id="pcg_2931" model="account.account.template"><field name="name">Provisions pour dépréciation des bâtiments industriels, agricoles, administratifs et commerciaux sur sol propre</field><field name="code">2931</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_293" /></record>
+<record id="pcg_2932" model="account.account.template"><field name="name">Provisions pour dépréciation des bâtiments industriels, agricoles, administratifs et commerciaux sur sol d'autrui</field><field name="code">2932</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_293" /></record>
+<record id="pcg_2933" model="account.account.template"><field name="name">Provisions pour dépréciation des ouvrages d'infrastructures</field><field name="code">2933</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_293" /></record>
+<record id="pcg_2934" model="account.account.template"><field name="name">Provisions pour dépréciation des installations techniques</field><field name="code">2934</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_293" /></record>
+<record id="pcg_2935" model="account.account.template"><field name="name">Provisions pour dépréciation des aménagements de bureaux</field><field name="code">2935</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_293" /></record>
+<record id="pcg_2937" model="account.account.template"><field name="name">Provisions pour dépréciation des bâtiments industriels, agricoles et commerciaux mis en concession</field><field name="code">2937</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_293" /></record>
+<record id="pcg_2938" model="account.account.template"><field name="name">Provisions pour dépréciation des autres installations et agencements</field><field name="code">2938</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_293" /></record>
+<record id="pcg_2939" model="account.account.template"><field name="name">Provisions pour dépréciation des bâtiments et installations en cours</field><field name="code">2939</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_293" /></record>
+<record id="pcg_294" model="account.account.template"><field name="name">PROVISIONS POUR DÉPRÉCIATION DE MATÉRIEL</field><field name="code">294</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_29" /></record>
+<record id="pcg_2941" model="account.account.template"><field name="name">Provisions pour dépréciation du matériel et outillage industriel et commercial</field><field name="code">2941</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_294" /></record>
+<record id="pcg_2942" model="account.account.template"><field name="name">Provisions pour dépréciation du matériel et outillage agricole</field><field name="code">2942</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_294" /></record>
+<record id="pcg_2943" model="account.account.template"><field name="name">Provisions pour dépréciation du matériel d'emballage récupérable et identifiable</field><field name="code">2943</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_294" /></record>
+<record id="pcg_2944" model="account.account.template"><field name="name">Provisions pour dépréciation du matériel et mobilier</field><field name="code">2944</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_294" /></record>
+<record id="pcg_2945" model="account.account.template"><field name="name">Provisions pour dépréciation du matériel de transport</field><field name="code">2945</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_294" /></record>
+<record id="pcg_2946" model="account.account.template"><field name="name">Provisions pour dépréciation des immobilisations animales et agricoles</field><field name="code">2946</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_294" /></record>
+<record id="pcg_2947" model="account.account.template"><field name="name">Provisions pour dépréciation des agencements et aménagements du matériel</field><field name="code">2947</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_294" /></record>
+<record id="pcg_2948" model="account.account.template"><field name="name">Provisions pour dépréciation des autres matériels</field><field name="code">2948</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_294" /></record>
+<record id="pcg_2949" model="account.account.template"><field name="name">Provisions pour dépréciation de matériel en cours</field><field name="code">2949</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_294" /></record>
+<record id="pcg_295" model="account.account.template"><field name="name">PROVISIONS POUR DÉPRÉCIATION DES AVANCES ET ACOMPTES VERSÉS SUR IMMOBILISATIONS</field><field name="code">295</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_29" /></record>
+<record id="pcg_2951" model="account.account.template"><field name="name">Provisions pour dépréciation des avances et acomptes versés sur immobilisations incorporelles</field><field name="code">2951</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_295" /></record>
+<record id="pcg_2952" model="account.account.template"><field name="name">Provisions pour dépréciation des avances et acomptes versés sur immobilisations corporelles</field><field name="code">2952</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_295" /></record>
+<record id="pcg_296" model="account.account.template"><field name="name">PROVISIONS POUR DÉPRÉCIATION DES TITRES DE PARTICIPATION</field><field name="code">296</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_29" /></record>
+<record id="pcg_2961" model="account.account.template"><field name="name">Provisions pour dépréciation des titres de participation dans des sociétés sous contrôle exclusif</field><field name="code">2961</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_296" /></record>
+<record id="pcg_2962" model="account.account.template"><field name="name">Provisions pour dépréciation des titres de participation dans les sociétés sous contrôle conjoint</field><field name="code">2962</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_296" /></record>
+<record id="pcg_2963" model="account.account.template"><field name="name">Provisions pour dépréciation des titres de participation dans les sociétés conférant une influence notable</field><field name="code">2963</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_296" /></record>
+<record id="pcg_2965" model="account.account.template"><field name="name">Provisions pour dépréciation des participations dans des organismes professionnels</field><field name="code">2965</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_296" /></record>
+<record id="pcg_2966" model="account.account.template"><field name="name">Provisions pour dépréciation des parts dans des GIE</field><field name="code">2966</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_296" /></record>
+<record id="pcg_2968" model="account.account.template"><field name="name">Provisions pour dépréciation des autres titres de participation</field><field name="code">2968</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_296" /></record>
+<record id="pcg_297" model="account.account.template"><field name="name">PROVISIONS POUR DÉPRÉCIATION DES AUTRES IMMOBILISATIONS FINANCIÈRES</field><field name="code">297</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_29" /></record>
+<record id="pcg_2971" model="account.account.template"><field name="name">Provisions pour dépréciation des prêts et créances non commerciales</field><field name="code">2971</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_297" /></record>
+<record id="pcg_2972" model="account.account.template"><field name="name">Provisions pour dépréciation des prêts au personnel</field><field name="code">2972</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_297" /></record>
+<record id="pcg_2973" model="account.account.template"><field name="name">Provisions pour dépréciation des créances sur l'Etat</field><field name="code">2973</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_297" /></record>
+<record id="pcg_2974" model="account.account.template"><field name="name">Provisions pour dépréciation des titres immobilisés</field><field name="code">2974</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_297" /></record>
+<record id="pcg_2975" model="account.account.template"><field name="name">Provisions pour dépréciation des dépôts et cautionnements versés</field><field name="code">2975</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_297" /></record>
+<record id="pcg_2977" model="account.account.template"><field name="name">Provisions pour dépréciation des créances rattachées à des participations et avances à des GIE</field><field name="code">2977</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_297" /></record>
+<record id="pcg_2978" model="account.account.template"><field name="name">Provisions pour dépréciation des créances financières diverses</field><field name="code">2978</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_immobilisations" /><field name="parent_id" ref="pcg_297" /></record>
+<record id="pcg_31" model="account.account.template"><field name="name">MARCHANDISES</field><field name="code">31</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_classe_3" /></record>
+<record id="pcg_311" model="account.account.template"><field name="name">MARCHANDISES A</field><field name="code">311</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_31" /></record>
+<record id="pcg_3111" model="account.account.template"><field name="name">Marchandises A1</field><field name="code">3111</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_311" /></record>
+<record id="pcg_3112" model="account.account.template"><field name="name">Marchandises A2</field><field name="code">3112</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_311" /></record>
+<record id="pcg_312" model="account.account.template"><field name="name">MARCHANDISES B</field><field name="code">312</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_31" /></record>
+<record id="pcg_3121" model="account.account.template"><field name="name">Marchandises B1</field><field name="code">3121</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_312" /></record>
+<record id="pcg_3122" model="account.account.template"><field name="name">Marchandises B2</field><field name="code">3122</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_312" /></record>
+<record id="pcg_318" model="account.account.template"><field name="name">MARCHANDISES HORS ACTIVITÉS ORDINAIRES (H.A.O.)</field><field name="code">318</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_31" /></record>
+<record id="pcg_32" model="account.account.template"><field name="name">MATIÈRES PREMIÈRES ET FOURNITURES LIÉES</field><field name="code">32</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_classe_3" /></record>
+<record id="pcg_321" model="account.account.template"><field name="name">MATIÈRES A</field><field name="code">321</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_32" /></record>
+<record id="pcg_322" model="account.account.template"><field name="name">MATIÈRES B</field><field name="code">322</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_32" /></record>
+<record id="pcg_323" model="account.account.template"><field name="name">FOURNITURES (A,B)</field><field name="code">323</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_32" /></record>
+<record id="pcg_33" model="account.account.template"><field name="name">AUTRES APPROVISIONNEMENTS</field><field name="code">33</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_classe_3" /></record>
+<record id="pcg_331" model="account.account.template"><field name="name">MATIÈRES CONSOMMABLES</field><field name="code">331</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_33" /></record>
+<record id="pcg_332" model="account.account.template"><field name="name">FOURNITURES D'ATELIER ET D'USINE</field><field name="code">332</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_33" /></record>
+<record id="pcg_333" model="account.account.template"><field name="name">FOURNITURES DE MAGASIN</field><field name="code">333</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_33" /></record>
+<record id="pcg_334" model="account.account.template"><field name="name">FOURNITURES DE BUREAU</field><field name="code">334</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_33" /></record>
+<record id="pcg_335" model="account.account.template"><field name="name">EMBALLAGES</field><field name="code">335</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_33" /></record>
+<record id="pcg_3351" model="account.account.template"><field name="name">Emballages perdus</field><field name="code">3351</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_335" /></record>
+<record id="pcg_3352" model="account.account.template"><field name="name">Emballages récupérables non identifiables</field><field name="code">3352</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_335" /></record>
+<record id="pcg_3353" model="account.account.template"><field name="name">Emballages à usage mixte</field><field name="code">3353</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_335" /></record>
+<record id="pcg_3358" model="account.account.template"><field name="name">Autres emballages</field><field name="code">3358</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_335" /></record>
+<record id="pcg_338" model="account.account.template"><field name="name">AUTRES MATIÈRES</field><field name="code">338</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_33" /></record>
+<record id="pcg_34" model="account.account.template"><field name="name">PRODUITS EN COURS</field><field name="code">34</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_classe_3" /></record>
+<record id="pcg_341" model="account.account.template"><field name="name">PRODUITS EN COURS</field><field name="code">341</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_34" /></record>
+<record id="pcg_3411" model="account.account.template"><field name="name">Produits en cours P1</field><field name="code">3411</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_341" /></record>
+<record id="pcg_3412" model="account.account.template"><field name="name">Produits en cours P2</field><field name="code">3412</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_341" /></record>
+<record id="pcg_342" model="account.account.template"><field name="name">TRAVAUX EN COURS</field><field name="code">342</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_34" /></record>
+<record id="pcg_3421" model="account.account.template"><field name="name">Travaux en cours T1</field><field name="code">3421</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_342" /></record>
+<record id="pcg_3422" model="account.account.template"><field name="name">Travaux en cours T2</field><field name="code">3422</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_342" /></record>
+<record id="pcg_343" model="account.account.template"><field name="name">PRODUITS INTERMÉDIAIRES EN COURS</field><field name="code">343</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_34" /></record>
+<record id="pcg_3431" model="account.account.template"><field name="name">Produits intermédiaires A</field><field name="code">3431</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_343" /></record>
+<record id="pcg_3432" model="account.account.template"><field name="name">Produits intermédiaires B</field><field name="code">3432</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_343" /></record>
+<record id="pcg_344" model="account.account.template"><field name="name">PRODUITS RÉSIDUELS EN COURS</field><field name="code">344</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_34" /></record>
+<record id="pcg_3441" model="account.account.template"><field name="name">Produits résiduels A</field><field name="code">3441</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_344" /></record>
+<record id="pcg_3442" model="account.account.template"><field name="name">Produits résiduels B</field><field name="code">3442</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_344" /></record>
+<record id="pcg_35" model="account.account.template"><field name="name">SERVICES EN COURS</field><field name="code">35</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_classe_3" /></record>
+<record id="pcg_351" model="account.account.template"><field name="name">ÉTUDES EN COURS</field><field name="code">351</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_35" /></record>
+<record id="pcg_3511" model="account.account.template"><field name="name">Études en cours E1</field><field name="code">3511</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_351" /></record>
+<record id="pcg_3512" model="account.account.template"><field name="name">Études en cours E2</field><field name="code">3512</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_351" /></record>
+<record id="pcg_352" model="account.account.template"><field name="name">PRESTATIONS DE SERVICES EN COURS</field><field name="code">352</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_35" /></record>
+<record id="pcg_3521" model="account.account.template"><field name="name">Prestations de services S1</field><field name="code">3521</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_352" /></record>
+<record id="pcg_3522" model="account.account.template"><field name="name">Prestations de services S2</field><field name="code">3522</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_352" /></record>
+<record id="pcg_36" model="account.account.template"><field name="name">PRODUITS FINIS</field><field name="code">36</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_classe_3" /></record>
+<record id="pcg_361" model="account.account.template"><field name="name">PRODUITS FINIS A</field><field name="code">361</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_36" /></record>
+<record id="pcg_362" model="account.account.template"><field name="name">PRODUITS FINIS B</field><field name="code">362</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_36" /></record>
+<record id="pcg_37" model="account.account.template"><field name="name">PRODUITS INTERMÉDIAIRES ET RÉSIDUELS</field><field name="code">37</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_classe_3" /></record>
+<record id="pcg_371" model="account.account.template"><field name="name">PRODUITS INTERMÉDIAIRES</field><field name="code">371</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_37" /></record>
+<record id="pcg_3711" model="account.account.template"><field name="name">Produits intermédiaires A</field><field name="code">3711</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_371" /></record>
+<record id="pcg_3712" model="account.account.template"><field name="name">Produits intermédiaires B</field><field name="code">3712</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_371" /></record>
+<record id="pcg_372" model="account.account.template"><field name="name">PRODUITS RÉSIDUELS</field><field name="code">372</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_37" /></record>
+<record id="pcg_3721" model="account.account.template"><field name="name">Déchets</field><field name="code">3721</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_372" /></record>
+<record id="pcg_3722" model="account.account.template"><field name="name">Rebuts</field><field name="code">3722</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_372" /></record>
+<record id="pcg_3723" model="account.account.template"><field name="name">Matières de Récupération</field><field name="code">3723</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_372" /></record>
+<record id="pcg_38" model="account.account.template"><field name="name">STOCKS EN COURS DE ROUTE, EN CONSIGNATION OU EN DÉPÔT</field><field name="code">38</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_classe_3" /></record>
+<record id="pcg_381" model="account.account.template"><field name="name">MARCHANDISES EN COURS DE ROUTE</field><field name="code">381</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_38" /></record>
+<record id="pcg_382" model="account.account.template"><field name="name">MATIÈRES PREMIÈRES ET FOURNITURES LIÉES EN COURS DE ROUTE</field><field name="code">382</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_38" /></record>
+<record id="pcg_383" model="account.account.template"><field name="name">AUTRES APPROVISIONNEMENTS EN COURS DE ROUTE</field><field name="code">383</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_38" /></record>
+<record id="pcg_386" model="account.account.template"><field name="name">PRODUITS FINIS EN COURS DE ROUTE</field><field name="code">386</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_38" /></record>
+<record id="pcg_387" model="account.account.template"><field name="name">STOCK EN CONSIGNATION OU EN DÉPÔT</field><field name="code">387</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_38" /></record>
+<record id="pcg_3871" model="account.account.template"><field name="name">Stock en consignation</field><field name="code">3871</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_387" /></record>
+<record id="pcg_3872" model="account.account.template"><field name="name">Stock en dépôt</field><field name="code">3872</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_387" /></record>
+<record id="pcg_388" model="account.account.template"><field name="name">STOCK PROVENANT D'IMMOBILISATIONS MISES HORS SERVICE OU AU REBUT</field><field name="code">388</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_38" /></record>
+<record id="pcg_39" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES STOCKS</field><field name="code">39</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_classe_3" /></record>
+<record id="pcg_391" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES STOCKS DE MARCHANDISES</field><field name="code">391</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_39" /></record>
+<record id="pcg_392" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES STOCKS DE MATIÈRES PREMIÈRES ET FOURNITURES LIÉES</field><field name="code">392</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_39" /></record>
+<record id="pcg_393" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES STOCKS D'AUTRES APPOVISIONNEMENTS</field><field name="code">393</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_39" /></record>
+<record id="pcg_394" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES PRODUCTIONS EN COURS</field><field name="code">394</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_39" /></record>
+<record id="pcg_395" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES SERVICES EN COURS</field><field name="code">395</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_39" /></record>
+<record id="pcg_396" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES STOCKS DE PRODUITS FINIS</field><field name="code">396</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_39" /></record>
+<record id="pcg_397" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES STOCKS DE PRODUITS INTERMÉDIAIRES ET RÉSIDUELS</field><field name="code">397</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_39" /></record>
+<record id="pcg_398" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES STOCKS EN COURS DE ROUTE, EN CONSIGNATION OU EN DÉPÔT</field><field name="code">398</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="parent_id" ref="pcg_39" /></record>
+<record id="pcg_40" model="account.account.template"><field name="name">FOURNISSEURS ET COMPTES RATTACHÉS</field><field name="code">40</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="parent_id" ref="pcg_classe_4" /></record>
+<record id="pcg_401" model="account.account.template"><field name="name">FOURNISSEURS, DETTES EN COMPTE</field><field name="code">401</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_40" /></record>
+<record id="pcg_4011" model="account.account.template"><field name="name">Fournisseurs</field><field name="code">4011</field><field name="type">payable</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_401" /></record>
+<record id="pcg_4012" model="account.account.template"><field name="name">Fournisseurs Groupe</field><field name="code">4012</field><field name="type">payable</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_401" /></record>
+<record id="pcg_4013" model="account.account.template"><field name="name">Fournisseurs sous-traitants</field><field name="code">4013</field><field name="type">payable</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_401" /></record>
+<record id="pcg_4017" model="account.account.template"><field name="name">Fournisseur, retenues de garantie</field><field name="code">4017</field><field name="type">payable</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_401" /></record>
+<record id="pcg_402" model="account.account.template"><field name="name">FOURNISSEURS, EFFETS À PAYER</field><field name="code">402</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_40" /></record>
+<record id="pcg_4021" model="account.account.template"><field name="name">Fournisseurs, Effets à payer</field><field name="code">4021</field><field name="type">payable</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_402" /></record>
+<record id="pcg_4022" model="account.account.template"><field name="name">Fournisseurs - Groupe, Effets à payer</field><field name="code">4022</field><field name="type">payable</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_402" /></record>
+<record id="pcg_4023" model="account.account.template"><field name="name">Fournisseurs sous-traitants, Effets à payer</field><field name="code">4023</field><field name="type">payable</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_402" /></record>
+<record id="pcg_408" model="account.account.template"><field name="name">FOURNISSEURS, FACTURES NON PARVENUES</field><field name="code">408</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_40" /></record>
+<record id="pcg_4081" model="account.account.template"><field name="name">Fournisseurs</field><field name="code">4081</field><field name="type">payable</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_408" /></record>
+<record id="pcg_4082" model="account.account.template"><field name="name">Fournisseurs - Groupe</field><field name="code">4082</field><field name="type">payable</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_408" /></record>
+<record id="pcg_4083" model="account.account.template"><field name="name">Fournisseurs sous-traitants</field><field name="code">4083</field><field name="type">payable</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_408" /></record>
+<record id="pcg_4086" model="account.account.template"><field name="name">Fournisseurs, intérêts courus</field><field name="code">4086</field><field name="type">payable</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_408" /></record>
+<record id="pcg_409" model="account.account.template"><field name="name">FOURNISSEURS DÉBITEURS</field><field name="code">409</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_40" /></record>
+<record id="pcg_4091" model="account.account.template"><field name="name">Fournisseurs avances et acomptes versés</field><field name="code">4091</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_409" /></record>
+<record id="pcg_4092" model="account.account.template"><field name="name">Fournisseurs - Groupe avances et acomptes versés</field><field name="code">4092</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_409" /></record>
+<record id="pcg_4093" model="account.account.template"><field name="name">Fournisseurs sous-traitants avances et acomptes versés</field><field name="code">4093</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_409" /></record>
+<record id="pcg_4094" model="account.account.template"><field name="name">Fournisseurs créances pour emballages et matériels à rendre</field><field name="code">4094</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_409" /></record>
+<record id="pcg_4098" model="account.account.template"><field name="name">Rabais, Remises, Ristournes et autres avoirs à obtenir</field><field name="code">4098</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_409" /></record>
+<record id="pcg_41" model="account.account.template"><field name="name">CLIENTS ET COMPTES RATTACHÉS</field><field name="code">41</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_classe_4" /></record>
+<record id="pcg_411" model="account.account.template"><field name="name">CLIENTS</field><field name="code">411</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_41" /></record>
+<record id="pcg_4111" model="account.account.template"><field name="name">Clients</field><field name="code">4111</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_411" /></record>
+<record id="pcg_4112" model="account.account.template"><field name="name">Clients - Groupe</field><field name="code">4112</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_411" /></record>
+<record id="pcg_4114" model="account.account.template"><field name="name">Clients, État et Collectivités publiques</field><field name="code">4114</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_411" /></record>
+<record id="pcg_4115" model="account.account.template"><field name="name">Clients, organismes internationaux</field><field name="code">4115</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_411" /></record>
+<record id="pcg_4117" model="account.account.template"><field name="name">Client, retenues de garantie</field><field name="code">4117</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_411" /></record>
+<record id="pcg_4118" model="account.account.template"><field name="name">Clients, dégrèvement de Taxes sur la Valeur Ajoutée (T.V.A.)</field><field name="code">4118</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_411" /></record>
+<record id="pcg_412" model="account.account.template"><field name="name">CLIENTS, ÉFFETS À RECEVOIR EN PORTEFEUILLE</field><field name="code">412</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_41" /></record>
+<record id="pcg_4121" model="account.account.template"><field name="name">Clients, Effets à recevoir</field><field name="code">4121</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_412" /></record>
+<record id="pcg_4122" model="account.account.template"><field name="name">Clients - Groupe, Effets à recevoir</field><field name="code">4122</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_412" /></record>
+<record id="pcg_4124" model="account.account.template"><field name="name">État et Collectivités publiques, Effets à recevoir</field><field name="code">4124</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_412" /></record>
+<record id="pcg_4125" model="account.account.template"><field name="name">Organismes Internationaux, Effets à recevoir</field><field name="code">4125</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_412" /></record>
+<record id="pcg_414" model="account.account.template"><field name="name">CRÉANCES SUR CESSIONS D'IMMOBILISATIONS</field><field name="code">414</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_41" /></record>
+<record id="pcg_4141" model="account.account.template"><field name="name">Créances en compte</field><field name="code">4141</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_414" /></record>
+<record id="pcg_4142" model="account.account.template"><field name="name">Effets à recevoir</field><field name="code">4142</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_414" /></record>
+<record id="pcg_415" model="account.account.template"><field name="name">CLIENTS, ÉFFETS ESCOMPTÉS NON ÉCHUS</field><field name="code">415</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_41" /></record>
+<record id="pcg_416" model="account.account.template"><field name="name">CRÉANCES CLIENTS LITIGIEUSES OU DOUTEUSES</field><field name="code">416</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_41" /></record>
+<record id="pcg_4161" model="account.account.template"><field name="name">Créances litigieuses</field><field name="code">4161</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_416" /></record>
+<record id="pcg_4162" model="account.account.template"><field name="name">Créances douteuses</field><field name="code">4162</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_416" /></record>
+<record id="pcg_418" model="account.account.template"><field name="name">CLIENTS, PRODUITS À RECEVOIR</field><field name="code">418</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_41" /></record>
+<record id="pcg_4181" model="account.account.template"><field name="name">Clients, factures à établir</field><field name="code">4181</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_418" /></record>
+<record id="pcg_4186" model="account.account.template"><field name="name">Clients, intérêts courus</field><field name="code">4186</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_418" /></record>
+<record id="pcg_419" model="account.account.template"><field name="name">CLIENTS CRÉDITEURS</field><field name="code">419</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_41" /></record>
+<record id="pcg_4191" model="account.account.template"><field name="name">Clients, avances et acomptes reçus</field><field name="code">4191</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_419" /></record>
+<record id="pcg_4192" model="account.account.template"><field name="name">Clients - Groupe, avances et acomptes reçus</field><field name="code">4192</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_419" /></record>
+<record id="pcg_4194" model="account.account.template"><field name="name">Clients, dettes pour emballages et matériels consignés</field><field name="code">4194</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_419" /></record>
+<record id="pcg_4198" model="account.account.template"><field name="name">Rabais, Remises, Ristournes et autres avoirs à accorder</field><field name="code">4198</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_419" /></record>
+<record id="pcg_42" model="account.account.template"><field name="name">PERSONNEL</field><field name="code">42</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_classe_4" /></record>
+<record id="pcg_421" model="account.account.template"><field name="name">PERSONNEL, AVANCES ET ACOMPTES</field><field name="code">421</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_42" /></record>
+<record id="pcg_4211" model="account.account.template"><field name="name">Personnel, avances</field><field name="code">4211</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_421" /></record>
+<record id="pcg_4212" model="account.account.template"><field name="name">Personnel, acomptes</field><field name="code">4212</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_421" /></record>
+<record id="pcg_4213" model="account.account.template"><field name="name">Frais avancés et fournitures au personnel</field><field name="code">4213</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_421" /></record>
+<record id="pcg_422" model="account.account.template"><field name="name">PERSONNEL, RÉMUNÉRATIONS DUES</field><field name="code">422</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_42" /></record>
+<record id="pcg_423" model="account.account.template"><field name="name">PERSONNEL, OPPOSITIONS, SAISIES-ARRÊTS</field><field name="code">423</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_42" /></record>
+<record id="pcg_4231" model="account.account.template"><field name="name">Personnel, oppositions</field><field name="code">4231</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_423" /></record>
+<record id="pcg_4232" model="account.account.template"><field name="name">Personnel, saisies-arrêts</field><field name="code">4232</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_423" /></record>
+<record id="pcg_4233" model="account.account.template"><field name="name">Personnel, avis à tiers détenteur</field><field name="code">4233</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_423" /></record>
+<record id="pcg_424" model="account.account.template"><field name="name">PERSONNEL, OEUVRES SOCIALES INTERNES</field><field name="code">424</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_42" /></record>
+<record id="pcg_4241" model="account.account.template"><field name="name">Assistance médicale</field><field name="code">4241</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_424" /></record>
+<record id="pcg_4242" model="account.account.template"><field name="name">Allocations familiales</field><field name="code">4242</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_424" /></record>
+<record id="pcg_4245" model="account.account.template"><field name="name">Organismes sociaux rattachés à l'entreprise</field><field name="code">4245</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_424" /></record>
+<record id="pcg_4248" model="account.account.template"><field name="name">Autres oeuvres sociales internes</field><field name="code">4248</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_424" /></record>
+<record id="pcg_425" model="account.account.template"><field name="name">REPRÉSENTANTS DU PERSONNEL</field><field name="code">425</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_42" /></record>
+<record id="pcg_4251" model="account.account.template"><field name="name">Délégués du personnel</field><field name="code">4251</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_425" /></record>
+<record id="pcg_4252" model="account.account.template"><field name="name">Syndicats et Comités d'entreprises, d'Établissement</field><field name="code">4252</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_425" /></record>
+<record id="pcg_4258" model="account.account.template"><field name="name">Autres représentants du personnel</field><field name="code">4258</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_425" /></record>
+<record id="pcg_426" model="account.account.template"><field name="name">PERSONNEL, PARTICIPATION AUX BÉNÉFICES</field><field name="code">426</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_42" /></record>
+<record id="pcg_427" model="account.account.template"><field name="name">PERSONNEL – DÉPÔTS</field><field name="code">427</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_42" /></record>
+<record id="pcg_428" model="account.account.template"><field name="name">PERSONNEL, CHARGES À PAYER ET PRODUITS À RECEVOIR</field><field name="code">428</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_42" /></record>
+<record id="pcg_4281" model="account.account.template"><field name="name">Dettes provisionnées pour congés à payer</field><field name="code">4281</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_428" /></record>
+<record id="pcg_4286" model="account.account.template"><field name="name">Autres Charges à payer</field><field name="code">4286</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_428" /></record>
+<record id="pcg_4287" model="account.account.template"><field name="name">Produits à recevoir</field><field name="code">4287</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_428" /></record>
+<record id="pcg_43" model="account.account.template"><field name="name">ORGANISMES SOCIAUX</field><field name="code">43</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="parent_id" ref="pcg_classe_4" /></record>
+<record id="pcg_431" model="account.account.template"><field name="name">SÉCURITÉ SOCIALE</field><field name="code">431</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_43" /></record>
+<record id="pcg_4311" model="account.account.template"><field name="name">Prestations familiales</field><field name="code">4311</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_431" /></record>
+<record id="pcg_4312" model="account.account.template"><field name="name">Accidents de travail</field><field name="code">4312</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_431" /></record>
+<record id="pcg_4313" model="account.account.template"><field name="name">Caisse de retraite obligatoire</field><field name="code">4313</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_431" /></record>
+<record id="pcg_4314" model="account.account.template"><field name="name">Caisse de retraite facultative</field><field name="code">4314</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_431" /></record>
+<record id="pcg_4318" model="account.account.template"><field name="name">Autres cotisations sociales</field><field name="code">4318</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_431" /></record>
+<record id="pcg_432" model="account.account.template"><field name="name">CAISSES DE RETRAITE COMPLÉMENTAIRE</field><field name="code">432</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_43" /></record>
+<record id="pcg_433" model="account.account.template"><field name="name">AUTRES ORGANISMES SOCIAUX</field><field name="code">433</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_43" /></record>
+<record id="pcg_4331" model="account.account.template"><field name="name">Mutuelle</field><field name="code">4331</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_433" /></record>
+<record id="pcg_4334" model="account.account.template"><field name="name">T.V.A. facturée sur production livrée à soi-même</field><field name="code">4334</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_433" /></record>
+<record id="pcg_4335" model="account.account.template"><field name="name">T.V.A. sur factures à établir</field><field name="code">4335</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_433" /></record>
+<record id="pcg_438" model="account.account.template"><field name="name">ORGANISMES SOCIAUX, CHARGES À PAYER ET PRODUITS À RECEVOIR</field><field name="code">438</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_view" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_43" /></record>
+<record id="pcg_4381" model="account.account.template"><field name="name">Charges sociales sur gratifications à payer</field><field name="code">4381</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_438" /></record>
+<record id="pcg_4382" model="account.account.template"><field name="name">Charges sociales sur congés à payer</field><field name="code">4382</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_438" /></record>
+<record id="pcg_4386" model="account.account.template"><field name="name">Autres charges à payer</field><field name="code">4386</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_438" /></record>
+<record id="pcg_4387" model="account.account.template"><field name="name">Produits à recevoir</field><field name="code">4387</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_438" /></record>
+<record id="pcg_44" model="account.account.template"><field name="name">ÉTAT ET COLLECTIVITÉS PUBLIQUES</field><field name="code">44</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_view" /><field name="parent_id" ref="pcg_classe_4" /></record>
+<record id="pcg_441" model="account.account.template"><field name="name">ÉTAT, IMPÔT SUR LES BÉNÉFICES</field><field name="code">441</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_44" /></record>
+<record id="pcg_442" model="account.account.template"><field name="name">ÉTAT, AUTRES IMPÔTS ET TAXES</field><field name="code">442</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_44" /></record>
+<record id="pcg_4421" model="account.account.template"><field name="name">Impôts et taxes d'Etat</field><field name="code">4421</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_442" /></record>
+<record id="pcg_4422" model="account.account.template"><field name="name">Impôts et taxes pour les collectivités publiques</field><field name="code">4422</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_442" /></record>
+<record id="pcg_4423" model="account.account.template"><field name="name">Impôts et taxes recouvrables sur des obligataires</field><field name="code">4423</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_442" /></record>
+<record id="pcg_4424" model="account.account.template"><field name="name">Impôts et taxes recouvrables sur des associés</field><field name="code">4424</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_442" /></record>
+<record id="pcg_4426" model="account.account.template"><field name="name">Droits de douane</field><field name="code">4426</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_442" /></record>
+<record id="pcg_4428" model="account.account.template"><field name="name">Autres impôts et taxes</field><field name="code">4428</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_442" /></record>
+<record id="pcg_443" model="account.account.template"><field name="name">ÉTAT, T.V.A. FACTURÉE</field><field name="code">443</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_44" /></record>
+<record id="pcg_4431" model="account.account.template"><field name="name">T.V.A. facturée sur ventes</field><field name="code">4431</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_443" /></record>
+<record id="pcg_4432" model="account.account.template"><field name="name">T.V.A. facturée sur prestations de services</field><field name="code">4432</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_443" /></record>
+<record id="pcg_4433" model="account.account.template"><field name="name">T.V.A. facturée sur travaux</field><field name="code">4433</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_443" /></record>
+<record id="pcg_444" model="account.account.template"><field name="name">ÉTAT, T.V.A. DUE OU CRÉDIT DE T.V.A.</field><field name="code">444</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_44" /></record>
+<record id="pcg_4441" model="account.account.template"><field name="name">État, T.V.A. due</field><field name="code">4441</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_444" /></record>
+<record id="pcg_4449" model="account.account.template"><field name="name">État, crédit de T.V.A. à reporter</field><field name="code">4449</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_444" /></record>
+<record id="pcg_445" model="account.account.template"><field name="name">ÉTAT, T.V.A. RÉCUPÉRABLE</field><field name="code">445</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_44" /></record>
+<record id="pcg_4451" model="account.account.template"><field name="name">T.V.A. récupérable sur immobilisations</field><field name="code">4451</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_445" /></record>
+<record id="pcg_4452" model="account.account.template"><field name="name">T.V.A. récupérable sur achats</field><field name="code">4452</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_445" /></record>
+<record id="pcg_4453" model="account.account.template"><field name="name">T.V.A. récupérable sur transport</field><field name="code">4453</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_445" /></record>
+<record id="pcg_4454" model="account.account.template"><field name="name">T.V.A. récupérable sur services extérieurs et autres charges</field><field name="code">4454</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_445" /></record>
+<record id="pcg_4455" model="account.account.template"><field name="name">T.V.A. récupérable sur factures non parvenues</field><field name="code">4455</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_445" /></record>
+<record id="pcg_4456" model="account.account.template"><field name="name">T.V.A. transférée par d'autres entreprises</field><field name="code">4456</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_445" /></record>
+<record id="pcg_446" model="account.account.template"><field name="name">ÉTAT, AUTRES TAXES SUR LE CHIFFRE D'AFFAIRES</field><field name="code">446</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_44" /></record>
+<record id="pcg_447" model="account.account.template"><field name="name">ÉTAT, IMPÔTS RETENUS À LA SOURCE</field><field name="code">447</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_44" /></record>
+<record id="pcg_4471" model="account.account.template"><field name="name">Impôt Général sur le revenu</field><field name="code">4471</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_447" /></record>
+<record id="pcg_4472" model="account.account.template"><field name="name">Impôts sur salaires</field><field name="code">4472</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_447" /></record>
+<record id="pcg_4473" model="account.account.template"><field name="name">Contribution nationale</field><field name="code">4473</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_447" /></record>
+<record id="pcg_4474" model="account.account.template"><field name="name">Contribution nationale de solidarité</field><field name="code">4474</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_447" /></record>
+<record id="pcg_4478" model="account.account.template"><field name="name">Autres impôts et contributions</field><field name="code">4478</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_447" /></record>
+<record id="pcg_448" model="account.account.template"><field name="name">ÉTAT, CHARGES À PAYER ET PRODUITS À RECEVOIR</field><field name="code">448</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_44" /></record>
+<record id="pcg_4486" model="account.account.template"><field name="name">Charges à payer</field><field name="code">4486</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_tax" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_448" /></record>
+<record id="pcg_4487" model="account.account.template"><field name="name">Produits à recevoir</field><field name="code">4487</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_448" /></record>
+<record id="pcg_449" model="account.account.template"><field name="name">ÉTAT, CRÉANCES ET DETTES DIVERSES</field><field name="code">449</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_44" /></record>
+<record id="pcg_4491" model="account.account.template"><field name="name">État, obligations cautionnées</field><field name="code">4491</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_449" /></record>
+<record id="pcg_4492" model="account.account.template"><field name="name">État, avances et acomptes versés sur impôts</field><field name="code">4492</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_449" /></record>
+<record id="pcg_4493" model="account.account.template"><field name="name">État, fonds de dotation à recevoir</field><field name="code">4493</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_449" /></record>
+<record id="pcg_4494" model="account.account.template"><field name="name">État, subventions d'équipement à recevoir</field><field name="code">4494</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_449" /></record>
+<record id="pcg_4495" model="account.account.template"><field name="name">État, subventions d'exploitation à recevoir</field><field name="code">4495</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_449" /></record>
+<record id="pcg_4496" model="account.account.template"><field name="name">État, subventions d'équilibre à recevoir</field><field name="code">4496</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_449" /></record>
+<record id="pcg_4499" model="account.account.template"><field name="name">État, fonds réglementé provisionné</field><field name="code">4499</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_449" /></record>
+<record id="pcg_45" model="account.account.template"><field name="name">ORGANISMES INTERNATIONAUX</field><field name="code">45</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="parent_id" ref="pcg_classe_4" /></record>
+<record id="pcg_451" model="account.account.template"><field name="name">OPÉRATIONS AVEC LES ORGANISMES AFRICAINS</field><field name="code">451</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_special" /><field name="parent_id" ref="pcg_45" /></record>
+<record id="pcg_452" model="account.account.template"><field name="name">OPÉRATIONS AVEC LES AUTRES ORGANISMES INTERNATIONAUX</field><field name="code">452</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="parent_id" ref="pcg_45" /></record>
+<record id="pcg_458" model="account.account.template"><field name="name">ORGANISMES INTERNATIONAUX, FONDS DE DOTATION ET SUBVENTIONS À RECEVOIR</field><field name="code">458</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_45" /></record>
+<record id="pcg_4581" model="account.account.template"><field name="name">Organismes internationaux, fonds de dotation à recevoir</field><field name="code">4581</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_458" /></record>
+<record id="pcg_4582" model="account.account.template"><field name="name">Organismes internationaux, subventions à recevoir</field><field name="code">4582</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_458" /></record>
+<record id="pcg_46" model="account.account.template"><field name="name">ASSOCIÉS ET GROUPE</field><field name="code">46</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_view" /><field name="parent_id" ref="pcg_classe_4" /></record>
+<record id="pcg_461" model="account.account.template"><field name="name">ASSOCIÉS, OPÉRATIONS SUR LE CAPITAL</field><field name="code">461</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_46" /></record>
+<record id="pcg_4611" model="account.account.template"><field name="name">Associés apports en nature</field><field name="code">4611</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_461" /></record>
+<record id="pcg_4612" model="account.account.template"><field name="name">Associés apports en numéraire</field><field name="code">4612</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_461" /></record>
+<record id="pcg_4613" model="account.account.template"><field name="name">Actionnaires, capital souscrit appelé non versé</field><field name="code">4613</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_461" /></record>
+<record id="pcg_4614" model="account.account.template"><field name="name">Associés, capital appelé non versé</field><field name="code">4614</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_461" /></record>
+<record id="pcg_4615" model="account.account.template"><field name="name">Associés, versements reçus sur augmentation de capital</field><field name="code">4615</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="parent_id" ref="pcg_461" /></record>
+<record id="pcg_4616" model="account.account.template"><field name="name">Associés, versements anticipés</field><field name="code">4616</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_461" /></record>
+<record id="pcg_4617" model="account.account.template"><field name="name">Actionnaires défaillants</field><field name="code">4617</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_461" /></record>
+<record id="pcg_4618" model="account.account.template"><field name="name">Associés, autres apports</field><field name="code">4618</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_461" /></record>
+<record id="pcg_4619" model="account.account.template"><field name="name">Associés, capital à rembourser</field><field name="code">4619</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_461" /></record>
+<record id="pcg_462" model="account.account.template"><field name="name">ASSOCIÉS, COMPTES COURANTS</field><field name="code">462</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_46" /></record>
+<record id="pcg_4621" model="account.account.template"><field name="name">Principal</field><field name="code">4621</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_462" /></record>
+<record id="pcg_4626" model="account.account.template"><field name="name">Intérêts courus</field><field name="code">4626</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_462" /></record>
+<record id="pcg_463" model="account.account.template"><field name="name">ASSOCIÉS, OPÉRATIONS FAITES EN COMMUN</field><field name="code">463</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_46" /></record>
+<record id="pcg_465" model="account.account.template"><field name="name">ASSOCIÉS, DIVIDENDES À PAYER</field><field name="code">465</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_46" /></record>
+<record id="pcg_466" model="account.account.template"><field name="name">GROUPE, COMPTES COURANTS</field><field name="code">466</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_46" /></record>
+<record id="pcg_467" model="account.account.template"><field name="name">ACTIONNAIRES, RESTANT DÛ SUR CAPITAL APPELÉ</field><field name="code">467</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_46" /></record>
+<record id="pcg_47" model="account.account.template"><field name="name">DÉBITEURS ET CRÉDITEURS DIVERS</field><field name="code">47</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_view" /><field name="parent_id" ref="pcg_classe_4" /></record>
+<record id="pcg_471" model="account.account.template"><field name="name">COMPTES D'ATTENTE</field><field name="code">471</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_view" /><field name="parent_id" ref="pcg_47" /></record>
+<record id="pcg_4711" model="account.account.template"><field name="name">Débiteurs divers</field><field name="code">4711</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_471" /></record>
+<record id="pcg_4712" model="account.account.template"><field name="name">Créditeurs divers</field><field name="code">4712</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_471" /></record>
+<record id="pcg_472" model="account.account.template"><field name="name">VERSEMENTS RESTANT À EFFECTUER SUR TITRES NON LIBÉRÉS</field><field name="code">472</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_47" /></record>
+<record id="pcg_4726" model="account.account.template"><field name="name">Titres de participation</field><field name="code">4726</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_472" /></record>
+<record id="pcg_4727" model="account.account.template"><field name="name">Titres immobilisés</field><field name="code">4727</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_472" /></record>
+<record id="pcg_4728" model="account.account.template"><field name="name">Titres de placement</field><field name="code">4728</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_472" /></record>
+<record id="pcg_474" model="account.account.template"><field name="name">RÉPARTITION PÉRIODIQUE DES CHARGES ET DES PRODUITS</field><field name="code">474</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_47" /></record>
+<record id="pcg_4746" model="account.account.template"><field name="name">Charges</field><field name="code">4746</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_474" /></record>
+<record id="pcg_4747" model="account.account.template"><field name="name">Produits</field><field name="code">4747</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_474" /></record>
+<record id="pcg_475" model="account.account.template"><field name="name">CRÉANCES SUR TRAVAUX NON ENCORE FACTURABLES</field><field name="code">475</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_47" /></record>
+<record id="pcg_476" model="account.account.template"><field name="name">CHARGES CONSTATÉES D'AVANCE</field><field name="code">476</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_47" /></record>
+<record id="pcg_477" model="account.account.template"><field name="name">PRODUITS CONSTATÉS D'AVANCE</field><field name="code">477</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_47" /></record>
+<record id="pcg_478" model="account.account.template"><field name="name">ÉCARTS DE CONVERSION - ACTIF</field><field name="code">478</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_47" /></record>
+<record id="pcg_4781" model="account.account.template"><field name="name">Diminution des créances</field><field name="code">4781</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_478" /></record>
+<record id="pcg_4782" model="account.account.template"><field name="name">Augmentation des dettes</field><field name="code">4782</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_478" /></record>
+<record id="pcg_4788" model="account.account.template"><field name="name">Différences compensées par couverture de change</field><field name="code">4788</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_478" /></record>
+<record id="pcg_479" model="account.account.template"><field name="name">ÉCARTS DE CONVERSION - PASSIF</field><field name="code">479</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_47" /></record>
+<record id="pcg_4791" model="account.account.template"><field name="name">Augmentation des créances</field><field name="code">4791</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_479" /></record>
+<record id="pcg_4792" model="account.account.template"><field name="name">Diminution des dettes</field><field name="code">4792</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_479" /></record>
+<record id="pcg_4798" model="account.account.template"><field name="name">Différences compensées par couverture de change</field><field name="code">4798</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_479" /></record>
+<record id="pcg_48" model="account.account.template"><field name="name">CRÉANCES ET DETTES HORS ACTIVITÉS ORDINAIRES (HAO)</field><field name="code">48</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="parent_id" ref="pcg_classe_4" /></record>
+<record id="pcg_481" model="account.account.template"><field name="name">FOURNISSEURS D'INVESTISSEMENTS</field><field name="code">481</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_48" /></record>
+<record id="pcg_4811" model="account.account.template"><field name="name">Immobilisations incorporelles</field><field name="code">4811</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_481" /></record>
+<record id="pcg_4812" model="account.account.template"><field name="name">Immobilisations corporelles</field><field name="code">4812</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_stocks" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_481" /></record>
+<record id="pcg_4817" model="account.account.template"><field name="name">Retenues de garantie</field><field name="code">4817</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_481" /></record>
+<record id="pcg_4818" model="account.account.template"><field name="name">Factures non parvenues</field><field name="code">4818</field><field name="type">payable</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_481" /></record>
+<record id="pcg_482" model="account.account.template"><field name="name">FOURNISSEURS D'INVESTISSEMENTS, EFFETS À PAYER</field><field name="code">482</field><field name="type">payable</field><field name="user_type" ref="l10n_syscohada.account_type_payable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_48" /></record>
+<record id="pcg_483" model="account.account.template"><field name="name">DETTES SUR ACQUISITION DE TITRES DE PLACEMENT</field><field name="code">483</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_48" /></record>
+<record id="pcg_484" model="account.account.template"><field name="name">AUTRES DETTES HORS ACTIVITES ORDINAIRES (H.A.O.)</field><field name="code">484</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_48" /></record>
+<record id="pcg_485" model="account.account.template"><field name="name">CRÉANCES SUR CESSIONS D'IMMOBILISATIONS</field><field name="code">485</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_48" /></record>
+<record id="pcg_4851" model="account.account.template"><field name="name">En compte</field><field name="code">4851</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_485" /></record>
+<record id="pcg_4852" model="account.account.template"><field name="name">Effets à recevoir</field><field name="code">4852</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_485" /></record>
+<record id="pcg_4857" model="account.account.template"><field name="name">Retenues de garantie</field><field name="code">4857</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_485" /></record>
+<record id="pcg_4858" model="account.account.template"><field name="name">Factures à établir</field><field name="code">4858</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_485" /></record>
+<record id="pcg_486" model="account.account.template"><field name="name">CRÉANCES SUR CESSIONS DE TITRES DE PLACEMENT</field><field name="code">486</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_48" /></record>
+<record id="pcg_488" model="account.account.template"><field name="name">AUTRES CRÉANCES HORS ACTIVITÉS ORDINAIRES (H.A.O.)</field><field name="code">488</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_48" /></record>
+<record id="pcg_49" model="account.account.template"><field name="name">DÉPRÉCIATIONS ET RISQUES PROVISIONNÉS (TIERS)</field><field name="code">49</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_view" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_classe_4" /></record>
+<record id="pcg_490" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES COMPTES FOURNISSEURS</field><field name="code">490</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_49" /></record>
+<record id="pcg_491" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES COMPTES CLIENTS</field><field name="code">491</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_49" /></record>
+<record id="pcg_4911" model="account.account.template"><field name="name">Créances litigieuses</field><field name="code">4911</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_491" /></record>
+<record id="pcg_4912" model="account.account.template"><field name="name">Créances douteuses</field><field name="code">4912</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_491" /></record>
+<record id="pcg_492" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES COMPTES PERSONNEL</field><field name="code">492</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_49" /></record>
+<record id="pcg_493" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES COMPTES ORGANISMES SOCIAUX</field><field name="code">493</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_49" /></record>
+<record id="pcg_494" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES COMPTES ÉTAT ET COLLECTIVITÉS PUBLIQUES</field><field name="code">494</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_49" /></record>
+<record id="pcg_495" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES COMPTES ORGANISMES INTERNATIONAUX</field><field name="code">495</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_49" /></record>
+<record id="pcg_496" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES COMPTES ASSOCIÉS ET GROUPE</field><field name="code">496</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_49" /></record>
+<record id="pcg_4962" model="account.account.template"><field name="name">Associés, comptes courants</field><field name="code">4962</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_496" /></record>
+<record id="pcg_4963" model="account.account.template"><field name="name">Associés, opérations faites en commun</field><field name="code">4963</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_496" /></record>
+<record id="pcg_4966" model="account.account.template"><field name="name">Groupe, comptes courants</field><field name="code">4966</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_496" /></record>
+<record id="pcg_497" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES COMPTES DÉBITEURS DIVERS</field><field name="code">497</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_49" /></record>
+<record id="pcg_498" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES COMPTES DE CRÉANCES H.A.O.</field><field name="code">498</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_49" /></record>
+<record id="pcg_4981" model="account.account.template"><field name="name">Créances sur cessions d'immobilisations</field><field name="code">4981</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_498" /></record>
+<record id="pcg_4982" model="account.account.template"><field name="name">Créances sur cessions de titres de placement</field><field name="code">4982</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_498" /></record>
+<record id="pcg_4983" model="account.account.template"><field name="name">Autres créances H.A.O.</field><field name="code">4983</field><field name="type">receivable</field><field name="user_type" ref="l10n_syscohada.account_type_receivable" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_498" /></record>
+<record id="pcg_499" model="account.account.template"><field name="name">RISQUES PROVISIONNÉS</field><field name="code">499</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_49" /></record>
+<record id="pcg_4991" model="account.account.template"><field name="name">Sur opérations d'exploitation</field><field name="code">4991</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_499" /></record>
+<record id="pcg_4998" model="account.account.template"><field name="name">Sur opérations H.A.O.</field><field name="code">4998</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_dettes" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_499" /></record>
+<record id="pcg_50" model="account.account.template"><field name="name">TITRES DE PLACEMENT</field><field name="code">50</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_classe_5" /></record>
+<record id="pcg_501" model="account.account.template"><field name="name">TITRES DU TRÉSOR ET BONS DE CAISSE À COURT TERME</field><field name="code">501</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_50" /></record>
+<record id="pcg_5011" model="account.account.template"><field name="name">Titres du Trésor à court terme</field><field name="code">5011</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_501" /></record>
+<record id="pcg_5012" model="account.account.template"><field name="name">Titres d'organismes financiers</field><field name="code">5012</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_501" /></record>
+<record id="pcg_5013" model="account.account.template"><field name="name">Bons de caisse à court terme</field><field name="code">5013</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_501" /></record>
+<record id="pcg_502" model="account.account.template"><field name="name">ACTIONS</field><field name="code">502</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_50" /></record>
+<record id="pcg_5021" model="account.account.template"><field name="name">Actions propres</field><field name="code">5021</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_502" /></record>
+<record id="pcg_5022" model="account.account.template"><field name="name">Actions cotées</field><field name="code">5022</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_502" /></record>
+<record id="pcg_5023" model="account.account.template"><field name="name">Actions non cotées</field><field name="code">5023</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_502" /></record>
+<record id="pcg_5024" model="account.account.template"><field name="name">Actions démembrées (certificats d'investissement ; droits de vote)</field><field name="code">5024</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_502" /></record>
+<record id="pcg_5025" model="account.account.template"><field name="name">Autres titres conférant un droit de propriété</field><field name="code">5025</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_502" /></record>
+<record id="pcg_503" model="account.account.template"><field name="name">OBLIGATIONS</field><field name="code">503</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_50" /></record>
+<record id="pcg_5031" model="account.account.template"><field name="name">Obligations émises par la société et rachetées par elle</field><field name="code">5031</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_503" /></record>
+<record id="pcg_5032" model="account.account.template"><field name="name">Obligations cotées</field><field name="code">5032</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_503" /></record>
+<record id="pcg_5033" model="account.account.template"><field name="name">Obligations non cotées</field><field name="code">5033</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_503" /></record>
+<record id="pcg_5035" model="account.account.template"><field name="name">Autres titres conférant un droit de créance</field><field name="code">5035</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_503" /></record>
+<record id="pcg_504" model="account.account.template"><field name="name">BONS DE SOUSCRIPTION</field><field name="code">504</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_50" /></record>
+<record id="pcg_5042" model="account.account.template"><field name="name">Bons de souscription d'actions</field><field name="code">5042</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_504" /></record>
+<record id="pcg_5043" model="account.account.template"><field name="name">Bons de souscription d'obligations</field><field name="code">5043</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_504" /></record>
+<record id="pcg_505" model="account.account.template"><field name="name">TITRES NÉGOCIABLES HORS REGION</field><field name="code">505</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_50" /></record>
+<record id="pcg_506" model="account.account.template"><field name="name">INTÉRÊTS COURUS</field><field name="code">506</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_50" /></record>
+<record id="pcg_5061" model="account.account.template"><field name="name">Titres du Trésor et bons de caisse à court terme</field><field name="code">5061</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_506" /></record>
+<record id="pcg_5062" model="account.account.template"><field name="name">Actions</field><field name="code">5062</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_506" /></record>
+<record id="pcg_5063" model="account.account.template"><field name="name">Obligations</field><field name="code">5063</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_506" /></record>
+<record id="pcg_508" model="account.account.template"><field name="name">AUTRES VALEURS ASSIMILÉES</field><field name="code">508</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_50" /></record>
+<record id="pcg_51" model="account.account.template"><field name="name">VALEURS À ENCAISSER</field><field name="code">51</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_classe_5" /></record>
+<record id="pcg_511" model="account.account.template"><field name="name">EFFETS À ENCAISSER</field><field name="code">511</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_51" /></record>
+<record id="pcg_512" model="account.account.template"><field name="name">EFFETS À L'ENCAISSEMENT</field><field name="code">512</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_51" /></record>
+<record id="pcg_513" model="account.account.template"><field name="name">CHÈQUES À ENCAISSER</field><field name="code">513</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_51" /></record>
+<record id="pcg_514" model="account.account.template"><field name="name">CHÈQUES À L'ENCAISSEMENT</field><field name="code">514</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_51" /></record>
+<record id="pcg_515" model="account.account.template"><field name="name">CARTES DE CRÉDIT À ENCAISSER</field><field name="code">515</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_51" /></record>
+<record id="pcg_518" model="account.account.template"><field name="name">AUTRES VALEURS À L'ENCAISSEMENT</field><field name="code">518</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_51" /></record>
+<record id="pcg_5181" model="account.account.template"><field name="name">Warrants</field><field name="code">5181</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_518" /></record>
+<record id="pcg_5182" model="account.account.template"><field name="name">Billets de fonds</field><field name="code">5182</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_518" /></record>
+<record id="pcg_5185" model="account.account.template"><field name="name">Chèques de voyage</field><field name="code">5185</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_518" /></record>
+<record id="pcg_5186" model="account.account.template"><field name="name">Coupons échus</field><field name="code">5186</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_518" /></record>
+<record id="pcg_5187" model="account.account.template"><field name="name">Intérêts échus des obligations</field><field name="code">5187</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_518" /></record>
+<record id="pcg_52" model="account.account.template"><field name="name">BANQUES</field><field name="code">52</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_classe_5" /></record>
+<record id="pcg_521" model="account.account.template"><field name="name">BANQUES LOCALES</field><field name="code">521</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_52" /></record>
+<record id="pcg_5211" model="account.account.template"><field name="name">BANQUES X</field><field name="code">5211</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_521" /></record>
+<record id="pcg_5212" model="account.account.template"><field name="name">BANQUE Y</field><field name="code">5212</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_521" /></record>
+<record id="pcg_522" model="account.account.template"><field name="name">BANQUES AUTRES ÉTATS REGION</field><field name="code">522</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_52" /></record>
+<record id="pcg_523" model="account.account.template"><field name="name">BANQUES AUTRES ETATS ZONE MONETAIRE</field><field name="code">523</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_52" /></record>
+<record id="pcg_524" model="account.account.template"><field name="name">BANQUES HORS ZONE MONETAIRE</field><field name="code">524</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_52" /></record>
+<record id="pcg_526" model="account.account.template"><field name="name">BANQUES, INTERETS COURUS</field><field name="code">526</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_52" /></record>
+<record id="pcg_53" model="account.account.template"><field name="name">ÉTABLISSEMENTS FINANCIERS ET ASSIMILÉS</field><field name="code">53</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_classe_5" /></record>
+<record id="pcg_531" model="account.account.template"><field name="name">CHÈQUES POSTAUX</field><field name="code">531</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_53" /></record>
+<record id="pcg_532" model="account.account.template"><field name="name">TRÉSOR</field><field name="code">532</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_53" /></record>
+<record id="pcg_533" model="account.account.template"><field name="name">SOCIÉTÉS DE GESTION ET D'INTERMÉDIATION (S.G.I.)</field><field name="code">533</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_53" /></record>
+<record id="pcg_536" model="account.account.template"><field name="name">ETABLISSEMENTS FINANCIERS, INTERETS COURUS</field><field name="code">536</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_53" /></record>
+<record id="pcg_538" model="account.account.template"><field name="name">AUTRES ORGANISMES FINANCIERS</field><field name="code">538</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_53" /></record>
+<record id="pcg_54" model="account.account.template"><field name="name">INSTRUMENTS DE TRÉSORERIE</field><field name="code">54</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_classe_5" /></record>
+<record id="pcg_541" model="account.account.template"><field name="name">OPTIONS DE TAUX D'INTÉRÊT</field><field name="code">541</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_54" /></record>
+<record id="pcg_542" model="account.account.template"><field name="name">OPTIONS DE TAUX DE CHANGE</field><field name="code">542</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_54" /></record>
+<record id="pcg_543" model="account.account.template"><field name="name">OPTIONS DE TAUX BOURSIERS</field><field name="code">543</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_54" /></record>
+<record id="pcg_544" model="account.account.template"><field name="name">INSTRUMENTS DE MARCHÉS À TERME</field><field name="code">544</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_54" /></record>
+<record id="pcg_545" model="account.account.template"><field name="name">AVOIRS D'OR ET AUTRES MÉTAUX PRÉCIEUX ()</field><field name="code">545</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_54" /></record>
+<record id="pcg_56" model="account.account.template"><field name="name">BANQUES, CRÉDITS DE TRÉSORERIE ET D'ESCOMPTE</field><field name="code">56</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_classe_5" /></record>
+<record id="pcg_561" model="account.account.template"><field name="name">CRÉDITS DE TRÉSORERIE</field><field name="code">561</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_56" /></record>
+<record id="pcg_564" model="account.account.template"><field name="name">ESCOMPTE DE CRÉDITS DE CAMPAGNE</field><field name="code">564</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_56" /></record>
+<record id="pcg_565" model="account.account.template"><field name="name">ESCOMPTE DE CRÉDITS ORDINAIRES</field><field name="code">565</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_56" /></record>
+<record id="pcg_566" model="account.account.template"><field name="name">BANQUES, CREDITS DE TRESORERIE, INTERETS COURUS</field><field name="code">566</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_56" /></record>
+<record id="pcg_57" model="account.account.template"><field name="name">CAISSE</field><field name="code">57</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_classe_5" /></record>
+<record id="pcg_571" model="account.account.template"><field name="name">CAISSE SIÈGE SOCIAL</field><field name="code">571</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_57" /></record>
+<record id="pcg_5711" model="account.account.template"><field name="name">en unités monétaires légales</field><field name="code">5711</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_571" /></record>
+<record id="pcg_5712" model="account.account.template"><field name="name">en devises</field><field name="code">5712</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_571" /></record>
+<record id="pcg_572" model="account.account.template"><field name="name">CAISSE SUCCURSALE A</field><field name="code">572</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_57" /></record>
+<record id="pcg_5721" model="account.account.template"><field name="name">en unités monétaires légales</field><field name="code">5721</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_572" /></record>
+<record id="pcg_5722" model="account.account.template"><field name="name">en devises</field><field name="code">5722</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_572" /></record>
+<record id="pcg_573" model="account.account.template"><field name="name">CAISSE SUCCURSALE B</field><field name="code">573</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_57" /></record>
+<record id="pcg_5731" model="account.account.template"><field name="name">en unités monétaires légales</field><field name="code">5731</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_573" /></record>
+<record id="pcg_5732" model="account.account.template"><field name="name">en devises</field><field name="code">5732</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_573" /></record>
+<record id="pcg_58" model="account.account.template"><field name="name">RÉGIES D'AVANCES, ACCRÉDITIFS ET VIREMENTS INTERNES</field><field name="code">58</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_classe_5" /></record>
+<record id="pcg_581" model="account.account.template"><field name="name">RÉGIES D'AVANCE</field><field name="code">581</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_58" /></record>
+<record id="pcg_582" model="account.account.template"><field name="name">ACCRÉDITIFS</field><field name="code">582</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_58" /></record>
+<record id="pcg_585" model="account.account.template"><field name="name">VIREMENTS DE FONDS</field><field name="code">585</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_58" /></record>
+<record id="pcg_588" model="account.account.template"><field name="name">AUTRES VIREMENTS INTERNES</field><field name="code">588</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="reconcile" eval="True"/><field name="parent_id" ref="pcg_58" /></record>
+<record id="pcg_59" model="account.account.template"><field name="name">DÉPRÉCIATIONS ET RISQUES PROVISIONNÉS</field><field name="code">59</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_classe_5" /></record>
+<record id="pcg_590" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES TITRES DE PLACEMENT</field><field name="code">590</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_59" /></record>
+<record id="pcg_591" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES TITRES ET VALEURS À ENCAISSER</field><field name="code">591</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_59" /></record>
+<record id="pcg_592" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES COMPTES BANQUES</field><field name="code">592</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_59" /></record>
+<record id="pcg_593" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES COMPTES ÉTABLISSEMENTS FINANCIERS ET ASSIMILÉS</field><field name="code">593</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_59" /></record>
+<record id="pcg_594" model="account.account.template"><field name="name">DÉPRÉCIATIONS DES COMPTES D’INSTRUMENTS DE TRÉSORERIE</field><field name="code">594</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_59" /></record>
+<record id="pcg_599" model="account.account.template"><field name="name">RISQUES PROVISIONNÉS À CARACTÈRE FINANCIER</field><field name="code">599</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_cash" /><field name="parent_id" ref="pcg_59" /></record>
+<record id="pcg_60" model="account.account.template"><field name="name">ACHATS ET VARIATIONS DE STOCKS</field><field name="code">60</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_classe_6" /></record>
+<record id="pcg_601" model="account.account.template"><field name="name">ACHATS DE MARCHANDISES</field><field name="code">601</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_60" /></record>
+<record id="pcg_6011" model="account.account.template"><field name="name">dans la Région</field><field name="code">6011</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_601" /></record>
+<record id="pcg_6012" model="account.account.template"><field name="name">hors Région</field><field name="code">6012</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_601" /></record>
+<record id="pcg_6013" model="account.account.template"><field name="name">aux entreprises du groupe dans la Région</field><field name="code">6013</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_601" /></record>
+<record id="pcg_6014" model="account.account.template"><field name="name">aux entreprises du groupe hors Région</field><field name="code">6014</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_601" /></record>
+<record id="pcg_6019" model="account.account.template"><field name="name">Rabais, Remises et Ristournes obtenus (non ventilés)</field><field name="code">6019</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_601" /></record>
+<record id="pcg_602" model="account.account.template"><field name="name">ACHATS DE MATIÈRES PREMIÈRES ET FOURNITURES LIÉES</field><field name="code">602</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_60" /></record>
+<record id="pcg_6021" model="account.account.template"><field name="name">dans la Région</field><field name="code">6021</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_602" /></record>
+<record id="pcg_6022" model="account.account.template"><field name="name">hors Région</field><field name="code">6022</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_602" /></record>
+<record id="pcg_6023" model="account.account.template"><field name="name">aux entreprises du groupe dans la Région</field><field name="code">6023</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_602" /></record>
+<record id="pcg_6024" model="account.account.template"><field name="name">aux entreprises du groupe hors Région</field><field name="code">6024</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_602" /></record>
+<record id="pcg_6029" model="account.account.template"><field name="name">Rabais, Remises et Ristournes obtenus (non ventilés)</field><field name="code">6029</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_602" /></record>
+<record id="pcg_603" model="account.account.template"><field name="name">VARIATIONS DES STOCKS DE BIENS ACHETÉS</field><field name="code">603</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_60" /></record>
+<record id="pcg_6031" model="account.account.template"><field name="name">Variations des stocks de marchandises</field><field name="code">6031</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_603" /></record>
+<record id="pcg_6032" model="account.account.template"><field name="name">Variations des stocks de matières premières et fournitures liées</field><field name="code">6032</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_603" /></record>
+<record id="pcg_6033" model="account.account.template"><field name="name">Variations des stocks d'autres approvisionnements</field><field name="code">6033</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_603" /></record>
+<record id="pcg_604" model="account.account.template"><field name="name">ACHATS STOCKÉS DE MATIÈRES ET FOURNITURES CONSOMMABLES</field><field name="code">604</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_60" /></record>
+<record id="pcg_6041" model="account.account.template"><field name="name">Matières consommables</field><field name="code">6041</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_604" /></record>
+<record id="pcg_6042" model="account.account.template"><field name="name">Matières combustibles</field><field name="code">6042</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_604" /></record>
+<record id="pcg_6043" model="account.account.template"><field name="name">Produits d'entretien</field><field name="code">6043</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_604" /></record>
+<record id="pcg_6044" model="account.account.template"><field name="name">Fournitures d'atelier et d'usine</field><field name="code">6044</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_604" /></record>
+<record id="pcg_6046" model="account.account.template"><field name="name">Fournitures de magasin</field><field name="code">6046</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_604" /></record>
+<record id="pcg_6047" model="account.account.template"><field name="name">Fournitures de bureau</field><field name="code">6047</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_604" /></record>
+<record id="pcg_6049" model="account.account.template"><field name="name">Rabais, Remises et Ristournes obtenus (non ventilés)</field><field name="code">6049</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_604" /></record>
+<record id="pcg_605" model="account.account.template"><field name="name">AUTRES ACHATS</field><field name="code">605</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_60" /></record>
+<record id="pcg_6051" model="account.account.template"><field name="name">Fournitures non stockables -Eau</field><field name="code">6051</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_605" /></record>
+<record id="pcg_6052" model="account.account.template"><field name="name">Fournitures non stockables - Electricité</field><field name="code">6052</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_605" /></record>
+<record id="pcg_6053" model="account.account.template"><field name="name">Fournitures non stockables – Autres énergies</field><field name="code">6053</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_605" /></record>
+<record id="pcg_6054" model="account.account.template"><field name="name">Fournitures d'entretien non stockables</field><field name="code">6054</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_605" /></record>
+<record id="pcg_6055" model="account.account.template"><field name="name">Fournitures de bureau non stockables</field><field name="code">6055</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_605" /></record>
+<record id="pcg_6056" model="account.account.template"><field name="name">Achats de petit matériel et outillage</field><field name="code">6056</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_605" /></record>
+<record id="pcg_6057" model="account.account.template"><field name="name">Achats d'études et prestations de services</field><field name="code">6057</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_605" /></record>
+<record id="pcg_6058" model="account.account.template"><field name="name">Achats de travaux, matériels et équipements</field><field name="code">6058</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_605" /></record>
+<record id="pcg_6059" model="account.account.template"><field name="name">Rabais, Remises et Ristournes obtenus (non ventilés)</field><field name="code">6059</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_605" /></record>
+<record id="pcg_608" model="account.account.template"><field name="name">ACHATS D'EMBALLAGES</field><field name="code">608</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_60" /></record>
+<record id="pcg_6081" model="account.account.template"><field name="name">Emballages perdus</field><field name="code">6081</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_608" /></record>
+<record id="pcg_6082" model="account.account.template"><field name="name">Emballages récupérables non identifiables</field><field name="code">6082</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_608" /></record>
+<record id="pcg_6083" model="account.account.template"><field name="name">Emballages à usage mixte</field><field name="code">6083</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_608" /></record>
+<record id="pcg_6089" model="account.account.template"><field name="name">Rabais, Remises et Ristournes obtenus (non ventilés)</field><field name="code">6089</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_608" /></record>
+<record id="pcg_61" model="account.account.template"><field name="name">TRANSPORTS</field><field name="code">61</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_classe_6" /></record>
+<record id="pcg_611" model="account.account.template"><field name="name">TRANSPORTS SUR ACHATS()</field><field name="code">611</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_61" /></record>
+<record id="pcg_612" model="account.account.template"><field name="name">TRANSPORTS SUR VENTES</field><field name="code">612</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_61" /></record>
+<record id="pcg_613" model="account.account.template"><field name="name">TRANSPORTS POUR LE COMPTE DE TIERS</field><field name="code">613</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_61" /></record>
+<record id="pcg_614" model="account.account.template"><field name="name">TRANSPORTS DU PERSONNEL</field><field name="code">614</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_61" /></record>
+<record id="pcg_616" model="account.account.template"><field name="name">TRANSPORTS DE PLIS</field><field name="code">616</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_61" /></record>
+<record id="pcg_618" model="account.account.template"><field name="name">AUTRES FRAIS DE TRANSPORT</field><field name="code">618</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_61" /></record>
+<record id="pcg_6181" model="account.account.template"><field name="name">Voyages et déplacements</field><field name="code">6181</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_618" /></record>
+<record id="pcg_6182" model="account.account.template"><field name="name">Transports entre établissements ou chantiers</field><field name="code">6182</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_618" /></record>
+<record id="pcg_6183" model="account.account.template"><field name="name">Transports administratifs</field><field name="code">6183</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_618" /></record>
+<record id="pcg_62" model="account.account.template"><field name="name">SERVICES EXTÉRIEURS A</field><field name="code">62</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_classe_6" /></record>
+<record id="pcg_621" model="account.account.template"><field name="name">SOUS-TRAITANCE GÉNÉRALE</field><field name="code">621</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_62" /></record>
+<record id="pcg_622" model="account.account.template"><field name="name">LOCATIONS ET CHARGES LOCATIVES</field><field name="code">622</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_62" /></record>
+<record id="pcg_6221" model="account.account.template"><field name="name">Locations de terrains</field><field name="code">6221</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_622" /></record>
+<record id="pcg_6222" model="account.account.template"><field name="name">Locations de bâtiments</field><field name="code">6222</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_622" /></record>
+<record id="pcg_6223" model="account.account.template"><field name="name">Locations de matériels et outillages</field><field name="code">6223</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_622" /></record>
+<record id="pcg_6224" model="account.account.template"><field name="name">Malis sur emballages</field><field name="code">6224</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_622" /></record>
+<record id="pcg_6225" model="account.account.template"><field name="name">Locations d'emballages</field><field name="code">6225</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_622" /></record>
+<record id="pcg_6228" model="account.account.template"><field name="name">Locations et charges locatives diverses</field><field name="code">6228</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_622" /></record>
+<record id="pcg_623" model="account.account.template"><field name="name">REDEVANCES DE CRÉDIT-BAIL ET CONTRATS ASSIMILÉS</field><field name="code">623</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_62" /></record>
+<record id="pcg_6232" model="account.account.template"><field name="name">Crédit-bail immobilier</field><field name="code">6232</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_623" /></record>
+<record id="pcg_6233" model="account.account.template"><field name="name">Crédit-bail mobilier</field><field name="code">6233</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_623" /></record>
+<record id="pcg_6235" model="account.account.template"><field name="name">Contrats assimilés</field><field name="code">6235</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_623" /></record>
+<record id="pcg_624" model="account.account.template"><field name="name">ENTRETIEN, RÉPARATIONS ET MAINTENANCE</field><field name="code">624</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_62" /></record>
+<record id="pcg_6241" model="account.account.template"><field name="name">Entretien et réparations des biens immobiliers</field><field name="code">6241</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_624" /></record>
+<record id="pcg_6242" model="account.account.template"><field name="name">Entretien et réparations des biens mobiliers</field><field name="code">6242</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_624" /></record>
+<record id="pcg_6243" model="account.account.template"><field name="name">Maintenance</field><field name="code">6243</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_624" /></record>
+<record id="pcg_6248" model="account.account.template"><field name="name">Autres entretiens et réparations</field><field name="code">6248</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_624" /></record>
+<record id="pcg_625" model="account.account.template"><field name="name">PRIMES D'ASSURANCE</field><field name="code">625</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_62" /></record>
+<record id="pcg_6251" model="account.account.template"><field name="name">Assurances multirisques</field><field name="code">6251</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_625" /></record>
+<record id="pcg_6252" model="account.account.template"><field name="name">Assurances matériel de transport</field><field name="code">6252</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_625" /></record>
+<record id="pcg_6253" model="account.account.template"><field name="name">Assurances risques d'exploitation</field><field name="code">6253</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_625" /></record>
+<record id="pcg_6254" model="account.account.template"><field name="name">Assurances responsabilité du producteur</field><field name="code">6254</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_625" /></record>
+<record id="pcg_6255" model="account.account.template"><field name="name">Assurances insolvabilité clients</field><field name="code">6255</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_625" /></record>
+<record id="pcg_6256" model="account.account.template"><field name="name">Assurances transport sur achats</field><field name="code">6256</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_625" /></record>
+<record id="pcg_6257" model="account.account.template"><field name="name">Assurances transport sur ventes</field><field name="code">6257</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_625" /></record>
+<record id="pcg_6258" model="account.account.template"><field name="name">Autres primes d'assurances</field><field name="code">6258</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_625" /></record>
+<record id="pcg_626" model="account.account.template"><field name="name">ÉTUDES, RECHERCHES ET DOCUMENTATION</field><field name="code">626</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_62" /></record>
+<record id="pcg_6261" model="account.account.template"><field name="name">Études et recherches</field><field name="code">6261</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_626" /></record>
+<record id="pcg_6265" model="account.account.template"><field name="name">Documentation générale</field><field name="code">6265</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_626" /></record>
+<record id="pcg_6266" model="account.account.template"><field name="name">Documentation technique</field><field name="code">6266</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_626" /></record>
+<record id="pcg_627" model="account.account.template"><field name="name">PUBLICITÉ, PUBLICATIONS, RELATIONS PUBLIQUES</field><field name="code">627</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_62" /></record>
+<record id="pcg_6271" model="account.account.template"><field name="name">Annonces, insertions</field><field name="code">6271</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_627" /></record>
+<record id="pcg_6272" model="account.account.template"><field name="name">Catalogues, imprimés publicitaires</field><field name="code">6272</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_627" /></record>
+<record id="pcg_6273" model="account.account.template"><field name="name">Échantillons</field><field name="code">6273</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_627" /></record>
+<record id="pcg_6274" model="account.account.template"><field name="name">Foires et expositions</field><field name="code">6274</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_627" /></record>
+<record id="pcg_6275" model="account.account.template"><field name="name">Publications</field><field name="code">6275</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_627" /></record>
+<record id="pcg_6276" model="account.account.template"><field name="name">Cadeaux à la clientèle</field><field name="code">6276</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_627" /></record>
+<record id="pcg_6277" model="account.account.template"><field name="name">Frais de colloques, séminaires, conférences</field><field name="code">6277</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_627" /></record>
+<record id="pcg_6278" model="account.account.template"><field name="name">Autres charges de publicité et relations publiques</field><field name="code">6278</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_627" /></record>
+<record id="pcg_628" model="account.account.template"><field name="name">FRAIS DE TÉLÉCOMMUNICATIONS</field><field name="code">628</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_62" /></record>
+<record id="pcg_6281" model="account.account.template"><field name="name">Frais de téléphone</field><field name="code">6281</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_628" /></record>
+<record id="pcg_6282" model="account.account.template"><field name="name">Frais de télex</field><field name="code">6282</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_628" /></record>
+<record id="pcg_6283" model="account.account.template"><field name="name">Frais de télécopie</field><field name="code">6283</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_628" /></record>
+<record id="pcg_6288" model="account.account.template"><field name="name">Autres frais de télécommunications</field><field name="code">6288</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_628" /></record>
+<record id="pcg_63" model="account.account.template"><field name="name">SERVICES EXTÉRIEURS B</field><field name="code">63</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_classe_6" /></record>
+<record id="pcg_631" model="account.account.template"><field name="name">FRAIS BANCAIRES</field><field name="code">631</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_63" /></record>
+<record id="pcg_6311" model="account.account.template"><field name="name">Frais sur titres (achat, vente, garde)</field><field name="code">6311</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_631" /></record>
+<record id="pcg_6312" model="account.account.template"><field name="name">Frais sur effets</field><field name="code">6312</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_631" /></record>
+<record id="pcg_6313" model="account.account.template"><field name="name">Location de coffres</field><field name="code">6313</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_631" /></record>
+<record id="pcg_6315" model="account.account.template"><field name="name">Commissions sur cartes de crédit</field><field name="code">6315</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_631" /></record>
+<record id="pcg_6316" model="account.account.template"><field name="name">Frais d'émission d'emprunts</field><field name="code">6316</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_631" /></record>
+<record id="pcg_6318" model="account.account.template"><field name="name">Autres frais bancaires</field><field name="code">6318</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_631" /></record>
+<record id="pcg_632" model="account.account.template"><field name="name">RÉMUNÉRATIONS D'INTERMÉDIAIRES ET DE CONSEILS</field><field name="code">632</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_63" /></record>
+<record id="pcg_6321" model="account.account.template"><field name="name">Commissions et courtages sur achats</field><field name="code">6321</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_632" /></record>
+<record id="pcg_6322" model="account.account.template"><field name="name">Commissions et courtages sur ventes</field><field name="code">6322</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_632" /></record>
+<record id="pcg_6323" model="account.account.template"><field name="name">Rémunérations des transitaires</field><field name="code">6323</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_632" /></record>
+<record id="pcg_6324" model="account.account.template"><field name="name">Honoraires</field><field name="code">6324</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_632" /></record>
+<record id="pcg_6325" model="account.account.template"><field name="name">Frais d'actes et de contentieux</field><field name="code">6325</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_632" /></record>
+<record id="pcg_6328" model="account.account.template"><field name="name">Divers frais</field><field name="code">6328</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_632" /></record>
+<record id="pcg_633" model="account.account.template"><field name="name">FRAIS DE FORMATION DU PERSONNEL</field><field name="code">633</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_63" /></record>
+<record id="pcg_634" model="account.account.template"><field name="name">REDEVANCES POUR BREVETS, LICENCES, LOGICIELS ET DROITS SIMILAIRES</field><field name="code">634</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_63" /></record>
+<record id="pcg_6342" model="account.account.template"><field name="name">Redevances pour brevets, licences, concessions et droits similaires</field><field name="code">6342</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_634" /></record>
+<record id="pcg_6343" model="account.account.template"><field name="name">Redevances pour logiciels</field><field name="code">6343</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_634" /></record>
+<record id="pcg_6344" model="account.account.template"><field name="name">Redevances pour marques</field><field name="code">6344</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_634" /></record>
+<record id="pcg_635" model="account.account.template"><field name="name">COTISATIONS</field><field name="code">635</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_63" /></record>
+<record id="pcg_6351" model="account.account.template"><field name="name">Cotisations</field><field name="code">6351</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_635" /></record>
+<record id="pcg_6358" model="account.account.template"><field name="name">Concours divers</field><field name="code">6358</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_635" /></record>
+<record id="pcg_637" model="account.account.template"><field name="name">RÉMUNÉRATIONS DE PERSONNEL EXTÉRIEUR À L'ENTREPRISE</field><field name="code">637</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_63" /></record>
+<record id="pcg_6371" model="account.account.template"><field name="name">Personnel intérimaire</field><field name="code">6371</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_637" /></record>
+<record id="pcg_6372" model="account.account.template"><field name="name">Personnel détaché ou prêté à l'entreprise</field><field name="code">6372</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_637" /></record>
+<record id="pcg_638" model="account.account.template"><field name="name">AUTRES CHARGES EXTERNES</field><field name="code">638</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_63" /></record>
+<record id="pcg_6381" model="account.account.template"><field name="name">Frais de recrutement du personnel</field><field name="code">6381</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_638" /></record>
+<record id="pcg_6382" model="account.account.template"><field name="name">Frais de déménagement</field><field name="code">6382</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_638" /></record>
+<record id="pcg_6383" model="account.account.template"><field name="name">Réceptions</field><field name="code">6383</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_638" /></record>
+<record id="pcg_6384" model="account.account.template"><field name="name">Missions</field><field name="code">6384</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_638" /></record>
+<record id="pcg_64" model="account.account.template"><field name="name">IMPÔTS ET TAXES</field><field name="code">64</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_classe_6" /></record>
+<record id="pcg_641" model="account.account.template"><field name="name">IMPÔTS ET TAXES DIRECTS</field><field name="code">641</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_64" /></record>
+<record id="pcg_6411" model="account.account.template"><field name="name">Impôts fonciers et taxes annexes</field><field name="code">6411</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_641" /></record>
+<record id="pcg_6412" model="account.account.template"><field name="name">Patentes, licences et taxes annexes</field><field name="code">6412</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_641" /></record>
+<record id="pcg_6413" model="account.account.template"><field name="name">Taxes sur appointements et salaires</field><field name="code">6413</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_641" /></record>
+<record id="pcg_6414" model="account.account.template"><field name="name">Taxes d'apprentissage</field><field name="code">6414</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_641" /></record>
+<record id="pcg_6415" model="account.account.template"><field name="name">Formation professionnelle continue</field><field name="code">6415</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_641" /></record>
+<record id="pcg_6418" model="account.account.template"><field name="name">Autres impôts et taxes directs</field><field name="code">6418</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_641" /></record>
+<record id="pcg_645" model="account.account.template"><field name="name">IMPÔTS ET TAXES INDIRECTS</field><field name="code">645</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_64" /></record>
+<record id="pcg_646" model="account.account.template"><field name="name">DROITS D'ENREGISTREMENT</field><field name="code">646</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_64" /></record>
+<record id="pcg_6461" model="account.account.template"><field name="name">Droits de mutation</field><field name="code">6461</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_646" /></record>
+<record id="pcg_6462" model="account.account.template"><field name="name">Droits de timbre</field><field name="code">6462</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_646" /></record>
+<record id="pcg_6463" model="account.account.template"><field name="name">Taxes sur les véhicules de société</field><field name="code">6463</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_646" /></record>
+<record id="pcg_6464" model="account.account.template"><field name="name">Vignettes</field><field name="code">6464</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_646" /></record>
+<record id="pcg_6468" model="account.account.template"><field name="name">Autres droits</field><field name="code">6468</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_646" /></record>
+<record id="pcg_647" model="account.account.template"><field name="name">PÉNALITÉS ET AMENDES FISCALES</field><field name="code">647</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_64" /></record>
+<record id="pcg_6471" model="account.account.template"><field name="name">Pénalités d'assiette, impôts directs</field><field name="code">6471</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_647" /></record>
+<record id="pcg_6472" model="account.account.template"><field name="name">Pénalités d'assiette, impôts indirects</field><field name="code">6472</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_647" /></record>
+<record id="pcg_6473" model="account.account.template"><field name="name">Pénalités de recouvrement, impôts directs</field><field name="code">6473</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_647" /></record>
+<record id="pcg_6474" model="account.account.template"><field name="name">Pénalités de recouvrement, impôts indirects</field><field name="code">6474</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_647" /></record>
+<record id="pcg_6478" model="account.account.template"><field name="name">Autres amendes pénales et fiscales</field><field name="code">6478</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_647" /></record>
+<record id="pcg_648" model="account.account.template"><field name="name">AUTRES IMPÔTS ET TAXES</field><field name="code">648</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_64" /></record>
+<record id="pcg_65" model="account.account.template"><field name="name">AUTRES CHARGES</field><field name="code">65</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_classe_6" /></record>
+<record id="pcg_651" model="account.account.template"><field name="name">PERTES SUR CRÉANCES CLIENTS ET AUTRES DÉBITEURS</field><field name="code">651</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_65" /></record>
+<record id="pcg_6511" model="account.account.template"><field name="name">Clients</field><field name="code">6511</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_651" /></record>
+<record id="pcg_6515" model="account.account.template"><field name="name">Autres débiteurs</field><field name="code">6515</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_651" /></record>
+<record id="pcg_652" model="account.account.template"><field name="name">QUOTE-PART DE RÉSULTAT SUR OPÉRATIONS FAITES EN COMMUN</field><field name="code">652</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_65" /></record>
+<record id="pcg_6521" model="account.account.template"><field name="name">Quote-part transférée de bénéfices (comptabilité du gérant)</field><field name="code">6521</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_652" /></record>
+<record id="pcg_6525" model="account.account.template"><field name="name">Pertes imputées par transfert (comptabilité des associés non gérants)</field><field name="code">6525</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_652" /></record>
+<record id="pcg_653" model="account.account.template"><field name="name">QUOTE-PART DE RÉSULTAT ANNULÉE SUR EXÉCUTION PARTIELLE DE CONTRATS PLURI-EXERCICES</field><field name="code">653</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_65" /></record>
+<record id="pcg_654" model="account.account.template"><field name="name">VALEUR COMPTABLE DES CESSIONS COURANTES D'IMMOBILISATIONS</field><field name="code">654</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_65" /></record>
+<record id="pcg_658" model="account.account.template"><field name="name">CHARGES DIVERSES</field><field name="code">658</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_65" /></record>
+<record id="pcg_6581" model="account.account.template"><field name="name">Jetons de présence et autres rémunérations d'administrateurs</field><field name="code">6581</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_658" /></record>
+<record id="pcg_6582" model="account.account.template"><field name="name">Dons</field><field name="code">6582</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_658" /></record>
+<record id="pcg_6583" model="account.account.template"><field name="name">Mécénat</field><field name="code">6583</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_658" /></record>
+<record id="pcg_659" model="account.account.template"><field name="name">CHARGES PROVISIONNÉES D'EXPLOITATION</field><field name="code">659</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_65" /></record>
+<record id="pcg_6591" model="account.account.template"><field name="name">sur risques à court terme</field><field name="code">6591</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_659" /></record>
+<record id="pcg_6593" model="account.account.template"><field name="name">sur stocks</field><field name="code">6593</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_659" /></record>
+<record id="pcg_6594" model="account.account.template"><field name="name">sur créances</field><field name="code">6594</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_659" /></record>
+<record id="pcg_6598" model="account.account.template"><field name="name">Autres charges provisionnées</field><field name="code">6598</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_659" /></record>
+<record id="pcg_66" model="account.account.template"><field name="name">CHARGES DE PERSONNEL</field><field name="code">66</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_classe_6" /></record>
+<record id="pcg_661" model="account.account.template"><field name="name">RÉMUNÉRATIONS DIRECTES VERSÉES AU PERSONNEL NATIONAL</field><field name="code">661</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_66" /></record>
+<record id="pcg_6611" model="account.account.template"><field name="name">Appointements salaires et commissions</field><field name="code">6611</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_661" /></record>
+<record id="pcg_6612" model="account.account.template"><field name="name">Primes et gratifications</field><field name="code">6612</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_661" /></record>
+<record id="pcg_6613" model="account.account.template"><field name="name">Congés payés</field><field name="code">6613</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_661" /></record>
+<record id="pcg_6614" model="account.account.template"><field name="name">Indemnités de préavis, de licenciement et de recherche d'embauche</field><field name="code">6614</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_661" /></record>
+<record id="pcg_6615" model="account.account.template"><field name="name">Indemnités de maladie versées aux travailleurs</field><field name="code">6615</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_661" /></record>
+<record id="pcg_6616" model="account.account.template"><field name="name">Supplément familial</field><field name="code">6616</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_661" /></record>
+<record id="pcg_6617" model="account.account.template"><field name="name">Avantages en nature</field><field name="code">6617</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_661" /></record>
+<record id="pcg_6618" model="account.account.template"><field name="name">Autres rémunérations directes</field><field name="code">6618</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_661" /></record>
+<record id="pcg_662" model="account.account.template"><field name="name">RÉMUNÉRATIONS DIRECTES VERSÉES AU PERSONNEL NON NATIONAL</field><field name="code">662</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_66" /></record>
+<record id="pcg_6621" model="account.account.template"><field name="name">Appointements salaires et commissions</field><field name="code">6621</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_662" /></record>
+<record id="pcg_6622" model="account.account.template"><field name="name">Primes et gratifications</field><field name="code">6622</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_662" /></record>
+<record id="pcg_6623" model="account.account.template"><field name="name">Congés payés</field><field name="code">6623</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_662" /></record>
+<record id="pcg_6624" model="account.account.template"><field name="name">Indemnités de préavis, de licenciement et de recherche d'embauche</field><field name="code">6624</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_662" /></record>
+<record id="pcg_6625" model="account.account.template"><field name="name">Indemnités de maladie versées aux travailleurs</field><field name="code">6625</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_662" /></record>
+<record id="pcg_6626" model="account.account.template"><field name="name">Supplément familial</field><field name="code">6626</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_662" /></record>
+<record id="pcg_6627" model="account.account.template"><field name="name">Avantages en nature</field><field name="code">6627</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_662" /></record>
+<record id="pcg_6628" model="account.account.template"><field name="name">Autres rémunérations directes</field><field name="code">6628</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_662" /></record>
+<record id="pcg_663" model="account.account.template"><field name="name">INDEMNITÉS FORFAITAIRES VERSÉES AU PERSONNEL</field><field name="code">663</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_66" /></record>
+<record id="pcg_6631" model="account.account.template"><field name="name">Indemnités de logement</field><field name="code">6631</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_663" /></record>
+<record id="pcg_6632" model="account.account.template"><field name="name">Indemnités de représentation</field><field name="code">6632</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_663" /></record>
+<record id="pcg_6633" model="account.account.template"><field name="name">Indemnités d'expatriation</field><field name="code">6633</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_663" /></record>
+<record id="pcg_6638" model="account.account.template"><field name="name">Autres indemnités et avantages divers</field><field name="code">6638</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_663" /></record>
+<record id="pcg_664" model="account.account.template"><field name="name">CHARGES SOCIALES</field><field name="code">664</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_66" /></record>
+<record id="pcg_6641" model="account.account.template"><field name="name">Charges sociales sur rémunération du personnel national</field><field name="code">6641</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_664" /></record>
+<record id="pcg_6642" model="account.account.template"><field name="name">Charges sociales sur rémunération du personnel non national</field><field name="code">6642</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_664" /></record>
+<record id="pcg_666" model="account.account.template"><field name="name">RÉMUNÉRATIONS ET CHARGES SOCIALES DE L'EXPLOITANT INDIVIDUEL</field><field name="code">666</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_66" /></record>
+<record id="pcg_6661" model="account.account.template"><field name="name">Rémunération du travail de l'exploitant</field><field name="code">6661</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_666" /></record>
+<record id="pcg_6662" model="account.account.template"><field name="name">Charges sociales</field><field name="code">6662</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_666" /></record>
+<record id="pcg_667" model="account.account.template"><field name="name">RÉMUNÉRATION TRANSFÉRÉE DE PERSONNEL EXTÉRIEUR</field><field name="code">667</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_66" /></record>
+<record id="pcg_6671" model="account.account.template"><field name="name">Personnel intérimaire</field><field name="code">6671</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_667" /></record>
+<record id="pcg_6672" model="account.account.template"><field name="name">Personnel détaché ou prêté à l’entreprise</field><field name="code">6672</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_667" /></record>
+<record id="pcg_668" model="account.account.template"><field name="name">AUTRES CHARGES SOCIALES</field><field name="code">668</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_66" /></record>
+<record id="pcg_6681" model="account.account.template"><field name="name">Versements aux Syndicats et Comités d'entreprise, d'établissement</field><field name="code">6681</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_668" /></record>
+<record id="pcg_6682" model="account.account.template"><field name="name">Versements aux Comités d'hygiène et de sécurité</field><field name="code">6682</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_668" /></record>
+<record id="pcg_6683" model="account.account.template"><field name="name">Versements aux autres oeuvres sociales</field><field name="code">6683</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_668" /></record>
+<record id="pcg_6684" model="account.account.template"><field name="name">Médecine du travail et pharmacie</field><field name="code">6684</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_668" /></record>
+<record id="pcg_67" model="account.account.template"><field name="name">FRAIS FINANCIERS ET CHARGES ASSIMILÉES</field><field name="code">67</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_classe_6" /></record>
+<record id="pcg_671" model="account.account.template"><field name="name">INTÉRÊTS DES EMPRUNTS</field><field name="code">671</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_67" /></record>
+<record id="pcg_6711" model="account.account.template"><field name="name">Emprunts obligataires</field><field name="code">6711</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_671" /></record>
+<record id="pcg_6712" model="account.account.template"><field name="name">Emprunts auprès des établissements de crédit</field><field name="code">6712</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_671" /></record>
+<record id="pcg_6713" model="account.account.template"><field name="name">Dettes liées à des participations</field><field name="code">6713</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_671" /></record>
+<record id="pcg_672" model="account.account.template"><field name="name">INTÉRÊTS DANS LOYERS DE CRÉDIT-BAIL ET CONTRATS ASSIMILÉS</field><field name="code">672</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_67" /></record>
+<record id="pcg_6721" model="account.account.template"><field name="name">Intérêts dans loyers de crédit-bail immobilier</field><field name="code">6721</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_672" /></record>
+<record id="pcg_6722" model="account.account.template"><field name="name">Intérêts dans loyers de crédit-bail mobilier</field><field name="code">6722</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_672" /></record>
+<record id="pcg_6723" model="account.account.template"><field name="name">Intérêts dans loyers des autres contrats</field><field name="code">6723</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_672" /></record>
+<record id="pcg_673" model="account.account.template"><field name="name">ESCOMPTES ACCORDÉS</field><field name="code">673</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_67" /></record>
+<record id="pcg_674" model="account.account.template"><field name="name">AUTRES INTÉRÊTS</field><field name="code">674</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_67" /></record>
+<record id="pcg_6741" model="account.account.template"><field name="name">Avances reçues et dépôts créditeurs</field><field name="code">6741</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_674" /></record>
+<record id="pcg_6742" model="account.account.template"><field name="name">Comptes courants bloqués</field><field name="code">6742</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_674" /></record>
+<record id="pcg_6743" model="account.account.template"><field name="name">Intérêts sur obligations cautionnées</field><field name="code">6743</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_674" /></record>
+<record id="pcg_6744" model="account.account.template"><field name="name">Intérêts sur dettes commerciales</field><field name="code">6744</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_674" /></record>
+<record id="pcg_6745" model="account.account.template"><field name="name">Intérêts bancaires et sur opérations de trésorerie et d’escompte</field><field name="code">6745</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_674" /></record>
+<record id="pcg_6748" model="account.account.template"><field name="name">Intérêts sur dettes diverses</field><field name="code">6748</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_674" /></record>
+<record id="pcg_675" model="account.account.template"><field name="name">ESCOMPTES DES EFFETS DE COMMERCE</field><field name="code">675</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_67" /></record>
+<record id="pcg_676" model="account.account.template"><field name="name">PERTES DE CHANGE</field><field name="code">676</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_67" /></record>
+<record id="pcg_677" model="account.account.template"><field name="name">PERTES SUR CESSIONS DE TITRES DE PLACEMENT</field><field name="code">677</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_67" /></record>
+<record id="pcg_678" model="account.account.template"><field name="name">PERTES SUR RISQUES FINANCIERS</field><field name="code">678</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_67" /></record>
+<record id="pcg_6781" model="account.account.template"><field name="name">sur rentes viagères</field><field name="code">6781</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_678" /></record>
+<record id="pcg_6782" model="account.account.template"><field name="name">sur opérations financières</field><field name="code">6782</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_678" /></record>
+<record id="pcg_6784" model="account.account.template"><field name="name">sur instruments de trésorerie</field><field name="code">6784</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_678" /></record>
+<record id="pcg_679" model="account.account.template"><field name="name">CHARGES PROVISIONNÉES FINANCIÈRES</field><field name="code">679</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_67" /></record>
+<record id="pcg_6791" model="account.account.template"><field name="name">sur risques financiers</field><field name="code">6791</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_679" /></record>
+<record id="pcg_6795" model="account.account.template"><field name="name">sur titres de placement</field><field name="code">6795</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_679" /></record>
+<record id="pcg_6798" model="account.account.template"><field name="name">Autres charges provisionnées financières</field><field name="code">6798</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_679" /></record>
+<record id="pcg_68" model="account.account.template"><field name="name">DOTATIONS AUX AMORTISSEMENTS</field><field name="code">68</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_classe_6" /></record>
+<record id="pcg_681" model="account.account.template"><field name="name">DOTATIONS AUX AMORTISSEMENTS D'EXPLOITATION</field><field name="code">681</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_68" /></record>
+<record id="pcg_6811" model="account.account.template"><field name="name">Dotations aux amortissements des charges immobilisées</field><field name="code">6811</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_681" /></record>
+<record id="pcg_6812" model="account.account.template"><field name="name">Dotations aux amortissements des immobilisations incorporelles</field><field name="code">6812</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_681" /></record>
+<record id="pcg_6813" model="account.account.template"><field name="name">Dotations aux amortissements des immobilisations corporelles</field><field name="code">6813</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_681" /></record>
+<record id="pcg_687" model="account.account.template"><field name="name">DOTATIONS AUX AMORTISSEMENTS À CARACTÈRE FINANCIER</field><field name="code">687</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_68" /></record>
+<record id="pcg_6872" model="account.account.template"><field name="name">Dotations aux amortissements des primes de remboursement des obligations</field><field name="code">6872</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_687" /></record>
+<record id="pcg_6878" model="account.account.template"><field name="name">Autres dotations aux amortissements à caractère financier</field><field name="code">6878</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_687" /></record>
+<record id="pcg_69" model="account.account.template"><field name="name">DOTATIONS AUX PROVISIONS</field><field name="code">69</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_classe_6" /></record>
+<record id="pcg_691" model="account.account.template"><field name="name">DOTATIONS AUX PROVISIONS D'EXPLOITATION</field><field name="code">691</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_69" /></record>
+<record id="pcg_6911" model="account.account.template"><field name="name">pour risques et charges</field><field name="code">6911</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_691" /></record>
+<record id="pcg_6912" model="account.account.template"><field name="name">pour grosses réparations</field><field name="code">6912</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_691" /></record>
+<record id="pcg_6913" model="account.account.template"><field name="name">pour dépréciation des immobilisations incorporelles</field><field name="code">6913</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_691" /></record>
+<record id="pcg_6914" model="account.account.template"><field name="name">pour dépréciation des immobilisations corporelles</field><field name="code">6914</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_691" /></record>
+<record id="pcg_697" model="account.account.template"><field name="name">DOTATIONS AUX PROVISIONS FINANCIÈRES</field><field name="code">697</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_69" /></record>
+<record id="pcg_6971" model="account.account.template"><field name="name">pour risques et charges</field><field name="code">6971</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_697" /></record>
+<record id="pcg_6972" model="account.account.template"><field name="name">pour dépréciation des immobilisations financières</field><field name="code">6972</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_expense" /><field name="parent_id" ref="pcg_697" /></record>
+<record id="pcg_70" model="account.account.template"><field name="name">VENTES</field><field name="code">70</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_classe_7" /></record>
+<record id="pcg_701" model="account.account.template"><field name="name">VENTES DE MARCHANDISES</field><field name="code">701</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_70" /></record>
+<record id="pcg_7011" model="account.account.template"><field name="name">dans la Région</field><field name="code">7011</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_701" /></record>
+<record id="pcg_7012" model="account.account.template"><field name="name">hors Région</field><field name="code">7012</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_701" /></record>
+<record id="pcg_7013" model="account.account.template"><field name="name">aux entreprises du groupe dans la Région</field><field name="code">7013</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_701" /></record>
+<record id="pcg_7014" model="account.account.template"><field name="name">aux entreprises du groupe hors Région</field><field name="code">7014</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_701" /></record>
+<record id="pcg_702" model="account.account.template"><field name="name">VENTES DE PRODUITS FINIS</field><field name="code">702</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_70" /></record>
+<record id="pcg_7021" model="account.account.template"><field name="name">dans la Région</field><field name="code">7021</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_702" /></record>
+<record id="pcg_7022" model="account.account.template"><field name="name">hors Région</field><field name="code">7022</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_702" /></record>
+<record id="pcg_7023" model="account.account.template"><field name="name">aux entreprises du groupe dans la Région</field><field name="code">7023</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_702" /></record>
+<record id="pcg_7024" model="account.account.template"><field name="name">aux entreprises du groupe hors Région</field><field name="code">7024</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_702" /></record>
+<record id="pcg_703" model="account.account.template"><field name="name">VENTES DE PRODUITS INTERMÉDIAIRES</field><field name="code">703</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_70" /></record>
+<record id="pcg_7031" model="account.account.template"><field name="name">dans la Région</field><field name="code">7031</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_703" /></record>
+<record id="pcg_7032" model="account.account.template"><field name="name">hors Région</field><field name="code">7032</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_703" /></record>
+<record id="pcg_7033" model="account.account.template"><field name="name">aux entreprises du groupe dans la Région</field><field name="code">7033</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_703" /></record>
+<record id="pcg_7034" model="account.account.template"><field name="name">aux entreprises du groupe hors Région</field><field name="code">7034</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_703" /></record>
+<record id="pcg_704" model="account.account.template"><field name="name">VENTES DE PRODUITS RÉSIDUELS</field><field name="code">704</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_70" /></record>
+<record id="pcg_7041" model="account.account.template"><field name="name">dans la Région</field><field name="code">7041</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_704" /></record>
+<record id="pcg_7042" model="account.account.template"><field name="name">hors Région</field><field name="code">7042</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_704" /></record>
+<record id="pcg_7043" model="account.account.template"><field name="name">aux entreprises du groupe dans la Région</field><field name="code">7043</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_704" /></record>
+<record id="pcg_7044" model="account.account.template"><field name="name">aux entreprises du groupe hors Région</field><field name="code">7044</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_704" /></record>
+<record id="pcg_705" model="account.account.template"><field name="name">TRAVAUX FACTURÉS</field><field name="code">705</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_70" /></record>
+<record id="pcg_7051" model="account.account.template"><field name="name">dans la Région</field><field name="code">7051</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_705" /></record>
+<record id="pcg_7052" model="account.account.template"><field name="name">hors Région</field><field name="code">7052</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_705" /></record>
+<record id="pcg_7053" model="account.account.template"><field name="name">aux entreprises du groupe dans la Région</field><field name="code">7053</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_705" /></record>
+<record id="pcg_7054" model="account.account.template"><field name="name">aux entreprises du groupe hors Région</field><field name="code">7054</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_705" /></record>
+<record id="pcg_706" model="account.account.template"><field name="name">SERVICES VENDUS</field><field name="code">706</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_70" /></record>
+<record id="pcg_7061" model="account.account.template"><field name="name">dans la Région</field><field name="code">7061</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_706" /></record>
+<record id="pcg_7062" model="account.account.template"><field name="name">hors Région</field><field name="code">7062</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_706" /></record>
+<record id="pcg_7063" model="account.account.template"><field name="name">aux entreprises du groupe dans la Région</field><field name="code">7063</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_706" /></record>
+<record id="pcg_7064" model="account.account.template"><field name="name">aux entreprises du groupe hors Région</field><field name="code">7064</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_706" /></record>
+<record id="pcg_707" model="account.account.template"><field name="name">PRODUITS ACCESSOIRES</field><field name="code">707</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_70" /></record>
+<record id="pcg_7071" model="account.account.template"><field name="name">Ports, emballages perdus et autres frais facturés</field><field name="code">7071</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_707" /></record>
+<record id="pcg_7072" model="account.account.template"><field name="name">Commissions et courtages</field><field name="code">7072</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_707" /></record>
+<record id="pcg_7073" model="account.account.template"><field name="name">Locations</field><field name="code">7073</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_707" /></record>
+<record id="pcg_7074" model="account.account.template"><field name="name">Bonis sur reprises et cessions d'emballages</field><field name="code">7074</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_707" /></record>
+<record id="pcg_7075" model="account.account.template"><field name="name">Mise à disposition de personnel</field><field name="code">7075</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_707" /></record>
+<record id="pcg_7076" model="account.account.template"><field name="name">Redevances pour brevets, logiciels, marques et droits similaires</field><field name="code">7076</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_707" /></record>
+<record id="pcg_7077" model="account.account.template"><field name="name">Services exploités dans l'intérêt du personnel</field><field name="code">7077</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_707" /></record>
+<record id="pcg_7078" model="account.account.template"><field name="name">Autres produits accessoires</field><field name="code">7078</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_707" /></record>
+<record id="pcg_71" model="account.account.template"><field name="name">SUBVENTIONS D'EXPLOITATION</field><field name="code">71</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_classe_7" /></record>
+<record id="pcg_711" model="account.account.template"><field name="name">SUR PRODUITS À L'EXPORTATION</field><field name="code">711</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_71" /></record>
+<record id="pcg_712" model="account.account.template"><field name="name">SUR PRODUITS À L'IMPORTATION</field><field name="code">712</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_71" /></record>
+<record id="pcg_713" model="account.account.template"><field name="name">SUR PRODUITS DE PÉRÉQUATION</field><field name="code">713</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_71" /></record>
+<record id="pcg_718" model="account.account.template"><field name="name">AUTRES SUBVENTIONS D'EXPLOITATION</field><field name="code">718</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_71" /></record>
+<record id="pcg_7181" model="account.account.template"><field name="name">Versées par l'État et les collectivités publiques</field><field name="code">7181</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_718" /></record>
+<record id="pcg_7182" model="account.account.template"><field name="name">Versées par les organismes internationaux</field><field name="code">7182</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_718" /></record>
+<record id="pcg_7183" model="account.account.template"><field name="name">Versées par des tiers</field><field name="code">7183</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_718" /></record>
+<record id="pcg_72" model="account.account.template"><field name="name">PRODUCTION IMMOBILISÉE</field><field name="code">72</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_classe_7" /></record>
+<record id="pcg_721" model="account.account.template"><field name="name">IMMOBILISATIONS INCORPORELLES</field><field name="code">721</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_72" /></record>
+<record id="pcg_722" model="account.account.template"><field name="name">IMMOBILISATIONS CORPORELLES</field><field name="code">722</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_72" /></record>
+<record id="pcg_726" model="account.account.template"><field name="name">IMMOBILISATIONS FINANCIÈRES</field><field name="code">726</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_72" /></record>
+<record id="pcg_73" model="account.account.template"><field name="name">VARIATIONS DES STOCKS DE BIENS ET DE SERVICES PRODUITS</field><field name="code">73</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_classe_7" /></record>
+<record id="pcg_734" model="account.account.template"><field name="name">VARIATIONS DES STOCKS DE PRODUITS EN COURS</field><field name="code">734</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_73" /></record>
+<record id="pcg_7341" model="account.account.template"><field name="name">Produits en cours</field><field name="code">7341</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_734" /></record>
+<record id="pcg_7342" model="account.account.template"><field name="name">Travaux en cours</field><field name="code">7342</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_734" /></record>
+<record id="pcg_735" model="account.account.template"><field name="name">VARIATIONS DES EN-COURS DE SERVICES</field><field name="code">735</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_73" /></record>
+<record id="pcg_7351" model="account.account.template"><field name="name">Études en cours</field><field name="code">7351</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_735" /></record>
+<record id="pcg_7352" model="account.account.template"><field name="name">Prestations de services en cours</field><field name="code">7352</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_735" /></record>
+<record id="pcg_736" model="account.account.template"><field name="name">VARIATIONS DES STOCKS DE PRODUITS FINIS</field><field name="code">736</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_73" /></record>
+<record id="pcg_737" model="account.account.template"><field name="name">VARIATIONS DES STOCKS DE PRODUITS INTERMÉDIAIRES ET RÉSIDUELS</field><field name="code">737</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_73" /></record>
+<record id="pcg_7371" model="account.account.template"><field name="name">Produits intermédiaires</field><field name="code">7371</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_737" /></record>
+<record id="pcg_7372" model="account.account.template"><field name="name">Produits résiduels</field><field name="code">7372</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_737" /></record>
+<record id="pcg_75" model="account.account.template"><field name="name">AUTRES PRODUITS</field><field name="code">75</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_classe_7" /></record>
+<record id="pcg_752" model="account.account.template"><field name="name">QUOTE-PART DE RÉSULTAT SUR OPÉRATIONS FAITES EN COMMUN</field><field name="code">752</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_75" /></record>
+<record id="pcg_7521" model="account.account.template"><field name="name">Quote-part transférée de pertes (comptabilité du gérant)</field><field name="code">7521</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_752" /></record>
+<record id="pcg_7525" model="account.account.template"><field name="name">Bénéfices attribués par transfert (comptabilité des associés non gérants)</field><field name="code">7525</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_752" /></record>
+<record id="pcg_753" model="account.account.template"><field name="name">QUOTE-PART DE RÉSULTAT SUR EXÉCUTION PARTIELLE DE CONTRATS PLURIEXERCICES</field><field name="code">753</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_75" /></record>
+<record id="pcg_754" model="account.account.template"><field name="name">PRODUITS DES CESSIONS COURANTES D'IMMOBILISATIONS</field><field name="code">754</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_75" /></record>
+<record id="pcg_758" model="account.account.template"><field name="name">PRODUITS DIVERS</field><field name="code">758</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_75" /></record>
+<record id="pcg_7581" model="account.account.template"><field name="name">Jetons de présence et autres rémunérations d'administrateurs</field><field name="code">7581</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_758" /></record>
+<record id="pcg_7582" model="account.account.template"><field name="name">Indemnités d’assurances reçues</field><field name="code">7582</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_758" /></record>
+<record id="pcg_759" model="account.account.template"><field name="name">REPRISES DE CHARGES PROVISIONNÉES D'EXPLOITATION</field><field name="code">759</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_75" /></record>
+<record id="pcg_7591" model="account.account.template"><field name="name">sur risques à court terme</field><field name="code">7591</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_759" /></record>
+<record id="pcg_7593" model="account.account.template"><field name="name">sur stocks</field><field name="code">7593</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_759" /></record>
+<record id="pcg_7594" model="account.account.template"><field name="name">sur créances</field><field name="code">7594</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_759" /></record>
+<record id="pcg_7598" model="account.account.template"><field name="name">sur autres charges provisionnées</field><field name="code">7598</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_759" /></record>
+<record id="pcg_77" model="account.account.template"><field name="name">REVENUS FINANCIERS ET PRODUITS ASSIMILÉS</field><field name="code">77</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_classe_7" /></record>
+<record id="pcg_771" model="account.account.template"><field name="name">INTÉRÊTS DE PRÊTS</field><field name="code">771</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_77" /></record>
+<record id="pcg_772" model="account.account.template"><field name="name">REVENUS DE PARTICIPATIONS</field><field name="code">772</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_77" /></record>
+<record id="pcg_773" model="account.account.template"><field name="name">ESCOMPTES OBTENUS</field><field name="code">773</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_77" /></record>
+<record id="pcg_774" model="account.account.template"><field name="name">REVENUS DE TITRES DE PLACEMENT</field><field name="code">774</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_77" /></record>
+<record id="pcg_776" model="account.account.template"><field name="name">GAINS DE CHANGE</field><field name="code">776</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_77" /></record>
+<record id="pcg_777" model="account.account.template"><field name="name">GAINS SUR CESSIONS DE TITRES DE PLACEMENT</field><field name="code">777</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_77" /></record>
+<record id="pcg_778" model="account.account.template"><field name="name">GAINS SUR RISQUES FINANCIERS</field><field name="code">778</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_77" /></record>
+<record id="pcg_7781" model="account.account.template"><field name="name">sur rentes viagères</field><field name="code">7781</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_778" /></record>
+<record id="pcg_7782" model="account.account.template"><field name="name">sur opérations financières</field><field name="code">7782</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_778" /></record>
+<record id="pcg_7784" model="account.account.template"><field name="name">sur instruments de trésorerie</field><field name="code">7784</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_778" /></record>
+<record id="pcg_779" model="account.account.template"><field name="name">REPRISES DE CHARGES PROVISIONNÉES FINANCIÈRES</field><field name="code">779</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_77" /></record>
+<record id="pcg_7791" model="account.account.template"><field name="name">sur risques financiers</field><field name="code">7791</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_779" /></record>
+<record id="pcg_7795" model="account.account.template"><field name="name">sur titres de placement</field><field name="code">7795</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_779" /></record>
+<record id="pcg_7798" model="account.account.template"><field name="name">autres charges provisionnées financières</field><field name="code">7798</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_779" /></record>
+<record id="pcg_78" model="account.account.template"><field name="name">TRANSFERTS DE CHARGES</field><field name="code">78</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_classe_7" /></record>
+<record id="pcg_781" model="account.account.template"><field name="name">TRANSFERTS DE CHARGES D'EXPLOITATION</field><field name="code">781</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_78" /></record>
+<record id="pcg_787" model="account.account.template"><field name="name">TRANSFERTS DE CHARGES FINANCIERES</field><field name="code">787</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_78" /></record>
+<record id="pcg_79" model="account.account.template"><field name="name">REPRISES DE PROVISIONS</field><field name="code">79</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_classe_7" /></record>
+<record id="pcg_791" model="account.account.template"><field name="name">REPRISES DE PROVISIONS D'EXPLOITATION</field><field name="code">791</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_79" /></record>
+<record id="pcg_7911" model="account.account.template"><field name="name">pour risques et charges</field><field name="code">7911</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_791" /></record>
+<record id="pcg_7912" model="account.account.template"><field name="name">pour grosses réparations</field><field name="code">7912</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_791" /></record>
+<record id="pcg_7913" model="account.account.template"><field name="name">pour dépréciation des immobilisations incorporelles</field><field name="code">7913</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_791" /></record>
+<record id="pcg_7914" model="account.account.template"><field name="name">pour dépréciation des immobilisations corporelles</field><field name="code">7914</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_791" /></record>
+<record id="pcg_797" model="account.account.template"><field name="name">REPRISES DE PROVISIONS FINANCIÈRES</field><field name="code">797</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_79" /></record>
+<record id="pcg_7971" model="account.account.template"><field name="name">pour risques et charges</field><field name="code">7971</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_797" /></record>
+<record id="pcg_7972" model="account.account.template"><field name="name">pour dépréciation des immobilisations financières</field><field name="code">7972</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_797" /></record>
+<record id="pcg_798" model="account.account.template"><field name="name">REPRISES D'AMORTISSEMENTS</field><field name="code">798</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_income" /><field name="parent_id" ref="pcg_79" /></record>
+<record id="pcg_81" model="account.account.template"><field name="name">VALEURS COMPTABLES DES CESSIONS D'IMMOBILISATIONS</field><field name="code">81</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_classe_8" /></record>
+<record id="pcg_811" model="account.account.template"><field name="name">IMMOBILISATIONS INCORPORELLES</field><field name="code">811</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_81" /></record>
+<record id="pcg_812" model="account.account.template"><field name="name">IMMOBILISATIONS CORPORELLES</field><field name="code">812</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_81" /></record>
+<record id="pcg_816" model="account.account.template"><field name="name">IMMOBILISATIONS FINANCIÈRES</field><field name="code">816</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_81" /></record>
+<record id="pcg_82" model="account.account.template"><field name="name">PRODUITS DES CESSIONS D'IMMOBILISATIONS</field><field name="code">82</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_classe_8" /></record>
+<record id="pcg_821" model="account.account.template"><field name="name">IMMOBILISATIONS INCORPORELLES</field><field name="code">821</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_82" /></record>
+<record id="pcg_822" model="account.account.template"><field name="name">IMMOBILISATIONS CORPORELLES</field><field name="code">822</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_82" /></record>
+<record id="pcg_826" model="account.account.template"><field name="name">IMMOBILISATIONS FINANCIÈRES</field><field name="code">826</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_82" /></record>
+<record id="pcg_83" model="account.account.template"><field name="name">CHARGES HORS ACTIVITÉS ORDINAIRES</field><field name="code">83</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_classe_8" /></record>
+<record id="pcg_831" model="account.account.template"><field name="name">CHARGES H.A.O. CONSTATÉES</field><field name="code">831</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_83" /></record>
+<record id="pcg_834" model="account.account.template"><field name="name">PERTES SUR CRÉANCES H.A.O.</field><field name="code">834</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_83" /></record>
+<record id="pcg_835" model="account.account.template"><field name="name">DONS ET LIBÉRALITÉS ACCORDÉS</field><field name="code">835</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_83" /></record>
+<record id="pcg_836" model="account.account.template"><field name="name">ABANDONS DE CRÉANCES CONSENTIS</field><field name="code">836</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_83" /></record>
+<record id="pcg_839" model="account.account.template"><field name="name">CHARGES PROVISIONNÉES H.A.O.</field><field name="code">839</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_83" /></record>
+<record id="pcg_84" model="account.account.template"><field name="name">PRODUITS HORS ACTIVITÉS ORDINAIRES</field><field name="code">84</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_classe_8" /></record>
+<record id="pcg_841" model="account.account.template"><field name="name">PRODUITS H.A.O CONSTATÉS</field><field name="code">841</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_84" /></record>
+<record id="pcg_845" model="account.account.template"><field name="name">DONS ET LIBÉRALITÉS OBTENUS</field><field name="code">845</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_84" /></record>
+<record id="pcg_846" model="account.account.template"><field name="name">ABANDONS DE CRÉANCES OBTENUS</field><field name="code">846</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_84" /></record>
+<record id="pcg_848" model="account.account.template"><field name="name">TRANSFERTS DE CHARGES H.A.O</field><field name="code">848</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_84" /></record>
+<record id="pcg_849" model="account.account.template"><field name="name">REPRISES DES CHARGES PROVISIONNÉES H.A.O.</field><field name="code">849</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_84" /></record>
+<record id="pcg_85" model="account.account.template"><field name="name">DOTATIONS HORS ACTIVITÉS ORDINAIRES</field><field name="code">85</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_classe_8" /></record>
+<record id="pcg_851" model="account.account.template"><field name="name">DOTATIONS AUX PROVISIONS RÉGLEMENTÉES</field><field name="code">851</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_85" /></record>
+<record id="pcg_852" model="account.account.template"><field name="name">DOTATIONS AUX AMORTISSEMENTS H.A.O.</field><field name="code">852</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_85" /></record>
+<record id="pcg_853" model="account.account.template"><field name="name">DOTATIONS AUX PROVISIONS POUR DÉPRÉCIATION H.A.O.</field><field name="code">853</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_85" /></record>
+<record id="pcg_854" model="account.account.template"><field name="name">DOTATIONS AUX PROVISIONS POUR RISQUES ET CHARGES H.A.O.</field><field name="code">854</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_85" /></record>
+<record id="pcg_858" model="account.account.template"><field name="name">AUTRES DOTATIONS H.A.O.</field><field name="code">858</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_85" /></record>
+<record id="pcg_86" model="account.account.template"><field name="name">REPRISES HORS ACTIVITÉS ORDINAIRES</field><field name="code">86</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_classe_8" /></record>
+<record id="pcg_861" model="account.account.template"><field name="name">REPRISES DE PROVISIONS RÉGLEMENTÉES</field><field name="code">861</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_86" /></record>
+<record id="pcg_862" model="account.account.template"><field name="name">REPRISES D’AMORTISSEMENTS</field><field name="code">862</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_86" /></record>
+<record id="pcg_863" model="account.account.template"><field name="name">REPRISES DE PROVISIONS POUR DÉPRÉCIATION H.A.O.</field><field name="code">863</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_86" /></record>
+<record id="pcg_864" model="account.account.template"><field name="name">REPRISES DE PROVISIONS POUR RISQUES ET CHARGES H.A.O.</field><field name="code">864</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_86" /></record>
+<record id="pcg_865" model="account.account.template"><field name="name">REPRISES DE SUBVENTIONS D’INVESTISSEMENT</field><field name="code">865</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_86" /></record>
+<record id="pcg_868" model="account.account.template"><field name="name">AUTRES REPRISES H.A.O.</field><field name="code">868</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_86" /></record>
+<record id="pcg_87" model="account.account.template"><field name="name">PARTICIPATION DES TRAVAILLEURS</field><field name="code">87</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_classe_8" /></record>
+<record id="pcg_871" model="account.account.template"><field name="name">PARTICIPATION LÉGALE AUX BÉNÉFICES</field><field name="code">871</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_87" /></record>
+<record id="pcg_874" model="account.account.template"><field name="name">PARTICIPATION CONTRACTUELLE AUX BÉNÉFICES</field><field name="code">874</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_87" /></record>
+<record id="pcg_878" model="account.account.template"><field name="name">AUTRES PARTICIPATIONS</field><field name="code">878</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_87" /></record>
+<record id="pcg_88" model="account.account.template"><field name="name">SUBVENTIONS D'ÉQUILIBRE</field><field name="code">88</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_classe_8" /></record>
+<record id="pcg_881" model="account.account.template"><field name="name">ÉTAT</field><field name="code">881</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_88" /></record>
+<record id="pcg_884" model="account.account.template"><field name="name">COLLECTIVITÉS PUBLIQUES</field><field name="code">884</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_88" /></record>
+<record id="pcg_886" model="account.account.template"><field name="name">GROUPE</field><field name="code">886</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_88" /></record>
+<record id="pcg_888" model="account.account.template"><field name="name">AUTRES</field><field name="code">888</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_88" /></record>
+<record id="pcg_89" model="account.account.template"><field name="name">IMPÔTS SUR LE RÉSULTAT</field><field name="code">89</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_classe_8" /></record>
+<record id="pcg_891" model="account.account.template"><field name="name">IMPÔTS SUR LES BÉNÉFICES DE L'EXERCICE</field><field name="code">891</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_89" /></record>
+<record id="pcg_8911" model="account.account.template"><field name="name">Activités exercées dans l'État</field><field name="code">8911</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_891" /></record>
+<record id="pcg_8912" model="account.account.template"><field name="name">Activités exercées dans les autres États de la Région</field><field name="code">8912</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_891" /></record>
+<record id="pcg_8913" model="account.account.template"><field name="name">Activités exercées hors Région</field><field name="code">8913</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_891" /></record>
+<record id="pcg_892" model="account.account.template"><field name="name">RAPPEL D'IMPÔTS SUR RÉSULTATS ANTÉRIEURS</field><field name="code">892</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_89" /></record>
+<record id="pcg_895" model="account.account.template"><field name="name">IMPÔT MINIMUM FORFAITAIRE (I.M.F.)</field><field name="code">895</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_89" /></record>
+<record id="pcg_899" model="account.account.template"><field name="name">DÉGRÈVEMENTS ET ANNULATIONS D’IMPÔTS SUR RÉSULTATS ANTÉRIEURS</field><field name="code">899</field><field name="type">view</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_89" /></record>
+<record id="pcg_8991" model="account.account.template"><field name="name">Dégrèvements</field><field name="code">8991</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_899" /></record>
+<record id="pcg_8994" model="account.account.template"><field name="name">Annulations pour pertes rétroactives</field><field name="code">8994</field><field name="type">other</field><field name="user_type" ref="l10n_syscohada.account_type_commitment" /><field name="parent_id" ref="pcg_899" /></record>
+<record id="pcg_90" model="account.account.template">
+	<field name="name">ENGAGEMENTS OBTENUS ET ENGAGEMENTS ACCORDÉS</field>
+	<field name="code">9</field>
+	<field name="type">view</field>
+	<field name="user_type" ref="l10n_syscohada.account_type_special" />
+	<field name="parent_id" ref="pcg_classe_9" />
+</record>
+	<record id="pcg_901" model="account.account.template">
+		<field name="name">ENGAGEMENTS DE FINANCEMENT OBTENUS</field>
+		<field name="code">901</field>
+		<field name="type">view</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_90" />
+	</record>
+	<record id="pcg_9011" model="account.account.template">
+		<field name="name">Crédits confirmés obtenus</field>
+		<field name="code">9011</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_901" />
+	</record>
+	<record id="pcg_9012" model="account.account.template">
+		<field name="name">Emprunts restant à encaisser</field>
+		<field name="code">9012</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_901" />
+	</record>
+	<record id="pcg_9013" model="account.account.template">
+		<field name="name">Facilités de financement renouvelables</field>
+		<field name="code">9013</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_901" />
+	</record>
+	<record id="pcg_9014" model="account.account.template">
+		<field name="name"> Facilités d'émission</field>
+		<field name="code">9014</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_901" />
+	</record>
+	<record id="pcg_9018" model="account.account.template">
+		<field name="name">Autres engagements de financement obtenus</field>
+		<field name="code">9018</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_901" />
+	</record>
+	<record id="pcg_902" model="account.account.template">
+		<field name="name">ENGAGEMENTS DE GARANTIE OBTENUS</field>
+		<field name="code">902</field>
+		<field name="type">view</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_90" />
+	</record>
+	<record id="pcg_9021" model="account.account.template">
+		<field name="name">Avals obtenus</field>
+		<field name="code">9021</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_902" />
+	</record>
+	<record id="pcg_9022" model="account.account.template">
+		<field name="name">Cautions, garanties obtenues</field>
+		<field name="code">9022</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_902" />
+	</record>
+	<record id="pcg_9023" model="account.account.template">
+		<field name="name">Hypothèques obtenues</field>
+		<field name="code">9023</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_902" />
+	</record>
+	<record id="pcg_9024" model="account.account.template">
+		<field name="name">Effets endossés par des tiers</field>
+		<field name="code">9024</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_902" />
+	</record>
+	<record id="pcg_9028" model="account.account.template">
+		<field name="name">Autres garanties obtenues</field>
+		<field name="code">9028</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_902" />
+	</record>
+	<record id="pcg_903" model="account.account.template">
+		<field name="name">ENGAGEMENTS RÉCIPROQUES</field>
+		<field name="code">903</field>
+		<field name="type">view</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_90" />
+	</record>
+	<record id="pcg_9031" model="account.account.template">
+		<field name="name">Achats de marchandises à terme</field>
+		<field name="code">9031</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_903" />
+	</record>
+	<record id="pcg_9032" model="account.account.template">
+		<field name="name">Achats à terme de devises</field>
+		<field name="code">9032</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_903" />
+	</record>
+	<record id="pcg_9033" model="account.account.template">
+		<field name="name">Commandes fermes des clients</field>
+		<field name="code">9033</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_903" />
+	</record>
+	<record id="pcg_9038" model="account.account.template">
+		<field name="name">Autres engagements réciproques</field>
+		<field name="code">9038</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_903" />
+	</record>
+	<record id="pcg_904" model="account.account.template">
+		<field name="name">AUTRES ENGAGEMENTS OBTENUS</field>
+		<field name="code">904</field>
+		<field name="type">view</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_90" />
+	</record>
+	<record id="pcg_9041" model="account.account.template">
+		<field name="name">Abandons de créances conditionnels</field>
+		<field name="code">9041</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_904" />
+	</record>
+	<record id="pcg_9043" model="account.account.template">
+		<field name="name">Ventes avec clause de réserve de propriété</field>
+		<field name="code">9043</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_904" />
+	</record>
+	<record id="pcg_9048" model="account.account.template">
+		<field name="name">Divers engagements obtenus</field>
+		<field name="code">9048</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_904" />
+	</record>
+	<record id="pcg_905" model="account.account.template">
+		<field name="name">ENGAGEMENTS DE FINANCEMENT ACCORDÉS</field>
+		<field name="code">905</field>
+		<field name="type">view</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_90" />
+	</record>
+	<record id="pcg_9051" model="account.account.template">
+		<field name="name">Crédits accordés non décaissés</field>
+		<field name="code">9051</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_905" />
+	</record>
+	<record id="pcg_9058" model="account.account.template">
+		<field name="name">Autres engagements de financement accordés</field>
+		<field name="code">9058</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_905" />
+	</record>
+	<record id="pcg_906" model="account.account.template">
+		<field name="name">ENGAGEMENTS DE GARANTIE ACCORDÉS</field>
+		<field name="code">906</field>
+		<field name="type">view</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_90" />
+	</record>
+	<record id="pcg_9061" model="account.account.template">
+		<field name="name">Avals accordés</field>
+		<field name="code">9061</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_906" />
+	</record>
+	<record id="pcg_9062" model="account.account.template">
+		<field name="name">Cautions, garanties accordées</field>
+		<field name="code">9062</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_906" />
+	</record>
+	<record id="pcg_9063" model="account.account.template">
+		<field name="name">Hypothèques accordées</field>
+		<field name="code">9063</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_906" />
+	</record>
+	<record id="pcg_9064" model="account.account.template">
+		<field name="name">Effets endossés par l'entreprise</field>
+		<field name="code">9064</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_906" />
+	</record>
+	<record id="pcg_9068" model="account.account.template">
+		<field name="name">Autres garanties accordées</field>
+		<field name="code">9068</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_906" />
+	</record>
+	<record id="pcg_907" model="account.account.template">
+		<field name="name">ENGAGEMENTS RÉCIPROQUES</field>
+		<field name="code">907</field>
+		<field name="type">view</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_90" />
+	</record>
+	<record id="pcg_9071" model="account.account.template">
+		<field name="name">Ventes de marchandises à terme</field>
+		<field name="code">9071</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_907" />
+	</record>
+	<record id="pcg_9072" model="account.account.template">
+		<field name="name">Ventes à terme de devises</field>
+		<field name="code">9072</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_907" />
+	</record>
+	<record id="pcg_9073" model="account.account.template">
+		<field name="name">Commandes fermes aux fournisseurs</field>
+		<field name="code">9073</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_907" />
+	</record>
+	<record id="pcg_9078" model="account.account.template">
+		<field name="name">Autres engagements réciproques</field>
+		<field name="code">9078</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_907" />
+	</record>
+	<record id="pcg_908" model="account.account.template">
+		<field name="name">AUTRES ENGAGEMENTS ACCORDÉS</field>
+		<field name="code">908</field>
+		<field name="type">view</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_90" />
+	</record>
+	<record id="pcg_9081" model="account.account.template">
+		<field name="name">Annulations conditionnelles de dettes</field>
+		<field name="code">9081</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_908" />
+	</record>
+	<record id="pcg_9082" model="account.account.template">
+		<field name="name">Engagements de retraite</field>
+		<field name="code">9082</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_908" />
+	</record>
+	<record id="pcg_9083" model="account.account.template">
+		<field name="name">Achats avec clause de réserve de propriété</field>
+		<field name="code">9083</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_908" />
+	</record>
+	<record id="pcg_9088" model="account.account.template">
+		<field name="name">Divers engagements accordés</field>
+		<field name="code">9088</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_908" />
+	</record>
+	<record id="pcg_91" model="account.account.template">
+		<field name="name">CONTREPARTIES DES ENGAGEMENTS</field>
+		<field name="code">91</field>
+		<field name="type">view</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_classe_9" />
+	</record>
+	<record id="pcg_911" model="account.account.template">
+		<field name="name">CONTREPARTIE DES ENGAGEMENTS OBTENUS, 901 à 904
+		</field>
+		<field name="code">911</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_91" />
+	</record>
+	<record id="pcg_912" model="account.account.template">
+		<field name="name">CONTREPARTIE DES ENGAGEMENTS OBTENUS, 901 à 904
+		</field>
+		<field name="code">912</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_91" />
+	</record>
+	<record id="pcg_913" model="account.account.template">
+		<field name="name">CONTREPARTIE DES ENGAGEMENTS OBTENUS, 901 à 904
+		</field>
+		<field name="code">913</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_91" />
+	</record>
+	<record id="pcg_914" model="account.account.template">
+		<field name="name">CONTREPARTIE DES ENGAGEMENTS OBTENUS, 901 à 904
+		</field>
+		<field name="code">914</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_91" />
+	</record>
+	<record id="pcg_915" model="account.account.template">
+		<field name="name">CONTREPARTIE DES ENGAGEMENTS ACCORDÉS, 905 à 908
+		</field>
+		<field name="code">915</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_91" />
+	</record>
+	<record id="pcg_916" model="account.account.template">
+		<field name="name">CONTREPARTIE DES ENGAGEMENTS ACCORDÉS, 905 à 908
+		</field>
+		<field name="code">916</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_91" />
+	</record>
+	<record id="pcg_917" model="account.account.template">
+		<field name="name">CONTREPARTIE DES ENGAGEMENTS ACCORDÉS, 905 à 908
+		</field>
+		<field name="code">917</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_91" />
+	</record>
+	<record id="pcg_918" model="account.account.template">
+		<field name="name">CONTREPARTIE DES ENGAGEMENTS ACCORDÉS, 905 à 908
+		</field>
+		<field name="code">918</field>
+		<field name="type">other</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_91" />
+	</record>
+	<record id="pcg_92" model="account.account.template">
+		<field name="name">COMPTES REFLECHIS</field>
+		<field name="code">92</field>
+		<field name="type">view</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_classe_9" />
+	</record>
+	<record id="pcg_93" model="account.account.template">
+		<field name="name">COMPTES DE RECLASSEMENTS</field>
+		<field name="code">93</field>
+		<field name="type">view</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_classe_9" />
+	</record>
+	<record id="pcg_94" model="account.account.template">
+		<field name="name">COMPTES DE COÛTS</field>
+		<field name="code">94</field>
+		<field name="type">view</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_classe_9" />
+	</record>
+	<record id="pcg_95" model="account.account.template">
+		<field name="name">COMPTES DE STOCKS</field>
+		<field name="code">95</field>
+		<field name="type">view</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_classe_9" />
+	</record>
+	<record id="pcg_96" model="account.account.template">
+		<field name="name">COMPTES D'ECARTS SUR COUTS PREETABLIS</field>
+		<field name="code">96</field>
+		<field name="type">view</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_classe_9" />
+	</record>
+	<record id="pcg_97" model="account.account.template">
+		<field name="name">COMPTES DE DIFFERENCES DE TRAITEMENT COMPTABLE
+		</field>
+		<field name="code">97</field>
+		<field name="type">view</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_classe_9" />
+	</record>
+	<record id="pcg_98" model="account.account.template">
+		<field name="name">COMPTES DE RESULTATS</field>
+		<field name="code">98</field>
+		<field name="type">view</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_classe_9" />
+	</record>
+	<record id="pcg_99" model="account.account.template">
+		<field name="name">COMPTES DE LIAISONS INTERNES</field>
+		<field name="code">99</field>
+		<field name="type">view</field>
+		<field name="user_type" ref="l10n_syscohada.account_type_special" />
+		<field name="parent_id" ref="pcg_classe_9" />
+	</record>
+        <!--
+	#
+	# SYSCOHADA : Définition de la devise de référence
+	# Auteur : BAAMTU Sénégal
+	# Version du fichier : 1.0 
+	# Date : 02/2010
+	# 
+	#
+	-->
+
+      <record id="base.CFA" model="res.currency">
+		<field name="name">XOF</field>
+		<field name="symbol">CFA</field>
+		<field name="rounding">1</field>
+		<field name="accuracy">4</field>
+	</record>
+	<record id="base.rateCFA" model="res.currency.rate">
+           <field name="rate">655.957</field>
+           <field name="currency_id" ref="base.CFA"/>
+           <field eval="time.strftime('%Y-01-01')" name="name"/>
+       </record>
+       	<!--
+	#
+	# SYSCOHADA : Définition des taux de TVA SYSCOHADA
+	# Auteur : BAAMTU Sénégal
+	# Version du fichier : 1.0 
+	# Date : 02/2010
+	# 
+	#
+	-->
+       <record model="account.tax.code.template" id="vat_syscohada_tax_root">
+		<field name="parent_id" eval="False"/>
+		<field name="name">Plan de Taxes SYSCOHADA</field>
+	</record>
+
+	<record id="syscohada_chart_template" model="account.chart.template">
+	    <field name="name">SYSCOHADA - Plan de compte</field>
+	    <field name="account_root_id" ref="pcg_0"/>
+	    <field name="tax_code_root_id" ref="vat_syscohada_tax_root"/>
+	    <field name="bank_account_view_id" ref="pcg_5211"/>
+	    <field name="property_account_receivable" ref="pcg_4111"/>
+	    <field name="property_account_payable" ref="pcg_4011"/>
+		<field name="property_account_expense_categ" ref="pcg_6011" /> 
+		<field name="property_account_income_categ" ref="pcg_7011" /> 
+	</record>	
+        
+    <record model="account.tax.code.template" id="tax_col_ht">
+      <field name="name">Base H.T. TVA collectée</field>
+      <field name="code">Base HT TVA collectée</field>
+      <field name="sign">1.00</field>
+      <field name="parent_id" ref="vat_syscohada_tax_root"/>
+    </record> 
+    <record model="account.tax.code.template" id="tax_col_18_ht">
+      <field name="name">Base H.T. 18.0%</field>
+      <field name="code">TVA collectée à 18.0% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_col_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_col">
+      <field name="name">TVA collectée</field>
+      <field name="code">TVA collectée</field>
+      <field name="sign">1.00</field>
+      <field name="parent_id" ref="vat_syscohada_tax_root"/>
+    </record> 
+    <record model="account.tax.code.template" id="tax_col_18">
+      <field name="name">TVA 18.0%</field>
+      <field name="code">TVA collectée à 18.0%</field>
+      <field name="parent_id" ref="tax_col"/>
+      <field name="sign">1.00</field>
+    </record>
+	
+    <record model="account.tax.code.template" id="tax_acq_ht">
+      <field name="name">Base H.T. TVA acquittée</field>
+      <field name="code">Base HT TVA acquittée</field>
+      <field name="sign">1.00</field>
+      <field name="parent_id" ref="vat_syscohada_tax_root"/>
+    </record> 
+    <record model="account.tax.code.template" id="tax_acq_18_ht">
+      <field name="name">Base H.T. 18.0%</field>
+      <field name="code">TVA acquittée à 18.0% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_acq_ht"/>
+      <field name="sign">1.00</field>
+    </record>	
+
+    <record model="account.tax.code.template" id="tax_acq">
+      <field name="name">TVA acquittée</field>
+      <field name="code">TVA acquittée</field>
+      <field name="sign">1.00</field>
+      <field name="parent_id" ref="vat_syscohada_tax_root"/>
+    </record> 
+    <record model="account.tax.code.template" id="tax_acq_18">
+      <field name="name">TVA 18.0%</field>
+      <field name="code">TVA acquittée à 18.0%</field>
+      <field name="parent_id" ref="tax_acq"/>
+      <field name="sign">1.00</field>
+    </record>	
+	
+	<record model="account.tax.template" id="tva_sale_18">
+		<field name="name">TVA 18% (vente)</field>
+		<field name="chart_template_id" ref="syscohada_chart_template"/>
+		<field name="amount" eval="0.18"/>
+		<field name="type">percent</field>
+		<field name="account_collected_id" ref="pcg_4441"/>
+		<field name="account_paid_id" ref="pcg_4449"/>
+		<field name="base_code_id" ref="tax_col_18_ht"/>
+		<field name="tax_code_id" ref="tax_col_18"/>
+		<field name="type_tax_use">sale</field>		
+		<field name="ref_base_code_id" ref="tax_col_18_ht"/>
+		<field name="ref_base_sign" eval="-1"/>
+		<field name="ref_tax_code_id" ref="tax_col_18"/>
+		<field name="ref_tax_sign" eval="-1"/>		
+	</record>
+	
+	
+	<record model="account.tax.template" id="tva_purchase_18">
+		<field name="name">TVA 18% (achat)</field>
+		<field name="chart_template_id" ref="syscohada_chart_template"/>
+		<field name="amount" eval="0.18"/>
+		<field name="type">percent</field>
+		<field name="type_tax_use">purchase</field>	
+		<field name="account_collected_id" ref="pcg_4441"/>
+		<field name="account_paid_id" ref="pcg_4449"/>
+		<field name="base_code_id" ref="tax_acq_18_ht"/>
+		<field name="tax_code_id" ref="tax_acq_18"/>
+		<field name="ref_base_code_id" ref="tax_acq_18_ht"/>
+		<field name="ref_base_sign" eval="-1"/>
+		<field name="ref_tax_code_id" ref="tax_acq_18"/>
+		<field name="ref_tax_sign" eval="-1"/>		
+	</record>	
+
+	<record model="account.tax.template" id="tva_exonere">
+		<field name="name">Exonéré de TVA</field>
+		<field name="chart_template_id" ref="syscohada_chart_template"/>
+		<field name="amount" eval="0"/>
+		<field name="type">none</field>
+	</record>
+</data></openerp>
diff --git a/addons/l10n_syscohada/l10n_syscohada_wizard.xml b/addons/l10n_syscohada/l10n_syscohada_wizard.xml
new file mode 100644
index 00000000000..84c0f68e0a4
--- /dev/null
+++ b/addons/l10n_syscohada/l10n_syscohada_wizard.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+	<record id="config_call_account_template_syscohada" model="ir.actions.todo">
+	        <field name="name">Generate Chart of Accounts from a Chart Template</field>
+	        <field name="note">Generate Chart of Accounts from a SYSCOHADA Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
+	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
+	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
+	        <field name="state">open</field>
+    	</record>
+    </data>
+</openerp>
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml
index 11d9afe8948..0f6f044503f 100644
--- a/addons/l10n_th/account_data.xml
+++ b/addons/l10n_th/account_data.xml
@@ -652,6 +652,7 @@
 This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
     <field name="action_id" ref="account.action_wizard_multi_chart"/>
     <field name="state">open</field>
+    <field name="category_id" ref="account.category_accounting_configuration"/>
 </record>
 
 </data>
diff --git a/addons/l10n_th/i18n/tr.po b/addons/l10n_th/i18n/tr.po
new file mode 100644
index 00000000000..fb1db0612bf
--- /dev/null
+++ b/addons/l10n_th/i18n/tr.po
@@ -0,0 +1,53 @@
+# Turkish 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-07 06:19+0000\n"
+"PO-Revision-Date: 2011-06-08 10:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: l10n_th
+#: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"This is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Bir Tablo Şablonundan bir Hesap Tablosu oluşturun. Firma adını girmeniz, "
+"hesaplarınızın ve banka hesaplarınızın kodlarının oluşturulması için rakam "
+"sayısını, yevmiyeleri oluşturmak için para birimini girmeniz istenecektir. "
+"Böylece sade bir hesap planı oluşturumuş olur.\n"
+"\t Bu sihirbaz, Mali Yönetim/Yapılandırma/Mali Muhasebe/Mali Hesaplar/Tablo "
+"Şablonundan Hesap planı Oluşturma menüsünden çalıştırılan sihirbaz ile "
+"aynıdır."
+
+#. module: l10n_th
+#: model:ir.module.module,shortdesc:l10n_th.module_meta_information
+msgid "Thailand - Thai Chart of Accounts"
+msgstr "Tayland - Genel hesap planı"
+
+#. module: l10n_th
+#: model:ir.module.module,description:l10n_th.module_meta_information
+msgid ""
+"\n"
+"Chart of accounts for Thailand.\n"
+"    "
+msgstr ""
+"\n"
+"Tayland için hesap tablolarını yönetmek için temel OpenERP modülü.\n"
+"    "
diff --git a/addons/l10n_uk/l10n_uk_wizard.xml b/addons/l10n_uk/l10n_uk_wizard.xml
index 63a56521bd8..e00fbd67add 100644
--- a/addons/l10n_uk/l10n_uk_wizard.xml
+++ b/addons/l10n_uk/l10n_uk_wizard.xml
@@ -8,7 +8,8 @@
     This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
             <field name="action_id" ref="account.action_wizard_multi_chart"/>
             <field name="state">open</field>
-            <field name="restart">onskip</field>
+            <field name="type">special</field>
+            <field name="category_id" ref="account.category_accounting_configuration"/>
         </record>
 
     </data>
diff --git a/addons/l10n_ve/i18n/tr.po b/addons/l10n_ve/i18n/tr.po
new file mode 100644
index 00000000000..0e5f9ddf28c
--- /dev/null
+++ b/addons/l10n_ve/i18n/tr.po
@@ -0,0 +1,62 @@
+# Turkish 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-07 06:21+0000\n"
+"PO-Revision-Date: 2011-06-08 10:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: l10n_ve
+#: model:ir.actions.todo,note:l10n_ve.config_call_account_template_ve_chart
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"This is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template.\n"
+"Genere el Plan de cuentas de una Plantilla de Carta. Le pedirán pasar el "
+"nombre de la compania, la plantilla de carta para seguir, el no. de digitos "
+"para generar el codigo para sus cuentas y cuenta Bancaria, dinero para crear "
+"Diarios. Asi, la copia pura de la carta la Plantilla es generada.\n"
+"Esto es el mismo wizard que corre de la Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template.\n"
+"            "
+msgstr ""
+"Bir Tablo Şablonundan bir Hesap Tablosu oluşturun. Firma adını girmeniz, "
+"hesaplarınızın ve banka hesaplarınızın kodlarının oluşturulması için rakam "
+"sayısını, yevmiyeleri oluşturmak için para birimini girmeniz istenecektir. "
+"Böylece sade bir hesap planı oluşturumuş olur.\n"
+"\t Bu sihirbaz, Mali Yönetim/Yapılandırma/Mali Muhasebe/Mali Hesaplar/Tablo "
+"Şablonundan Hesap planı Oluşturma menüsünden çalıştırılan sihirbaz ile "
+"aynıdır.\n"
+"            "
+
+#. module: l10n_ve
+#: model:ir.module.module,description:l10n_ve.module_meta_information
+msgid ""
+"\n"
+"This is the module to manage the accounting chart for Venezuela in Open "
+"ERP.\n"
+"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+msgstr ""
+"\n"
+"Venezuella için hesap tablolarını yönetmek için temel OpenERP modülü.\n"
+
+#. module: l10n_ve
+#: model:ir.module.module,shortdesc:l10n_ve.module_meta_information
+msgid "Venezuela -Chart of Account"
+msgstr "Venezuella - Hesap Planı"
diff --git a/addons/l10n_ve/l10n_chart_ve_wizard.xml b/addons/l10n_ve/l10n_chart_ve_wizard.xml
index 4d181d058ec..9b73902c7c9 100644
--- a/addons/l10n_ve/l10n_chart_ve_wizard.xml
+++ b/addons/l10n_ve/l10n_chart_ve_wizard.xml
@@ -11,6 +11,7 @@ Esto es el mismo wizard que corre de la Financial Management/Configuration/Finan
             </field>
 	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
 	        <field name="state">open</field>
+	        <field name="category_id" ref="account.category_accounting_configuration"/>
     	</record>
 
     </data>
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index e5317cd8a94..2384ebb26d1 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -49,6 +49,7 @@
         'lunch_view.xml',
         'lunch_report.xml',
         'report/report_lunch_order_view.xml',
+        'lunch_installer_view.xml'
     ],
     "demo_xml": ['lunch_demo.xml'],
     "test": ['test/test_lunch.yml', 'test/lunch_report.yml'],
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 1499dd4414e..771779310cb 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -45,7 +45,7 @@ class lunch_product(osv.osv):
     _columns = {
         'name': fields.char('Name', size=50, required=True),
         'category_id': fields.many2one('lunch.category', 'Category'),
-        'description': fields.char('Description', size=128, required=False),
+        'description': fields.text('Description', size=128, required=False),
         'price': fields.float('Price', digits=(16,2)),
         'active': fields.boolean('Active'),
     }
@@ -81,7 +81,7 @@ class lunch_cashbox(osv.osv):
     _columns = {
         'manager': fields.many2one('res.users', 'Manager'),
         'name': fields.char('Name', size=30, required=True, unique = True),
-        'sum_remain': fields.function(amount_available, method=True, string='Total Remaining'),
+        'sum_remain': fields.function(amount_available, string='Total Remaining'),
     }
 
 lunch_cashbox()
@@ -140,7 +140,7 @@ class lunch_order(osv.osv):
             states = {'draft':[('readonly', False)]}),
         'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ], \
             'State', readonly=True, select=True),
-        'price': fields.function(_price_get, method=True, string="Price"),
+        'price': fields.function(_price_get, string="Price"),
         'category': fields.many2one('lunch.category','Category'),
     }
 
diff --git a/addons/lunch/lunch_installer_view.xml b/addons/lunch/lunch_installer_view.xml
new file mode 100644
index 00000000000..94c9539062a
--- /dev/null
+++ b/addons/lunch/lunch_installer_view.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+ <record model="ir.actions.act_window" id="view_lunch_product_form_installer">
+           <field name="name">Define Your Lunch Products</field>
+           <field name="type">ir.actions.act_window</field>
+           <field name="res_model">lunch.product</field>
+           <field name="view_type">form</field>
+           <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="lunch.view_lunch_product_form"/>
+       </record>
+       
+       <record id="view_lunch_product_form_todo" model="ir.actions.todo">
+           <field name="action_id" ref="view_lunch_product_form_installer"/>
+           <field name="category_id" ref="base.category_tools_customization_config"/>
+           <field name="sequence">50</field>
+           <field name="type">normal</field>
+           <field name="state">skip</field>
+       </record>
+    </data>
+</openerp>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index a08603b6fa4..5c19c840b78 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -24,15 +24,19 @@
             <field name="model">lunch.order</field>
             <field name="arch" type="xml">
                 <form string="Order">
-                    <group colspan="2" col="4">
-                        <field name="user_id" select="1"/>
-                        <field name="date" select="1"/>
-                        <field name="product" select="1" on_change="onchange_product(product)"/>
-                        <field name="category"/>
-                        <field name="descript"/>
-                        <field name="price"/>
-                        <field name="cashmove"/>
+                    <field name="user_id" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="product" select="1" on_change="onchange_product(product)"/>
+                    <field name="category"/>
+                    <field name="descript"/>
+                    <field name="price"/>
+                    <field name="cashmove"/>
+                    <newline/>
+                   <separator string="" colspan="4"/>
+                    <group colspan="4" col="4">
                         <field name="state"/>
+                        <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" icon="gtk-ok" attrs="{'invisible':[('state','=','confirmed')]}"/>
+                        <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -187,7 +191,6 @@
                 <search string="Search CashMove">
                     <filter icon="terp-go-today" name="Today" string="Today" domain="[('create_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59'))]"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="user_cashmove"/>
                     <field name="create_date"/>
                     <newline/>
@@ -257,11 +260,18 @@
             <field name="model">lunch.product</field>
             <field name="arch" type="xml">
                 <form string="Products">
-                    <field name="name" select="1"/>
-                    <field name="category_id" widget="selection"/>
-                    <field name="description" />
-                    <field name="price" />
-                    <field name="active"/>
+                     <group col="6">
+                          <field name="name" select="1"/>
+                          <field name="category_id" widget="selection"/>
+                          <field name="price" />
+                     </group>
+                     <notebook colspan="4">
+                         <page string="General Information"> 
+                              <field name="active"/>
+                              <separator string="Description" colspan="4" />
+                              <field name="description" nolabel="1" colspan="4" />
+                          </page>
+                     </notebook>
                 </form>
             </field>
         </record>
@@ -276,7 +286,6 @@
                 <tree string="Products">
                     <field name="name"/>
                     <field name="category_id"/>
-                    <field name="description"/>
                     <field name="price"/>
                 </tree>
             </field>
@@ -292,7 +301,6 @@
                 <search string="Products">
                     <field name="name" />
                     <field name="category_id" widget="selection"/>
-                    <field name="description" />
                     <field name="price"/>
                 </search>
             </field>
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index e50f4ad222c..3377c98b0e7 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -30,11 +30,11 @@
            <field name="view_id" ref="view_lunch_order_cancel"/>
            <field name="target">new</field>
         </record>
-
+        
         <act_window id="action_lunch_order_cancel_values"
     		key2="client_action_multi" name="Cancel Order"
     		res_model="lunch.order.cancel" src_model="lunch.order"
-    		view_mode="form" target="new" view_type="form"/>
-
+     		view_mode="form" target="new" view_type="form"/>
+        
     </data>
 </openerp>
diff --git a/addons/mail_gateway/i18n/ca.po b/addons/mail_gateway/i18n/ca.po
index 00a30edc9ea..a669c061652 100644
--- a/addons/mail_gateway/i18n/ca.po
+++ b/addons/mail_gateway/i18n/ca.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-02-13 21:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-05-26 05:41+0000\n"
+"Last-Translator: cubells <vicent@vcubells.net>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-27 04:46+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
@@ -118,7 +118,7 @@ msgstr "Empresa"
 #: code:addons/mail_gateway/mail_gateway.py:250
 #, python-format
 msgid " wrote on %s:\n"
-msgstr ""
+msgstr " escrit el %s:\n"
 
 #. module: mail_gateway
 #: view:mailgate.message:0
@@ -291,7 +291,7 @@ msgstr "Cc"
 #: code:addons/mail_gateway/mail_gateway.py:254
 #, python-format
 msgid " on %s:\n"
-msgstr ""
+msgstr " el %s:\n"
 
 #. module: mail_gateway
 #: view:mailgate.message:0
diff --git a/addons/mail_gateway/i18n/fi.po b/addons/mail_gateway/i18n/fi.po
new file mode 100644
index 00000000000..fb05ccd2184
--- /dev/null
+++ b/addons/mail_gateway/i18n/fi.po
@@ -0,0 +1,360 @@
+# Finnish 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-06-20 10:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-21 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "Resurssi ID"
+
+#. 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 "Metodia ei ole toteutettu"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "Lähettäjä"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Avaa liitteet"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Viestin yksityiskohdat"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "Viestin ID"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "Viite id"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "Postiyhteyden historia"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Huomautus"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Ryhmittely.."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Virhe! Rekursiivisesti rinnastettuja jäseniä ei voi luoda."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "Viestin id sähköpostissa"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "Sähköpostin vastaanottajat"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Yksityiskohdat"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr "Sähöpostivälittäjän historia"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Sähköpostipalvelimen työkalut"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr "Sähköpostin seuraajat"
+
+#. 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 "Yhteistyökumppani"
+
+#. 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 "Kuvaus"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Vastaanottaja"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr "Viittaavat sähköpostit"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "Kopio viestistä vastaanottajille"
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "Sähköpostivälitysjärjstelmä"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Päiväys"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Objektin nimi"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Kumppanin Nimi"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr "sähköpostivälittäjän keskustelut"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Mahdollisuus"
+
+#. 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 "Sähköpostit"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Vaihe"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr " lisäsi huomautuksen "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "Sähköposti lähettäjältä"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Keskustelu"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "sähköpostivälittäjän viesti"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Viestit"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Vastuunalainen käyttäjä"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Muutettu mahdollisuudeksi"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Piilokopio"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "onko historiaa?"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Piilokopion vastaanottajat"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr "Postinvälittäjän viesti"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Historia"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Viitteet"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr "sähköpostivälittäjän keskustelu"
+
+#. 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 "Liitteet"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Avaa asiakirja"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "Sähköpostin yksityiskohdat"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "Kopio"
+
+#. 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 "Kuukausi"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Sähköpostin haku"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr "vastaanota"
+
+#. 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 "Tila muutettu : "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Näytä teksti"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Omistaja"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Vaihe muutettu : "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Viesti"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Aihe"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "Viestin ID sähköpostipalvelimella."
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " kirjoitti "
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index c67a2668192..4fa70484666 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -80,7 +80,7 @@ class mailgate_thread(osv.osv):
         for thread in self.browse(cr, uid, ids, context=context):
             l=[]
             for message in thread.message_ids:
-                l.append((message.user_id and message.user_id.email) or '')
+                l.append((message.user_id and message.user_id.user_email) or '')
                 l.append(message.email_from or '')
                 l.append(message.email_cc or '')
             res[thread.id] = l
@@ -281,7 +281,7 @@ class mailgate_message(osv.osv):
         'description': fields.text('Description', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', required=False),
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments', readonly=True),
-        'display_text': fields.function(_get_display_text, method=True, type='text', size="512", string='Display Text'),
+        'display_text': fields.function(_get_display_text, type='text', size="512", string='Display Text'),
     }
 
     def init(self, cr):
@@ -519,7 +519,7 @@ class mailgate_tool(osv.osv_memory):
                             body = content
                             has_plain_text = True
                 elif part.get_content_maintype() in ('application', 'image'):
-                    if filename :
+                    if filename and attach:
                         attachments[filename] = part.get_payload(decode=True)
                     else:
                         res = part.get_payload(decode=True)
diff --git a/addons/marketing/i18n/tr.po b/addons/marketing/i18n/tr.po
new file mode 100644
index 00000000000..8c77edf63be
--- /dev/null
+++ b/addons/marketing/i18n/tr.po
@@ -0,0 +1,122 @@
+# Turkish 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-06-09 18:18+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"Language-Team: Turkish <tr@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-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: marketing
+#: model:ir.module.module,description:marketing.module_meta_information
+msgid "Menu for Marketing"
+msgstr "Pazarlama Menüsü"
+
+#. module: marketing
+#: help:marketing.installer,marketing_campaign:0
+msgid ""
+"Helps you to manage marketing campaigns and automate actions and "
+"communication steps."
+msgstr ""
+"Pazarlama kampanyalarını yönetmenizi ve eylemleriniz ve iletişim adımlarının "
+"otomatize olmasını sağlar."
+
+#. module: marketing
+#: field:marketing.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Yapılandırma Gelişimi"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "title"
+msgstr "unvan"
+
+#. module: marketing
+#: field:marketing.installer,email_template:0
+msgid "Automated E-Mails"
+msgstr "Otomatize E-Postalar"
+
+#. module: marketing
+#: field:marketing.installer,config_logo:0
+msgid "Image"
+msgstr "Resim"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Configure Your Marketing Application"
+msgstr "Pazarlama Uygulamalarınızı Yapılandırın"
+
+#. module: marketing
+#: help:marketing.installer,email_template:0
+msgid ""
+"Helps you to design templates of emails and integrate them in your different "
+"processes."
+msgstr ""
+"Eposta şablonları tasarlamanızı sağlar ve onları farklı işlemlerinize "
+"entegre eder."
+
+#. module: marketing
+#: model:ir.model,name:marketing.model_marketing_installer
+msgid "marketing.installer"
+msgstr "pazarlama.kurucu"
+
+#. module: marketing
+#: model:ir.module.module,shortdesc:marketing.module_meta_information
+msgid "Marketing"
+msgstr "Pazarlama"
+
+#. module: marketing
+#: field:marketing.installer,crm_profiling:0
+msgid "Profiling Tools"
+msgstr "Profilleme Araçları"
+
+#. 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 ""
+"OpenERP, Pazarlama işlemlerinizi ve satışlarınızı daha iyi yönetebilmeniz "
+"için Eklenti sağlar. İlgi duyduklarınızı seçin."
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Marketing Application Configuration"
+msgstr "Pazarlama Uygulaması Yapılandırma"
+
+#. module: marketing
+#: model:ir.actions.act_window,name:marketing.action_marketing_installer
+msgid "Marketing Modules Installation"
+msgstr "Pazarlama Modülleri Kurulumu"
+
+#. module: marketing
+#: field:marketing.installer,marketing_campaign:0
+msgid "Marketing Campaigns"
+msgstr "Pazarlama Kampanyaları"
+
+#. module: marketing
+#: help:marketing.installer,crm_profiling:0
+msgid ""
+"Helps you to perform segmentation of partners and design segmentation "
+"questionnaires"
+msgstr ""
+"Paydaşlarınızı bölümlendirmenizi ve bölümleme sorgulamaları tasarlamınzı "
+"sağlar."
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Configure"
+msgstr "Yapılandır"
+
+#~ msgid "Marketing Applications Configuration"
+#~ msgstr "Pazarlama Uygulamaları Yapılandırması"
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index c6c8c6e6946..b4539cfef33 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -14,52 +14,20 @@
 
         <record id="view_marketing_installer" model="ir.ui.view">
             <field name="name">marketing.installer.view</field>
-            <field name="model">marketing.installer</field>
+            <field name="model">base.setup.installer</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_installer"/>
+            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
             <field name="arch" type="xml">
                 <data>
-                  <form position="attributes">
-                    <attribute name="string">Marketing Application Configuration</attribute>
-                  </form>
-                  <separator string="title" position="attributes">
-                    <attribute name="string">Configure Your Marketing Application</attribute>
-                  </separator>
-                  <xpath expr="//label[@string='description']"
-                         position="attributes">
-                    <attribute name="string">OpenERP provides Addons to better manage your sales and marketing processes. Select the ones you would be interested in.</attribute>
-                  </xpath>
-                 <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                       <attribute name='rowspan'>13</attribute>
-                       <attribute name='string'></attribute>
-                 </xpath>
-                  <xpath expr="//button[@string='Install Modules']" position="attributes">
-                            <attribute name="string">Configure</attribute>
-                  </xpath>
-                  <group colspan="8">
+                    <xpath expr="//group[@name='marketing']" position="replace">
+                        <newline/>
+                        <separator  string="Marketing Features" colspan="4" />
                         <field name="marketing_campaign" />
                         <field name="email_template" />
                         <field name="crm_profiling" />
-                  </group>
+                    </xpath>                   
                 </data>
             </field>
         </record>
-
-        <record id="action_marketing_installer" model="ir.actions.act_window">
-            <field name="name">Marketing Applications Configuration</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">marketing.installer</field>
-            <field name="view_id" ref="view_marketing_installer"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-        <record id="marketing_installer_todo" model="ir.actions.todo">
-            <field name="action_id" ref="action_marketing_installer"/>
-            <field name="sequence">3</field>
-            <field name="restart">always</field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/marketing/marketing_wizard.py b/addons/marketing/marketing_wizard.py
index a97d0ca16bc..cedba8151c9 100644
--- a/addons/marketing/marketing_wizard.py
+++ b/addons/marketing/marketing_wizard.py
@@ -22,8 +22,7 @@
 from osv import fields, osv
 
 class marketing_installer(osv.osv_memory):
-    _name = 'marketing.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
     _columns = {
         'email_template':fields.boolean('Automated E-Mails',
             help="Helps you to design templates of emails and integrate them in your different processes."),
diff --git a/addons/marketing_campaign/i18n/zh_CN.po b/addons/marketing_campaign/i18n/zh_CN.po
new file mode 100644
index 00000000000..95aafae0f40
--- /dev/null
+++ b/addons/marketing_campaign/i18n/zh_CN.po
@@ -0,0 +1,1054 @@
+# Chinese (Simplified) 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-07-01 03:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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-07-02 05:06+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Manual Mode"
+msgstr "手工模式"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_from_id:0
+msgid "Previous Activity"
+msgstr "前一个活动"
+
+#. 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 "时间"
+
+#. 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 "营销活动无法开始：没有为邮件活动'%s'设置邮箱帐号"
+
+#. 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 "分组..."
+
+#. 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 ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,count:0
+msgid "# of Actions"
+msgstr ""
+
+#. 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 ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "March"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,to_ids:0
+msgid "Next Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronization"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "This Year"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:772
+#, python-format
+msgid "No preview"
+msgstr ""
+
+#. 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 ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Outgoing Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Reset"
+msgstr ""
+
+#. 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 ""
+
+#. 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 15c86f5298e..ae1ab2309e2 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -281,7 +281,7 @@ class marketing_campaign_segment(osv.osv):
                                    'State',),
         'date_run': fields.datetime('Launch Date', help="Initial start date of this segment."),
         'date_done': fields.datetime('End Date', help="Date this segment was last closed or cancelled."),
-        'date_next_sync': fields.function(_get_next_sync, method=True, string='Next Synchronization', type='datetime', help="Next time the synchronization job is scheduled to run automatically"),
+        'date_next_sync': fields.function(_get_next_sync, string='Next Synchronization', type='datetime', help="Next time the synchronization job is scheduled to run automatically"),
     }
 
     _defaults = {
@@ -548,7 +548,7 @@ class marketing_campaign_transition(osv.osv):
 
 
     _columns = {
-        'name': fields.function(_get_name, method=True, string='Name',
+        'name': fields.function(_get_name, string='Name',
                                 type='char', size=128),
         'activity_from_id': fields.many2one('marketing.campaign.activity',
                                             'Previous Activity', select=1,
@@ -649,7 +649,7 @@ class marketing_campaign_workitem(osv.osv):
         'object_id': fields.related('activity_id', 'campaign_id', 'object_id',
              type='many2one', relation='ir.model', string='Resource', select=1, readonly=True, store=True),
         'res_id': fields.integer('Resource ID', select=1, readonly=True),
-        'res_name': fields.function(_res_name_get, method=True, string='Resource Name', fnct_search=_resource_search, type="char", size=64),
+        'res_name': fields.function(_res_name_get, string='Resource Name', fnct_search=_resource_search, type="char", size=64),
         'date': fields.datetime('Execution Date', help='If date is not set, this workitem has to be run manually', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', select=1, readonly=True),
         'state': fields.selection([('todo', 'To Do'),
diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py
index 0b245aee785..af04a7e6dff 100644
--- a/addons/marketing_campaign/report/campaign_analysis.py
+++ b/addons/marketing_campaign/report/campaign_analysis.py
@@ -62,7 +62,7 @@ class campaign_analysis(osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
         'country_id': fields.related('partner_id','address', 'country_id',
                     type='many2one', relation='res.country',string='Country'),
-        'total_cost' : fields.function(_total_cost, string='Cost', method=True,
+        'total_cost' : fields.function(_total_cost, string='Cost',
                                     type="float", digits_compute=dp.get_precision('Purchase Price')),
         'revenue': fields.float('Revenue', readonly=True, digits_compute=dp.get_precision('Sale Price')),
         'count' : fields.integer('# of Actions', readonly=True),
diff --git a/addons/marketing_campaign_crm_demo/i18n/zh_CN.po b/addons/marketing_campaign_crm_demo/i18n/zh_CN.po
new file mode 100644
index 00000000000..7723b72fe43
--- /dev/null
+++ b/addons/marketing_campaign_crm_demo/i18n/zh_CN.po
@@ -0,0 +1,179 @@
+# Chinese (Simplified) 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-06-29 16:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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-06-30 04:34+0000\n"
+"X-Generator: Launchpad (build 13168)\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 "你好，感谢你对OpenERP很感兴趣。 OpenERP团队敬上。"
+
+#. 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 "模块marketing_campaign的演示数据。"
+
+#. 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 ""
+"你好，感谢你喜欢和购买OpenERP的书。\n"
+"            如果需要进一步的消息，请告诉我们。\n"
+"             欢迎垂询进一步的信息。\n"
+"  敬上！\n"
+"                                      OpenERP团队"
+
+#. 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 "推荐订购2010年5月的OpenERP 发现日 （OpenERP Discovery Day）"
+
+#. 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 "感谢您喜欢OpenERP"
+
+#. 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 "感谢您购买OpenERP book"
+
+#. 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 ""
+"您好，我们有一些很好的服务可能很适合您。\n"
+"           对于我们的银牌合作伙伴，我们提供金牌合作伙伴的服务。\n"
+"           欢迎垂询进一步的信息。\n"
+"\n"
+"    敬上！\n"
+"                                        OpenERP团队"
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Partner :"
+msgstr "合作伙伴："
+
+#. 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 ""
+"您好， 感谢您有兴趣订购技术培训课程。欢迎垂询进一步的信息。我衷心的感谢您的合作。\n"
+"            OpenERP团队敬上。"
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Company :"
+msgstr "公司："
+
+#. 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 "感谢您订购OpenERP发现日（OpenERP Discovery Day）"
+
+#. 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/membership/membership.py b/addons/membership/membership.py
index 48fd8dc2d41..6384a255ac3 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -149,7 +149,7 @@ class membership_line(osv.osv):
         'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True,  help='Amount for the membership'),
         'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
         'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True),
-        'state': fields.function(_state, method=True,
+        'state': fields.function(_state,
                         string='Membership State', type='selection',
                         selection=STATE, store = {
                         'account.invoice': (_get_membership_lines, ['state'], 10),
@@ -322,7 +322,7 @@ class Partner(osv.osv):
                     'Membership amount', digits=(16, 2),
                     help = 'The price negotiated by the partner'),
         'membership_state': fields.function(
-                    __get_membership_state, method=True,
+                    __get_membership_state,
                     string = 'Current Membership State', type = 'selection',
                     selection = STATE,
                     store = {
@@ -337,7 +337,7 @@ class Partner(osv.osv):
                     -Invoiced Member: A member whose invoice has been created.
                     -Paid Member: A member who has paid the membership amount."""),
         'membership_start': fields.function(
-                    _membership_date, method=True, multi = 'membeship_start',
+                    _membership_date, multi = 'membeship_start',
                     string = 'Start membership date', type = 'date',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
@@ -345,7 +345,7 @@ class Partner(osv.osv):
                         'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
                     }, help="Date from which membership becomes active."),
         'membership_stop': fields.function(
-                    _membership_date, method=True,
+                    _membership_date,
                     string = 'Stop membership date', type='date', multi='membership_stop',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
@@ -353,7 +353,7 @@ class Partner(osv.osv):
                         'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
                     }, help="Date until which membership remains active."),
         'membership_cancel': fields.function(
-                    _membership_date, method=True,
+                    _membership_date,
                     string = 'Cancel membership date', type='date', multi='membership_cancel',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 11),
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index af2377790b0..fe37da84f0d 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.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-18 14:07+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2011-05-24 16:08+0000\n"
+"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-25 04:38+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: mrp
 #: field:mrp.bom,product_uos:0
@@ -776,7 +776,7 @@ msgid "Per month"
 msgstr "Par mois"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -789,7 +789,7 @@ msgid "Product Name"
 msgstr "Nom du Produit"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "Action non valide !"
@@ -1395,7 +1395,7 @@ msgid "Month -1"
 msgstr "Mois -1"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr "Ordre de production '%s' est planifié pour le  %s."
@@ -1406,7 +1406,7 @@ msgid "Production Order N° :"
 msgstr "Ordre de Production N° :"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr "L'ordre de production '%s' est pret a être produit."
@@ -1649,7 +1649,7 @@ msgid "Manufacturing Orders To Start"
 msgstr "Ordres de fabrication à lancer"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr "Impossible de supprimer l'ordre de production à l'état %s !"
@@ -1728,7 +1728,7 @@ msgid "Production Analysis"
 msgstr "Analyse de la production"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr "Copier"
@@ -2256,7 +2256,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr "Le type produit est stockable ou consommable."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -2283,6 +2283,9 @@ msgid ""
 "Routing is indicated then,the third tab of a production order (Work Centers) "
 "will be automatically pre-completed."
 msgstr ""
+"Une gamme présente tous les postes de charge utilisés, en temps et/ou en "
+"cycles. Si une gamme est initialisée, la table des ordres de fabrication "
+"(postes de charge) sera automatiquement pré-remplie."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom_revision
diff --git a/addons/mrp/i18n/gl.po b/addons/mrp/i18n/gl.po
new file mode 100644
index 00000000000..5799fdeae1c
--- /dev/null
+++ b/addons/mrp/i18n/gl.po
@@ -0,0 +1,2550 @@
+# Galician 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-06-09 15:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@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-06-10 04:36+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: mrp
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Movementos creados"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action
+msgid ""
+"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."
+msgstr ""
+"OpenERP adoita propoñer automaticamente as ordes de fabricación segundo a "
+"lista de materiais e as regras de abastecemento, pero vostede tamén pode "
+"crear ordes de fabricación manualmente. OpenERP controlará o consumo das "
+"materias primas (diminución de stock) e a produción dos produtos terminados "
+"(aumento de stock) cando se procese a orde."
+
+#. module: mrp
+#: help:mrp.production,location_src_id:0
+msgid "Location where the system will look for components."
+msgstr "Lugar onde o sistema buscará os compoñentes."
+
+#. module: mrp
+#: field:mrp.production,workcenter_lines:0
+msgid "Work Centers Utilisation"
+msgstr "Utilización do centro de produción"
+
+#. module: mrp
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr "Ruta de centros de produción"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:mrp.module_meta_information
+msgid "Manufacturing Resource Planning"
+msgstr "Planificación de recursos de fabricación (MRP)"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "No. Of Cycles"
+msgstr "Nº de ciclos"
+
+#. module: mrp
+#: field:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of Cycles"
+msgstr "Número de ciclos"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_minimumstockprocure0
+msgid ""
+"The 'Minimum stock rule' allows the system to create procurement orders "
+"automatically as soon as the minimum stock is reached."
+msgstr ""
+"A 'regra de stock mínimo' permite ó sistema crear ordes de abastecemento "
+"automaticamente cando se acade o stock mínimo"
+
+#. module: mrp
+#: field:mrp.production,picking_id:0
+#: field:mrp.production.order,picking_id:0
+msgid "Picking list"
+msgstr "Albará"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:121
+#, python-format
+msgid "Hourly Cost"
+msgstr "Custo horario"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Cost Price per Uom"
+msgstr "Prezo de custo pour Udm"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Scrap Products"
+msgstr "Produtos de refugallo"
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:mrp.production.order,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_routing_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
+msgid "Routings"
+msgstr "Procesos produtivos"
+
+#. module: mrp
+#: field:mrp.workcenter,product_id:0
+msgid "Work Center Product"
+msgstr "Produto do centro de produción"
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Search Bill Of Material"
+msgstr "Buscar lista de materiais"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct1
+msgid "For stockable products and consumables"
+msgstr "Para produtos almacenables e consumibles"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_stockproduction0
+msgid "To Produce"
+msgstr "A producir"
+
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid ""
+"Number of iterations this work center has to do in the specified operation "
+"of the routing."
+msgstr ""
+"Número de repeticións que debe realizar este centro de produción na "
+"operación indicada da ruta."
+
+#. module: mrp
+#: view:mrp.bom:0
+#: field:mrp.bom,code:0
+#: view:mrp.production:0
+#: field:mrp.production,name:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Finished Products"
+msgstr "Produtos rematados"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_servicerfq0
+#: model:process.transition,name:mrp.process_transition_stockrfq0
+msgid "To Buy"
+msgstr "Mercar"
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "Raw Material Location"
+msgstr "Situación das materias primas"
+
+#. module: mrp
+#: help:mrp.installer,mrp_operations:0
+msgid ""
+"Enhances production orders with readiness states as well as the start date "
+"and end date of execution of the order."
+msgstr ""
+"Mellora as ordes de produción cos estados de preparación, así como a data de "
+"inicio e final da execución da orde."
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_purchaseprocure0
+msgid "The system launches automatically a RFQ to the preferred supplier."
+msgstr ""
+"O sistema crea automaticamente unha petición de presuposto ó provedor "
+"preferido."
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Products to Finish"
+msgstr "Produtos a rematar"
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "Set / Pack"
+msgstr "Conxunto / Paquete"
+
+#. module: mrp
+#: field:mrp.installer,mrp_subproduct:0
+msgid "MRP Subproducts"
+msgstr "Subprodutos MRP"
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,state:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour:0
+msgid "Cost per hour"
+msgstr "Custo por hora"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduction0
+msgid ""
+"In case the Supply method of the product is Produce, the system creates a "
+"production order."
+msgstr ""
+"En caso de que o método de subministración do produto sexa Producir, o "
+"sistema crea unha orde de produción."
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "UOM"
+msgstr "UdM"
+
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr "Cantidade produto"
+
+#. module: mrp
+#: help:mrp.workcenter,product_id:0
+msgid ""
+"Fill this product to track easily your production costs in the analytic "
+"accounting."
+msgstr ""
+"Introduza este produto para realizar de xeito doado un seguimento dos seus "
+"custos de produción na contabilidade analítica."
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_purchaseprocure0
+msgid "For purchased material"
+msgstr "Para material mercado"
+
+#. module: mrp
+#: field:mrp.bom.revision,indice:0
+msgid "Revision"
+msgstr "Revisión"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Informe"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle_account_id:0
+msgid "Cycle Account"
+msgstr "Conta ciclo"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:121
+#, python-format
+msgid "Work Cost"
+msgstr "Custo do traballo"
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "["
+msgstr "["
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procureserviceproduct0
+msgid "Procurement of services"
+msgstr "Abastecemento de servizos"
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Capacity Information"
+msgstr "Información de capacidade"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Destination Location"
+msgstr "Lugar destino"
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom
+msgid "Master Data"
+msgstr "Datos principais"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockmts0
+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 ""
+"O sistema agarda a que os produtos estean dispoñibles no stock. Estes "
+"produtos adoitan ser adquiridos de xeito manual ou a través dunha regra de "
+"stock mínimo."
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Partner Ref"
+msgstr "Ref. empresa"
+
+#. module: mrp
+#: selection:mrp.workcenter.load,measure_unit:0
+msgid "Amount in hours"
+msgstr "Cantidade en horas"
+
+#. module: mrp
+#: field:mrp.production,product_lines:0
+msgid "Scheduled goods"
+msgstr "Bens planificados"
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Sets / Phantom"
+msgstr "Conxuntos / Pantasma"
+
+#. module: mrp
+#: help:mrp.bom,position:0
+msgid "Reference to a position in an external plan."
+msgstr "Referencia a un lugar nun plan externo"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Tenta asignar un lote que non pertence ó mesmo produto."
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_order
+msgid "Production Order Report"
+msgstr "Informe de orde de produción"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "June"
+msgstr "Xuño"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_product_produce
+msgid "Product Produce"
+msgstr "Producir produto"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:177
+#, python-format
+msgid "Components Cost of "
+msgstr "Custo dos compoñentes de "
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procurestockableproduct0
+msgid "Procurement of stockable Product"
+msgstr "Abastecemento de produto almacenable"
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Default UOM"
+msgstr "UdM por defecto"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#: report:bom.structure:0
+#: field:mrp.product_price,number:0
+#: report:mrp.production.order:0
+#, python-format
+msgid "Quantity"
+msgstr "Cantidade"
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,hour:0
+msgid "Nbr of hours"
+msgstr "Nº de horas"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Confirm Production"
+msgstr "Confirmar produción"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduct0
+msgid ""
+"The system creates an order (production or purchased) depending on the sold "
+"quantity and the products parameters."
+msgstr ""
+"O sistema crea unha orde (de produción ou de compra) en función da cantidade "
+"vendida e dos parámetros dos produtos."
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemts0
+msgid ""
+"This is used in case of a service without any impact in the system, a "
+"training session for instance."
+msgstr ""
+"Utilízase isto en caso dun servizo sen ningún tipo de impacto no sistema, "
+"unha sesión de formación, por exemplo."
+
+#. module: mrp
+#: field:mrp.installer,mrp_repair:0
+msgid "Repairs"
+msgstr "Reparacións"
+
+#. module: mrp
+#: field:mrp.installer,stock_location:0
+msgid "Advanced Routes"
+msgstr "Rutas avanzadas"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
+msgid "Working Time"
+msgstr "Horario de traballo"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+msgid "Weekly Stock Value Variation"
+msgstr "Variación do valor do stock semanal"
+
+#. module: mrp
+#: help:mrp.installer,mrp_repair:0
+msgid ""
+"Enables warranty and repair management (and their impact on stocks and "
+"invoicing)."
+msgstr ""
+"Activa a garantía e a xestión das reparacións (e o seu impacto sobre os "
+"stocks e a facturación)"
+
+#. module: mrp
+#: field:mrp.production,date_planned_date:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,date_planned:0
+msgid "Scheduled Date"
+msgstr "Data planificada"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Bill Of Material"
+msgstr "Lista de Material"
+
+#. module: mrp
+#: help:mrp.routing,location_id:0
+msgid ""
+"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."
+msgstr ""
+"Deixar baleiro se se produce no mesmo lugar onde os produtos acabados son "
+"necesarios. Indique un lugar, se se produce nun lugar fixo. Pode ser un "
+"lugar doutra empresa se subcontrata as operacións de fabricación."
+
+#. module: mrp
+#: view:board.board:0
+msgid "Stock Value Variation"
+msgstr "Variación do valor de stock"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action2
+msgid "Bill of Materials Structure"
+msgstr "Estrutura lista de materiais"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_serviceproduct0
+msgid "Product type is service"
+msgstr "Produto de tipo servizo"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bill of materials."
+msgstr ""
+"Definir os grupos específicos de propiedade que se poden asignar ás "
+"propiedades da súa lista de materiais."
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_bom0
+msgid "Manufacturing decomposition"
+msgstr "Descomposición fabricación"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_serviceproduct1
+msgid "For Services."
+msgstr "Para servizos"
+
+#. module: mrp
+#: field:mrp.bom.revision,date:0
+msgid "Modification Date"
+msgstr "Data de modificación"
+
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle_account_id:0
+#: help:mrp.workcenter,costs_hour_account_id:0
+msgid ""
+"Complete this only if you want automatic analytic accounting entries on "
+"production orders."
+msgstr ""
+"Énchao só se desexa crear entradas automáticas de contabilidade analítica "
+"segundo as ordes de produción."
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,cycle:0
+msgid "Nbr of cycles"
+msgstr "Nº de ciclos"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_orderrfq0
+#: model:process.node,note:mrp.process_node_rfq0
+msgid "Request for Quotation."
+msgstr "Solicitude de orzamento."
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
+msgid ""
+"The Bill of Material is linked to a routing, i.e. the succession of work "
+"centers."
+msgstr ""
+"A lista de materiais está vinculada a unha ruta, esto é, a sucesión de "
+"centros de produción."
+
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Erro: Código EAN non válido"
+
+#. module: mrp
+#: view:mrp.routing:0
+#: field:mrp.routing,location_id:0
+msgid "Production Location"
+msgstr "Lugar de produción"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Change Qty"
+msgstr "Cambiar Ctd."
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Force Reservation"
+msgstr "Forzar reservas"
+
+#. module: mrp
+#: field:mrp.bom.revision,author_id:0
+msgid "Author"
+msgstr "Autor"
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Valor do stock"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_product_bom_structure
+msgid "Product BoM Structure"
+msgstr "Estrutura LdM do produto"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Search Production"
+msgstr "Buscar produción"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Supplier Price per Uom"
+msgstr "Prezo provedor por UdM"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: mrp
+#: field:mrp.bom,child_complete_ids:0
+msgid "BoM Hierarchy"
+msgstr "Estrutura LdM"
+
+#. 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 "Producir"
+
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle:0
+msgid "Specify Cost of Work Center per cycle."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+msgid "Picking Exception"
+msgstr "Excepción albará"
+
+#. module: mrp
+#: field:mrp.bom,bom_lines:0
+msgid "BoM Lines"
+msgstr "Liñas das listas de materiais"
+
+#. module: mrp
+#: field:mrp.workcenter,time_start:0
+msgid "Time before prod."
+msgstr "Tempo antes produción"
+
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr "Se se desmarca o campo activo, permite ocultar a ruta sen eliminala."
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
+msgid "Material Routing"
+msgstr "Ruta do material"
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,move_lines2:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,consumed_products:0
+msgid "Consumed Products"
+msgstr "Produtos consumidos"
+
+#. module: mrp
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr "Erro! Non pode crear Listas de Material recorrentes."
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
+#: model:ir.model,name:mrp.model_mrp_workcenter_load
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Work Center Load"
+msgstr "Carga centro de produción"
+
+#. module: mrp
+#: code:addons/mrp/procurement.py:45
+#, python-format
+msgid "No BoM defined for this product !"
+msgstr "Non se definiu LdM para este produto!"
+
+#. module: mrp
+#: 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 "Compoñentes da lista de materiais"
+
+#. module: mrp
+#: field:mrp.production.order,nbr:0
+msgid "# of Lines"
+msgstr "Nº de liñas"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_planning
+msgid "Planning"
+msgstr "Planificación"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Ready"
+msgstr "Preparado"
+
+#. module: mrp
+#: help:mrp.production,routing_id:0
+msgid ""
+"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."
+msgstr ""
+"Lista das operacións (lista dos centros de traballo) para producir os "
+"produtos acabados. Utilízase a ruta principalmente para calcular os custos "
+"do centro de traballo durante as operacións e planificar a carga no futuro "
+"nos centros de traballo baseada na planificación da produción."
+
+#. module: mrp
+#: help:mrp.workcenter,time_cycle:0
+msgid "Time in hours for doing one cycle."
+msgstr "Tempo en horas para realizar un ciclo."
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "BOM Ref"
+msgstr "Ref LdM"
+
+#. module: mrp
+#: view:mrp.production:0
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+msgid "In Production"
+msgstr "En produción"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_property
+msgid "Master Bill of Materials"
+msgstr "Lista mestra de materiais"
+
+#. module: mrp
+#: help:mrp.bom,product_uos:0
+msgid ""
+"Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
+"promotion of stock."
+msgstr ""
+"UdV do produto (Unidade de Venda) é a unidade de medida para a facturación e "
+"a promoción de existencias."
+
+#. module: mrp
+#: view:mrp.product_price:0
+#: view:mrp.workcenter.load:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.workcenter:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:150
+#: code:addons/mrp/report/price.py:201
+#, python-format
+msgid "Total Cost of "
+msgstr "Custo total de "
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_minimumstockrule0
+msgid "Linked to the 'Minimum stock rule' supplying method."
+msgstr "Vinculado ó método de abastecemento 'Regra de stock mínimo'."
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Per month"
+msgstr "Por mes"
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:595
+#: code:addons/mrp/wizard/change_production_qty.py:77
+#: code:addons/mrp/wizard/change_production_qty.py:82
+#, python-format
+msgid "Couldn't find bill of material for product"
+msgstr "Non se puido atopar a lista de materiais para o produto"
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "Product Name"
+msgstr "Nome produto"
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:495
+#, python-format
+msgid "Invalid action !"
+msgstr "Acción non válida!"
+
+#. module: mrp
+#: help:mrp.bom,product_efficiency:0
+msgid "A factor of 0.9 means a loss of 10% within the production process."
+msgstr "Un factor de 0,9 indica unha perda do 10% no proceso de produción."
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid ""
+"Add more functionalities to the core Manufacturing Application with the "
+"following addons."
+msgstr ""
+"Engada máis funcionalidades no núcleo da aplicación de fabricación cos "
+"seguintes módulos."
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Printing date"
+msgstr "Data de impresión"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_orderrfq0
+#: model:process.node,name:mrp.process_node_rfq0
+msgid "RFQ"
+msgstr "Petición orzamento"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_producttostockrules0
+msgid "Procurement rule"
+msgstr "Regra de abastecemento"
+
+#. module: mrp
+#: help:mrp.workcenter,costs_hour:0
+msgid "Specify Cost of Work center per hour."
+msgstr "Especificar os custos do centro de traballo por hora."
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Partial"
+msgstr "Parcial"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "WorkCenter"
+msgstr "Centro de produción"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procureserviceproduct0
+msgid ""
+"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)."
+msgstr ""
+"Dependendo do método elixido para \"subministrar\" o servizo, a orde de "
+"abastecemento crea unha solicitude de orzamento para un pedido de compra "
+"(subcontratación) ou agarda ata que se realice o servizo (= a entrega dos "
+"produtos)."
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Urgent"
+msgstr "Urxente"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing_workcenter
+msgid "Work Center Usage"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Orde de fabricación"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
+msgid "Procurement of raw material"
+msgstr "Abastecemento de materias primas"
+
+#. module: mrp
+#: help:mrp.routing.workcenter,hour_nbr:0
+msgid ""
+"Time in hours for this work center to achieve the operation of the specified "
+"routing."
+msgstr ""
+"Tempo en horas para este centro de produción para realizar a operación da "
+"ruta indicada."
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,cycle_total:0
+msgid "Total Cycles"
+msgstr "Ciclos totais"
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+msgid "Ready to Produce"
+msgstr "Listo para producir"
+
+#. module: mrp
+#: field:mrp.bom.revision,name:0
+msgid "Modification name"
+msgstr "Nome da modificación"
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.production:0
+#: field:mrp.production.order,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: mrp
+#: field:mrp.bom,type:0
+msgid "BoM Type"
+msgstr "Tipo de lista de materiais"
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: mrp
+#: code:addons/mrp/procurement.py:47
+#, python-format
+msgid ""
+"Procurement '%s' has an exception: 'No BoM defined for this product !'"
+msgstr ""
+"Abastecemento '%s' ten unha excepción: 'O produto non ten LdM definida!'"
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: view:mrp.property:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: mrp
+#: field:report.workcenter.load,cycle:0
+msgid "Nbr of cycle"
+msgstr "Nº de ciclo"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_minimumstockrule0
+#: model:process.node,name:mrp.process_node_productminimumstockrule0
+msgid "Minimum Stock"
+msgstr "Stock mínimo"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menus_dash_mrp
+msgid "Dashboard"
+msgstr "Panel de control"
+
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr "Carga futura do centro de produción"
+
+#. 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 "Produto almacenable"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:121
+#, python-format
+msgid "Work Center name"
+msgstr "Nome do centro de produción"
+
+#. module: mrp
+#: field:mrp.routing,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "No. Of Hours"
+msgstr "Nº de horas"
+
+#. module: mrp
+#: field:mrp.installer,mrp_jit:0
+msgid "Just In Time Scheduling"
+msgstr "Planificación 'Just in Time'"
+
+#. module: mrp
+#: view:mrp.property:0
+#: view:mrp.property.group:0
+msgid "Property Group"
+msgstr "Grupo de propiedade"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Qty"
+msgstr "Ctd."
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_production0
+msgid "Manufacturing Plan."
+msgstr "Plan de produción"
+
+#. module: mrp
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Inactive"
+msgstr "Inactivo"
+
+#. module: mrp
+#: help:mrp.installer,mrp_subproduct:0
+msgid ""
+"Enables multiple product output from a single production order: without "
+"this, a production order can have only one output product."
+msgstr ""
+"Activa a saída de múltiples produtos dunha soa orde de produción: sen isto, "
+"unha orde de produción só pode ter un produto de saída."
+
+#. module: mrp
+#: view:change.production.qty:0
+#: view:mrp.product.produce:0
+#: view:mrp.product_price:0
+#: view:mrp.production:0
+#: view:mrp.workcenter.load:0
+msgid "Cancel"
+msgstr "Anular"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Split in production lots"
+msgstr "Dividir en lotes de produción"
+
+#. module: mrp
+#: help:mrp.workcenter,capacity_per_cycle:0
+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 ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicerfq0
+msgid ""
+"If the service has a 'Buy' supply method, this creates a RFQ, a "
+"subcontracting demand for instance."
+msgstr ""
+"Se o servizo ten un método de subministración 'Mercar', créase unha "
+"solicitude de orzamento, por exemplo, unha petición de subcontratación."
+
+#. module: mrp
+#: field:mrp.production,move_prod_id:0
+msgid "Move product"
+msgstr "Mover produto"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Late"
+msgstr "Atrasado"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_servicemts0
+msgid "Make to stock"
+msgstr "Obter para stock"
+
+#. module: mrp
+#: help:mrp.routing.workcenter,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of routing work centers."
+msgstr ""
+"Proporciona a orde de secuencias cando se amosa unha lista de encamiñamento "
+"dos centros de traballo."
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "BOM Name"
+msgstr "Nome LdM"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Start Production"
+msgstr "Comezar produción"
+
+#. 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 "Taboleiro de produción"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Source Loc."
+msgstr "Lugar orixe"
+
+#. module: mrp
+#: field:mrp.bom,position:0
+msgid "Internal Reference"
+msgstr "Referencia interna"
+
+#. module: mrp
+#: help:mrp.installer,stock_location:0
+msgid ""
+"Manages product routes and paths within and between locations (e.g. "
+"warehouses)."
+msgstr ""
+"Xestiona as rutas e camiños dos produtos dentro e entre os lugares (por "
+"exemplo, almacéns)."
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_billofmaterial0
+msgid "Product's structure"
+msgstr "Estrutura de produto"
+
+#. module: mrp
+#: field:mrp.bom,name:0
+#: report:mrp.production.order:0
+#: field:mrp.production.product.line,name:0
+#: field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid "MRP Application Configuration"
+msgstr "Configuración aplicación MRP"
+
+#. module: mrp
+#: help:mrp.installer,mrp_jit:0
+msgid ""
+"Enables Just In Time computation of procurement orders.\n"
+"\n"
+"While it's more resource intensive than the default setup, the JIT computer "
+"avoids having to wait for the procurement scheduler to run or having to run "
+"the procurement scheduler manually."
+msgstr ""
+"Permite o cálculo das ordes de abastecemento xusto a tempo (Just In Time). "
+"Aínda que consume máis recursos que a configuración predeterminada, o "
+"cálculo JIT evita ter que agardar a que se execute o planificador de "
+"abastecementos ou ter que executar o planificador de abastecementos de xeito "
+"manual."
+
+#. module: mrp
+#: field:mrp.product.produce,mode:0
+msgid "Mode"
+msgstr "Modo"
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "]"
+msgstr "]"
+
+#. module: mrp
+#: field:mrp.workcenter.load,measure_unit:0
+msgid "Amount measuring unit"
+msgstr "Importe unidade de medida"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"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."
+msgstr ""
+"As ordes de fabricación describen as operacións que se deben realizar e as "
+"materias primas necesarias para cada etapa de fabricación. Utilice as "
+"especificacións (as listas de materiais ou LdM) para obter as necesidades de "
+"materias primas e as ordes de fabricación necesarias para os produtos "
+"finais. Cando se definan as listas de materiais, OpenERP é capaz de decidir "
+"automaticamente a ruta de fabricación en función das necesidades da compañía."
+
+#. module: mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "A cantidade do pedido non pode ser negativa ou cero!"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action3
+msgid "Manufacturing Orders in Progress"
+msgstr "Ordes de produción en curso"
+
+#. module: mrp
+#: model:ir.module.module,description:mrp.module_meta_information
+msgid ""
+"\n"
+"    This is the base module to manage the manufacturing process in OpenERP.\n"
+"\n"
+"    Features:\n"
+"    * Make to Stock / Make to Order (by line)\n"
+"    * Multi-level BoMs, no limit\n"
+"    * Multi-level routing, no limit\n"
+"    * Routing and work center integrated with analytic accounting\n"
+"    * Scheduler computation periodically / Just In Time module\n"
+"    * Multi-pos, multi-warehouse\n"
+"    * Different reordering policies\n"
+"    * Cost method by product: standard price, average price\n"
+"    * Easy analysis of troubles or needs\n"
+"    * Very flexible\n"
+"    * Allows to browse Bill of Materials in complete structure\n"
+"        that include child and phantom BoMs\n"
+"    It supports complete integration and planification of stockable goods,\n"
+"    consumable of services. Services are completely integrated with the "
+"rest\n"
+"    of the software. For instance, you can set up a sub-contracting service\n"
+"    in a BoM to automatically purchase on order the assembly of your "
+"production.\n"
+"\n"
+"    Reports provided by this module:\n"
+"    * Bill of Material structure and components\n"
+"    * Load forecast on Work Centers\n"
+"    * Print a production order\n"
+"    * Stock forecasts\n"
+"    Dashboard provided by this module::\n"
+"    * List of next production orders\n"
+"    * List of deliveries (out picking)\n"
+"    * Graph of work center load\n"
+"    * List of procurement in exception\n"
+"    "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action4
+msgid "Manufacturing Orders Waiting Products"
+msgstr "Ordes de produción en espera de produtos"
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.production:0
+#: view:mrp.production.order:0
+#: view:mrp.property:0
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:121
+#, python-format
+msgid "Cycles Cost"
+msgstr "Custo ciclos"
+
+#. module: mrp
+#: selection:mrp.workcenter.load,measure_unit:0
+msgid "Amount in cycles"
+msgstr "Valor en ciclos"
+
+#. 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 "Lugar produtos rematados"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_pm_resources_config
+msgid "Resources"
+msgstr "Recursos"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_journal_id:0
+msgid "Analytic Journal"
+msgstr "Diario analítico"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
+#: field:mrp.routing,workcenter_lines:0
+msgid "Work Centers"
+msgstr "Centros de produción"
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Per week"
+msgstr "Por semana"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"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."
+msgstr ""
+"As rutas permítenlle crear e xestionar as operacións de fabricación a "
+"realizar nos seus centros de produción para fabricar un produto. Están "
+"relacionadas coas listas de materiais que definirán as materias primas "
+"necesarias."
+
+#. module: mrp
+#: field:report.workcenter.load,hour:0
+msgid "Nbr of hour"
+msgstr "Nº de horas"
+
+#. module: mrp
+#: view:mrp.routing:0
+msgid "Work Center Operations"
+msgstr "Operacións do centro de produción"
+
+#. module: mrp
+#: view:mrp.routing:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_bom
+#: view:mrp.bom:0
+#: field:mrp.production,bom_id:0
+#: field:mrp.production.order,bom_id:0
+#: model:process.node,name:mrp.process_node_billofmaterial0
+msgid "Bill of Material"
+msgstr "Lista de material"
+
+#. module: mrp
+#: view:mrp.workcenter.load:0
+msgid "Select time unit"
+msgstr "Seleccionar unidade de tempo"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Work Center load"
+msgstr "Carga centro de produción"
+
+#. module: mrp
+#: help:mrp.production,location_dest_id:0
+msgid "Location where the system will stock the finished products."
+msgstr "Lugar onde almacenará o sistema os produtos rematados"
+
+#. module: mrp
+#: help:mrp.production,picking_id:0
+msgid ""
+"This is the internal picking list that brings the finished product to the "
+"production plan"
+msgstr ""
+"Este é o albará interno que trae o produto rematado ó plan de produción."
+
+#. module: mrp
+#: field:stock.change.standard.price,change_parent_price:0
+msgid "Change Parent Price"
+msgstr "Cambiar prezo pai"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move
+msgid "Stock Move"
+msgstr "Movemento de stock"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_producttostockrules0
+msgid ""
+"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."
+msgstr ""
+"A regra de stock mínimo é unha regra de abastecemento automático baseado "
+"nunha cantidade mínima e máxima. Está dispoñible no menú de xestión de "
+"inventario e pódese configurar por produto."
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Day by day"
+msgstr "Día por día"
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Revisions"
+msgstr "Revisións"
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid "Configure Your Manufacturing Resource Planning Application"
+msgstr ""
+"Configure a súa aplicación de planificación de recursos de fabricación (MRP)"
+
+#. module: mrp
+#: field:mrp.production,priority:0
+#: field:mrp.production.order,priority:0
+msgid "Priority"
+msgstr "Prioridade"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_picking
+msgid "Picking List"
+msgstr "Albará"
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "Month -1"
+msgstr "Mes -1"
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:924
+#, python-format
+msgid "Manufacturing order '%s' is scheduled for the %s."
+msgstr "Orde de produción '%s' planificada para o '%s'"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Production Order N° :"
+msgstr "Nº orde produción:"
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:640
+#, python-format
+msgid "Manufacturing order '%s' is ready to produce."
+msgstr "A orde de fabricación '%s' está preparada para producir."
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_product_line
+msgid "Production Scheduled Product"
+msgstr "Fabricación planificada produto"
+
+#. module: mrp
+#: help:res.company,manufacturing_lead:0
+msgid "Security days for each manufacturing operation."
+msgstr "Días de seguridade para cada operación de fabricación."
+
+#. 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 "Fabricar para stock"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "July"
+msgstr "Xullo"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"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."
+msgstr ""
+"As listas mestras de materiais permítenlle crear e xestionar a lista das "
+"materias primas necesarias utilizadas para fabricar un produto rematado. "
+"OpenERP utilizará estas LdMs para propoñer automaticamente as ordes de "
+"fabricación en función das necesidades de produto. Pode crear unha lista de "
+"materiais para definir os pasos de produción ou definir unha única lista de "
+"materiais multi-nivel."
+
+#. 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 ""
+"Se se merca o método de subministración do produto, o sistema crea un pedido "
+"de compra."
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_procurement_order
+msgid "Procurement"
+msgstr "Abastecemento"
+
+#. 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 "Estrutura dos custos do produto"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Components suppliers"
+msgstr "Provedores de compoñentes"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_installer
+msgid "mrp.installer"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Production Work Centers"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:mrp.production.order,month:0
+msgid "Month"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/wizard/change_production_qty.py:62
+#, python-format
+msgid "Active Id is not found"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Search for mrp workcenter"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "BoM Structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_start:0
+#: field:mrp.production.order,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour_account_id:0
+msgid "Hour Account"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Destination Loc."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production.order,product_id2:0
+msgid "Product Consumed"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Pending"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,active:0
+#: field:mrp.routing,active:0
+msgid "Active"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_procureproducts0
+msgid "Procure Products"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: view:report.workcenter.load:0
+msgid "Work Center Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_property_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_action
+#: view:mrp.bom:0
+#: field:mrp.bom,property_ids:0
+#: view:mrp.property:0
+#: view:procurement.order:0
+#: field:procurement.order,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,origin:0
+msgid ""
+"Reference of the document that generated this production order request."
+msgstr ""
+
+#. module: mrp
+#: sql_constraint:mrp.bom:0
+msgid ""
+"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 !"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_change_production_qty
+msgid "Change Quantity of Products"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productionorder0
+msgid "Drives the procurement orders for raw material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "Current"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "SO Number"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_change_standard_price
+msgid "Change Standard Price"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,origin:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: mrp
+#: help:stock.change.standard.price,change_parent_price:0
+msgid ""
+"This will change the price of parent products also according to the BoM "
+"structure specified for the product."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action2
+msgid "Manufacturing Orders To Start"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:495
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_workcenter
+#: field:mrp.production.workcenter.line,workcenter_id:0
+#: field:mrp.routing.workcenter,workcenter_id:0
+#: view:mrp.workcenter:0
+#: field:report.workcenter.load,workcenter_id:0
+msgid "Work Center"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,capacity_per_cycle:0
+msgid "Capacity per Cycle"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_product_product
+#: view:mrp.bom:0
+#: field:mrp.bom,product_id:0
+#: view:mrp.production:0
+#: field:mrp.production,product_id:0
+#: report:mrp.production.order:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_id:0
+#: field:mrp.production.product.line,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,hour_total:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,location_src_id:0
+#: field:mrp.production.order,location_src_id:0
+msgid "Raw Materials Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.product_price:0
+msgid "Print Cost Structure of Product."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uos:0
+#: field:mrp.production.product.line,product_uos:0
+msgid "Product UOS"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allow you to create and manage manufacturing units consisting "
+"of one or more persons and/or machines that can be considered as a unit for "
+"capacity and planning forecasting."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Consume Products"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uom:0
+#: field:mrp.production,product_uom:0
+#: field:mrp.production.order,product_uom:0
+#: field:mrp.production.product.line,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. 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 ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
+#: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
+msgid "Production Analysis"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:349
+#, python-format
+msgid "Copy"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_finished:0
+#: field:mrp.production.order,date_finished:0
+msgid "End Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,resource_id:0
+msgid "Resource"
+msgstr ""
+
+#. 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 ""
+
+#. module: mrp
+#: field:mrp.production,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "#Line Orders"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,routing_id:0
+msgid ""
+"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."
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+msgid "Approve"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.property.group:0
+msgid "Properties categories"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production.workcenter.line,sequence:0
+msgid "Gives the sequence order when displaying a list of work orders."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Source Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: view:mrp.production.product.line:0
+msgid "Scheduled Products"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products Consommation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action
+#: model:ir.actions.act_window,name:mrp.mrp_production_action_planning
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+#: view:mrp.production:0
+msgid "Manufacturing Orders"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.product.produce,mode:0
+msgid ""
+"'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."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle:0
+msgid "Cost per cycle"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_serviceproduct0
+#: model:process.node,name:mrp.process_node_serviceproduct1
+msgid "Service"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: selection:mrp.production.order,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "BOM"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_uom:0
+msgid ""
+"UoM (Unit of Measure) is the unit of measurement for the inventory control"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_bom0
+msgid ""
+"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)."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,company_id:0
+#: field:mrp.production,company_id:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,company_id:0
+#: field:mrp.routing,company_id:0
+#: field:mrp.routing.workcenter,company_id:0
+#: view:mrp.workcenter:0
+msgid "Company"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_cycle:0
+msgid "Time for 1 cycle (hour)"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
+#: field:mrp.production.product.line,production_id:0
+#: field:mrp.production.workcenter.line,production_id:0
+#: model:process.node,name:mrp.process_node_production0
+#: model:process.node,name:mrp.process_node_productionorder0
+msgid "Production Order"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productminimumstockrule0
+msgid "Automatic procurement rule"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Compute Data"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,product_uos_qty:0
+msgid "Product UoS Qty"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#: view:mrp.bom:0
+#, python-format
+msgid "Components"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+#: model:ir.actions.report.xml,name:mrp.report_bom_structure
+msgid "BOM Structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,date_stop:0
+msgid "Valid Until"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,date_start:0
+msgid "Valid From"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Normal BoM"
+msgstr ""
+
+#. module: mrp
+#: field:res.company,manufacturing_lead:0
+msgid "Manufacturing Lead Time"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uos_qty:0
+#: field:mrp.production.product.line,product_uos_qty:0
+msgid "Product UOS Qty"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.product.produce:0
+msgid "Confirm"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_efficiency:0
+msgid "Manufacturing Efficiency"
+msgstr ""
+
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_rounding:0
+msgid "Product Rounding"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
+#: field:mrp.production.workcenter.line,name:0
+msgid "Work Order"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.product.produce,mode:0
+msgid "Consume Only"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Recreate Picking"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,type:0
+msgid ""
+"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."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,method:0
+msgid "Method"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,state:0
+msgid ""
+"When the production order is created the state is set to 'Draft'.\n"
+" If the order is confirmed the state is set to 'Waiting Goods'.\n"
+" If any exceptions are there, the state is set to 'Picking Exception'.       "
+"                             \n"
+"If the stock is available then the state is set to 'Ready to Produce'.\n"
+" 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 ""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Order"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_stop:0
+msgid "Time after prod."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter.load,time_unit:0
+msgid "Type of period"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Total Qty"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,hour_nbr:0
+msgid "Number of Hours"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Costing Information"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_purchaseprocure0
+msgid "Procurement Orders"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_rounding:0
+msgid "Rounding applied on the product quantity."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stock0
+msgid "Assignment from Production or Purchase Order."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,routing_id:0
+msgid "Parent Routing"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_start:0
+msgid "Time in hours for the setup."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "December"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,bom_id:0
+#: field:procurement.order,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_mts0
+#: model:process.node,note:mrp.process_node_servicemts0
+msgid "Assignment from stock."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+msgid "Waiting Goods"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,last_indice:0
+msgid "last indice"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,revision_ids:0
+#: view:mrp.bom.revision:0
+msgid "BoM Revisions"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: selection:mrp.production.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0
+#: field:report.workcenter.load,name:0
+msgid "Week"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_routing0
+msgid "Manufacturing Steps."
+msgstr ""
+
+#. 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 ""
+
+#. module: mrp
+#: selection:mrp.product.produce,mode:0
+msgid "Consume & Produce"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "November"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,bom_id:0
+msgid "Parent BoM"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"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."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "January"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct0
+msgid "Product type is Stockable or Consumable."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:595
+#: code:addons/mrp/wizard/change_production_qty.py:77
+#: code:addons/mrp/wizard/change_production_qty.py:82
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
+#: field:product.product,bom_ids:0
+msgid "Bill of Materials"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,routing_id:0
+msgid ""
+"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."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_bom_revision
+msgid "Bill of Material Revision"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing.workcenter:0
+#: view:mrp.workcenter:0
+msgid "General Information"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Productions"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:194
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,note:0
+msgid ""
+"Description of the Work Center. Explain here what's a cycle according to "
+"this Work Center."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing
+#: view:mrp.bom:0
+#: field:mrp.bom,routing_id:0
+#: view:mrp.production:0
+#: field:mrp.production,routing_id:0
+#: field:mrp.production.order,routing_id:0
+#: view:mrp.routing:0
+#: model:process.node,name:mrp.process_node_routing0
+msgid "Routing"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.installer,mrp_operations:0
+msgid "Manufacturing Operations"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_planned:0
+msgid "Scheduled date"
+msgstr ""
+
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"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."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:stock.move,production_id:0
+msgid "Production"
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_product_price
+msgid "Product Price"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_mrp_installer
+msgid "MRP Applications Configuration"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move_split
+msgid "Split in Production lots"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+msgid "Change Quantity"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+#: model:ir.actions.act_window,name:mrp.action_change_production_qty
+msgid "Change Product Qty"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom.revision:0
+#: field:mrp.bom.revision,description:0
+#: view:mrp.property:0
+#: view:mrp.property.group:0
+#: field:mrp.routing,note:0
+#: view:mrp.routing.workcenter:0
+#: field:mrp.routing.workcenter,note:0
+#: view:mrp.workcenter:0
+#: field:mrp.workcenter,note:0
+msgid "Description"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "May"
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Manufacturing board"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_planned_end:0
+msgid "Scheduled End Date"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"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."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
+msgid "Manufacturing"
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Next Production Orders"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "February"
+msgstr ""
+
+#. module: mrp
+#: 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 ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "April"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procurestockableproduct0
+msgid ""
+"Depending on the chosen method to supply the stockable products, the "
+"procurement order creates a RFQ, a production order, ... "
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_stop:0
+msgid "Time in hours for the cleaning."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_purchaseprocure0
+msgid "Automatic RFQ"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemto0
+msgid ""
+"If the service has a 'Produce' supply method, this creates a task in the "
+"project management module of OpenERP."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_productionprocureproducts0
+msgid ""
+"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)."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.product_price,number:0
+msgid ""
+"Specify quantity of products to produce or buy. Report of Cost structure "
+"will be displayed base on this quantity."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Stock"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,sequence:0
+#: report:mrp.production.order:0
+#: field:mrp.production.workcenter.line,sequence:0
+#: field:mrp.routing.workcenter,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
+msgid "Resource Leaves"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,sequence:0
+msgid "Gives the sequence order when displaying a list of bills of material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,move_lines:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,products_to_consume:0
+msgid "Products to Consume"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:mrp.production.order,year:0
+msgid "Year"
+msgstr ""
+
+#~ msgid "Specify Cost of Work center per cycle."
+#~ msgstr "Especificar custos do centro de traballo por ciclo."
+
+#~ msgid "Workcenter Usage"
+#~ msgstr "Uso centro de produción"
+
+#~ 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 ""
+#~ "O número de operacións deste centro de traballo pódese facer en paralelo. Se "
+#~ "este centro de traballo representa un equipo de 5 traballadores, a "
+#~ "capacidade por ciclo é de 5."
+
+#~ msgid ""
+#~ "\n"
+#~ "    This is the base module to manage the manufacturing process in OpenERP.\n"
+#~ "\n"
+#~ "    Features:\n"
+#~ "    * Make to Stock / Make to Order (by line)\n"
+#~ "    * Multi-level BoMs, no limit\n"
+#~ "    * Multi-level routing, no limit\n"
+#~ "    * Routing and work center integrated with analytic accounting\n"
+#~ "    * Scheduler computation periodically / Just In Time module\n"
+#~ "    * Multi-pos, multi-warehouse\n"
+#~ "    * Different reordering policies\n"
+#~ "    * Cost method by product: standard price, average price\n"
+#~ "    * Easy analysis of troubles or needs\n"
+#~ "    * Very flexible\n"
+#~ "    * Allows to browse Bill of Materials in complete structure\n"
+#~ "        that include child and phantom BoMs\n"
+#~ "    It supports complete integration and planification of stockable goods,\n"
+#~ "    consumable of services. Services are completely integrated with the "
+#~ "rest\n"
+#~ "    of the software. For instance, you can set up a sub-contracting service\n"
+#~ "    in a BoM to automatically purchase on order the assembly of your "
+#~ "production.\n"
+#~ "\n"
+#~ "    Reports provided by this module:\n"
+#~ "    * Bill of Material structure and components\n"
+#~ "    * Load forecast on workcenters\n"
+#~ "    * Print a production order\n"
+#~ "    * Stock forecasts\n"
+#~ "    Dashboard provided by this module::\n"
+#~ "    * List of next production orders\n"
+#~ "    * List of deliveries (out picking)\n"
+#~ "    * Graph of work center load\n"
+#~ "    * List of procurement in exception\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    Este é o módulo base para xestionar os procesos de fabricación en "
+#~ "OpenERP. Características:*Obter para stock / Obter baixo pedido (por "
+#~ "liña)*BoMs multi-niveis, sen límite*Lugares multi-nivel, sen límite*Lugares "
+#~ "e centros de traballo integrados coa contabilidade analítica*Execución "
+#~ "periódica do cálculo da planificación / Módulo 'Just In Time'*Multi-pv, "
+#~ "multi-almacén*Diferentes políticas de pedido*Método de custo por produto: "
+#~ "prezo estándar, prezo medio*Análise doada de problemas ou necesidades*Moi "
+#~ "flexible*Permite inspeccionar a estrutura completa das Facturas de Materiais "
+#~ "que inclúen BoMs fillas e pantasmas Soporta a integración e planificación de "
+#~ "mercancías almacenables, e o consumo de servizos. Os servizos intégranse "
+#~ "completamente co resto da aplicación. Por exemplo, pódese establecer un "
+#~ "servizo de subcontratación nunha BoM para encargar automaticamente a montaxe "
+#~ "da súa produción. Os informes que facilita este módulo:*Compoñentes e "
+#~ "estrutura da BoMs*Previsión de carga dos centros de traballo*Previsión de "
+#~ "almacénTaboleiros proporcionados neste módulo:*Lista de ordes de produción "
+#~ "próximas*Lista de entregas*Gráfico de carga do centro de traballo*Lista de "
+#~ "ordes de fabricación con excepcións\n"
+#~ "    "
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index 05c4042c6f9..372460e0167 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.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: 2011-05-16 20:21+0000\n"
+"PO-Revision-Date: 2011-06-27 18:38+0000\n"
 "Last-Translator: Ayhan KIZILTAN <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-05-17 04:39+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
 #: field:mrp.production,move_created_ids2:0
 msgid "Moves Created"
-msgstr "Oluşan Hareketler"
+msgstr "Oluşturulan Hareketler"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_production_action
@@ -40,7 +40,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
-msgstr "Sistemin bileşenleri arayacağı lokasyon."
+msgstr "Sistemin bileşenleri arayacağı konum."
 
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
@@ -50,7 +50,7 @@ msgstr "İş Merkezi Kullanımı"
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Work Centers"
-msgstr "Rota İş Merkezleri"
+msgstr "İş Merkezleri Yönlendirme"
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
@@ -73,14 +73,14 @@ msgid ""
 "The 'Minimum stock rule' allows the system to create procurement orders "
 "automatically as soon as the minimum stock is reached."
 msgstr ""
-"'Minimum stok kuralı', minimum stok sayısına erişildiğinde sistemin "
-"satınalma emirlerini otomatik olarak oluşturmasına izin verir."
+"'Enaz stok kuralı', enaz stok sayısına erişildiğinde sistemin satınalma "
+"emirlerini otomatik olarak oluşturmasına izin verir."
 
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
 msgid "Picking list"
-msgstr "Seçim listesi"
+msgstr "Toplama Listesi"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:121
@@ -2114,7 +2114,7 @@ msgstr "Ayar için saat cinsinden süre."
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "December"
-msgstr "Eylül"
+msgstr "Aralık"
 
 #. module: mrp
 #: field:mrp.installer,config_logo:0
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index c9b0a72865f..0a8750fa20b 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.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-28 05:53+0000\n"
+"PO-Revision-Date: 2011-07-02 15:27+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@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-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-03 04:45+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -35,7 +35,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
-msgstr ""
+msgstr "系统用于查找部件的位置。"
 
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
@@ -107,7 +107,7 @@ msgstr "工艺路线"
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
 msgid "Work Center Product"
-msgstr ""
+msgstr "工作中心产品"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -165,7 +165,7 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
 msgid "The system launches automatically a RFQ to the preferred supplier."
-msgstr ""
+msgstr "系统将自动向首选供应商发起询价单。"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -227,7 +227,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
 msgid "For purchased material"
-msgstr ""
+msgstr "用于采购原料"
 
 #. module: mrp
 #: field:mrp.bom.revision,indice:0
@@ -273,7 +273,7 @@ msgstr "目标库位"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "title"
-msgstr ""
+msgstr "标题"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom
@@ -320,7 +320,7 @@ msgstr "八月"
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "您尝试为另外的产品赋予批次"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
@@ -335,7 +335,7 @@ msgstr "六月"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
-msgstr ""
+msgstr "产品生产"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -370,7 +370,7 @@ msgstr "数量"
 #. module: mrp
 #: field:mrp.production.workcenter.line,hour:0
 msgid "Nbr of hours"
-msgstr ""
+msgstr "小时数"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -399,7 +399,7 @@ msgstr "维修"
 #. module: mrp
 #: field:mrp.installer,stock_location:0
 msgid "Advanced Routes"
-msgstr ""
+msgstr "高级路线"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
@@ -468,7 +468,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct1
 msgid "For Services."
-msgstr ""
+msgstr "用于服务。"
 
 #. module: mrp
 #: field:mrp.bom.revision,date:0
@@ -486,13 +486,13 @@ msgstr "如果你需要生产单的自动辅助核算项目凭证只有完成这
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
 msgid "Nbr of cycles"
-msgstr ""
+msgstr "周期数"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_orderrfq0
 #: model:process.node,note:mrp.process_node_rfq0
 msgid "Request for Quotation."
-msgstr ""
+msgstr "询价单"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
@@ -540,7 +540,7 @@ msgstr "物料清单结构"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Search Production"
-msgstr ""
+msgstr "搜索产品"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -575,7 +575,7 @@ msgstr ""
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Picking Exception"
-msgstr ""
+msgstr "领料异常"
 
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
@@ -617,7 +617,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 ""
+msgstr "工作中心负载"
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:45
@@ -663,7 +663,7 @@ msgstr "一个周期的工作小时数"
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Ref"
-msgstr ""
+msgstr "物料表编号"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -676,7 +676,7 @@ msgstr "生产中"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_property
 msgid "Master Bill of Materials"
-msgstr ""
+msgstr "主物料表"
 
 #. module: mrp
 #: help:mrp.bom,product_uos:0
@@ -702,12 +702,12 @@ msgstr "类型"
 #: code:addons/mrp/report/price.py:201
 #, python-format
 msgid "Total Cost of "
-msgstr ""
+msgstr "总成本 "
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
-msgstr ""
+msgstr "链接到“最小库存规则”供货方式"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -715,7 +715,7 @@ msgid "Per month"
 msgstr "每月"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -728,7 +728,7 @@ msgid "Product Name"
 msgstr "产品名称"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "无效动作"
@@ -798,7 +798,7 @@ msgstr "紧急"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Work Center Usage"
-msgstr ""
+msgstr "工作中心使用情况"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
@@ -879,7 +879,7 @@ msgstr "公司"
 #: model:process.node,name:mrp.process_node_minimumstockrule0
 #: model:process.node,name:mrp.process_node_productminimumstockrule0
 msgid "Minimum Stock"
-msgstr ""
+msgstr "最小库存"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menus_dash_mrp
@@ -889,7 +889,7 @@ msgstr "仪表盘"
 #. module: mrp
 #: view:board.board:0
 msgid "Work Center Future Load"
-msgstr ""
+msgstr "工作中心未来负载"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
@@ -902,7 +902,7 @@ msgstr "可库存产品"
 #: code:addons/mrp/report/price.py:121
 #, python-format
 msgid "Work Center name"
-msgstr ""
+msgstr "工作中心名称"
 
 #. module: mrp
 #: field:mrp.routing,code:0
@@ -917,7 +917,7 @@ msgstr "小时编号"
 #. module: mrp
 #: field:mrp.installer,mrp_jit:0
 msgid "Just In Time Scheduling"
-msgstr ""
+msgstr "及时生产计划"
 
 #. module: mrp
 #: view:mrp.property:0
@@ -1000,7 +1000,7 @@ msgstr ""
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
-msgstr ""
+msgstr "物料表名称"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1011,17 +1011,17 @@ msgstr "启动生产"
 #: model:ir.actions.act_window,name:mrp.open_board_manufacturing
 #: model:ir.ui.menu,name:mrp.menu_board_manufacturing
 msgid "Production Dashboard"
-msgstr ""
+msgstr "生产仪表盘"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Source Loc."
-msgstr ""
+msgstr "来源位置"
 
 #. module: mrp
 #: field:mrp.bom,position:0
 msgid "Internal Reference"
-msgstr ""
+msgstr "内部单号"
 
 #. module: mrp
 #: help:mrp.installer,stock_location:0
@@ -1033,7 +1033,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
 msgid "Product's structure"
-msgstr ""
+msgstr "产品结构"
 
 #. module: mrp
 #: field:mrp.bom,name:0
@@ -1294,7 +1294,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1305,7 +1305,7 @@ msgid "Production Order N° :"
 msgstr "生产单号:"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1534,7 +1534,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1624,7 +1624,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2113,7 +2113,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
diff --git a/addons/mrp/installer.py b/addons/mrp/installer.py
index 407d401e463..7fc7fea9c1e 100644
--- a/addons/mrp/installer.py
+++ b/addons/mrp/installer.py
@@ -21,8 +21,7 @@
 from osv import fields, osv
 
 class mrp_installer(osv.osv_memory):
-    _name = 'mrp.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         # Manufacturing Resource Planning
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 7ff0cee5619..ec429488914 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -197,7 +197,7 @@ class mrp_bom(osv.osv):
                                  help= "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."),
-        'method': fields.function(_compute_type, string='Method', method=True, type='selection', selection=[('',''),('stock','On Stock'),('order','On Order'),('set','Set / Pack')]),
+        'method': fields.function(_compute_type, string='Method', type='selection', selection=[('',''),('stock','On Stock'),('order','On Order'),('set','Set / Pack')]),
         'date_start': fields.date('Valid From', help="Validity of this BoM or component. Keep empty if it's always valid."),
         'date_stop': fields.date('Valid Until', help="Validity of this BoM or component. Keep empty if it's always valid."),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bills of material."),
@@ -214,7 +214,7 @@ class mrp_bom(osv.osv):
         'routing_id': fields.many2one('mrp.routing', 'Routing', help="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."),
         'property_ids': fields.many2many('mrp.property', 'mrp_bom_property_rel', 'bom_id','property_id', 'Properties'),
         'revision_ids': fields.one2many('mrp.bom.revision', 'bom_id', 'BoM Revisions'),
-        'child_complete_ids': fields.function(_child_compute, relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
+        'child_complete_ids': fields.function(_child_compute, relation='mrp.bom', string="BoM Hierarchy", type='many2many'),
         'company_id': fields.many2one('res.company','Company',required=True),
     }
     _defaults = {
@@ -446,25 +446,25 @@ class mrp_production(osv.osv):
         'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this production order request."),
         'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority'),
 
-        'product_id': fields.many2one('product.product', 'Product', required=True, ),
+        'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'product_qty': fields.float('Product Qty', required=True, states={'draft':[('readonly',False)]}, readonly=True),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True, states={'draft':[('readonly',False)]}, readonly=True),
         'product_uos_qty': fields.float('Product UoS Qty', states={'draft':[('readonly',False)]}, readonly=True),
         'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True),
 
         'location_src_id': fields.many2one('stock.location', 'Raw Materials Location', required=True,
-            help="Location where the system will look for components."),
+            readonly=True, states={'draft':[('readonly',False)]}, help="Location where the system will look for components."),
         'location_dest_id': fields.many2one('stock.location', 'Finished Products Location', required=True,
-            help="Location where the system will stock the finished products."),
+            readonly=True, states={'draft':[('readonly',False)]}, help="Location where the system will stock the finished products."),
 
-        'date_planned_end': fields.function(_production_date_end, method=True, type='date', string='Scheduled End Date'),
-        'date_planned_date': fields.function(_production_date, method=True, type='date', string='Scheduled Date'),
+        'date_planned_end': fields.function(_production_date_end, type='date', string='Scheduled End Date'),
+        'date_planned_date': fields.function(_production_date, type='date', string='Scheduled Date'),
         'date_planned': fields.datetime('Scheduled date', required=True, select=1),
         'date_start': fields.datetime('Start Date', select=True),
         'date_finished': fields.datetime('End Date', select=True),
 
-        'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)]),
-        'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', help="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."),
+        'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)], readonly=True, states={'draft':[('readonly',False)]}),
+        'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', readonly=True, states={'draft':[('readonly',False)]}, help="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."),
 
         'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True, ondelete="restrict",
             help="This is the internal picking list that brings the finished product to the production plan"),
@@ -478,8 +478,8 @@ class mrp_production(osv.osv):
         'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
                                     help='When the production order is created the state is set to \'Draft\'.\n If the order is confirmed the state is set to \'Waiting Goods\'.\n If any exceptions are there, the state is set to \'Picking Exception\'.\
                                     \nIf the stock is available then the state is set to \'Ready to Produce\'.\n 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\'.'),
-        'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder', store=True),
-        'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder', store=True),
+        'hour_total': fields.function(_production_calc, type='float', string='Total Hours', multi='workorder', store=True),
+        'cycle_total': fields.function(_production_calc, type='float', string='Total Cycles', multi='workorder', store=True),
         'company_id': fields.many2one('res.company','Company',required=True),
     }
     _defaults = {
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index ff0c01f8e18..8d82d16a7ec 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -2,55 +2,22 @@
   <data>
     <record id="view_mrp_installer" model="ir.ui.view">
       <field name="name">mrp.installer.view</field>
-      <field name="model">mrp.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes">
-            <attribute name="string">MRP Application Configuration</attribute>
-          </form>
-
-          <separator string="title" position="attributes">
-            <attribute name="string">Configure Your Manufacturing Resource Planning Application</attribute>
-          </separator>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">Add more functionalities to the core Manufacturing Application with the following addons.</attribute>
+          <xpath expr="//group[@name='mrp']" position="replace">
+            <newline/>
+            <separator  string="Manufacturing Features" colspan="4" />
+            <field name="stock_location" />
+            <field name="mrp_jit" />
+            <field name="mrp_operations" />
+            <field name="mrp_subproduct" />
+            <field name="mrp_repair" />            
           </xpath>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                  <attribute name='string'></attribute>
-            </xpath>
-            <xpath expr="//button[@string='Install Modules']" position="attributes">
-                   <attribute name="string">Configure</attribute>
-          </xpath>
-          <group colspan="8">
-            <field name="stock_location"/>
-            <field name="mrp_jit"/>
-            <field name="mrp_operations"/>
-            <field name="mrp_subproduct"/>
-            <field name="mrp_repair"/>
-          </group>
         </data>
       </field>
     </record>
-
-    <record id="action_mrp_installer" model="ir.actions.act_window">
-      <field name="name">MRP Applications Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">mrp.installer</field>
-      <field name="view_id" ref="view_mrp_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="mrp_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_mrp_installer"/>
-      <field name="sequence">3</field>
-        <field name="restart">always</field>
-      <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
-    </record>
-
   </data>
 </openerp>
diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index feb1515218b..5e650740de5 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -294,7 +294,7 @@
       <blockTable colWidths="74.0,212.0,112.0,66.0,64.0" style="Table4">
         <tr>
           <td>
-            <para style="terp_default_Centre_8">[[ line2.sequence ]]</para>
+            <para style="terp_default_Centre_8">[[ str(line2.sequence) ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_8">[[ line2.name ]]</para>
diff --git a/addons/mrp/wizard/mrp_product_produce.py b/addons/mrp/wizard/mrp_product_produce.py
index 811c707eb2a..69fc3a9dd7d 100644
--- a/addons/mrp/wizard/mrp_product_produce.py
+++ b/addons/mrp/wizard/mrp_product_produce.py
@@ -20,13 +20,14 @@
 ##############################################################################
 
 from osv import fields, osv
+import decimal_precision as dp
 
 class mrp_product_produce(osv.osv_memory):
     _name = "mrp.product.produce"
     _description = "Product Produce"
 
     _columns = {
-        'product_qty': fields.float('Select Quantity', required=True),
+        'product_qty': fields.float('Select Quantity', digits_compute=dp.get_precision('Product UoM'), required=True),
         'mode': fields.selection([('consume_produce', 'Consume & Produce'),
                                   ('consume', 'Consume Only')], 'Mode', required=True,
                                   help="'Consume only' mode will only consume the products with the quantity selected.\n"
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 589d3c27031..fe926d30ac1 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -92,9 +92,9 @@ class mrp_production_workcenter_line(osv.osv):
                                        "* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pause' state.\n" \
                                        "* When the user cancels the work order it will be set in 'Canceled' state.\n" \
                                        "* When order is completely processed that time it is set in 'Finished' state."),
-       'date_start_date': fields.function(_get_date_date, method=True, string='Start Date', type='date'),
+       'date_start_date': fields.function(_get_date_date, string='Start Date', type='date'),
        'date_planned': fields.datetime('Scheduled Date'),
-       'date_planned_end': fields.function(_get_date_end, method=True, string='End Date', type='datetime'),
+       'date_planned_end': fields.function(_get_date_end, string='End Date', type='datetime'),
        'date_start': fields.datetime('Start Date'),
        'date_finished': fields.datetime('End Date'),
        'delay': fields.float('Working Hours',help="This is lead time between operation start and stop in this Work Center",readonly=True),
@@ -554,7 +554,7 @@ class mrp_operations_operation(osv.osv):
         'code_id':fields.many2one('mrp_operations.operation.code','Code',required=True),
         'date_start': fields.datetime('Start Date'),
         'date_finished': fields.datetime('End Date'),
-        'order_date': fields.function(_get_order_date,method=True,string='Order Date',type='date',store={'mrp.production':(_order_date_search_production,['date_planned'], 10)}),
+        'order_date': fields.function(_get_order_date,string='Order Date',type='date',store={'mrp.production':(_order_date_search_production,['date_planned'], 10)}),
         }
     _defaults={
         'date_start': lambda *a:datetime.now().strftime('%Y-%m-%d %H:%M:%S')
diff --git a/addons/mrp_repair/i18n/sv.po b/addons/mrp_repair/i18n/sv.po
index 58aba31d1b1..6f58b0cad9d 100644
--- a/addons/mrp_repair/i18n/sv.po
+++ b/addons/mrp_repair/i18n/sv.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-09 10:02+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-06-03 14:18+0000\n"
+"Last-Translator: Jan-Eric Lindh <jelindh@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-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-04 04:53+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr "Flytta"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr ""
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -543,7 +544,7 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Qty"
-msgstr ""
+msgstr "Antal"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,price_unit:0
@@ -762,7 +763,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po
index 03e1833a574..73051f4a724 100644
--- a/addons/mrp_repair/i18n/tr.po
+++ b/addons/mrp_repair/i18n/tr.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:15+0000\n"
-"PO-Revision-Date: 2010-09-09 07:21+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-06-23 20:16+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-24 04:59+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Fees Line"
-msgstr ""
+msgstr "Ücret Kallemleri"
 
 #. module: mrp_repair
 #: help:mrp.repair,state:0
@@ -35,6 +35,17 @@ msgid ""
 "* The 'Done' state is set when repairing is completed.            \n"
 "* The 'Cancelled' state is used when user cancel repair order."
 msgstr ""
+" * 'Taslak' durumu, bir kullanıcı yeni ve onaylanmamış bir onarım siparişi "
+"girerken kullanılır.             \n"
+"* 'Onaylı' durumu, bir kullanıcı bir onarım siparişini onaylarken "
+"kullanılır.             \n"
+"* 'Onarıma Hazır' durumu, kullanıcı onarıma başlarken kullanılır, kullanıcı "
+"ancak onarım siparişi onaylandıktan sonra onarıma başlayabilir.             "
+"\n"
+"* 'Faturalandırılacak' durumu, onarımdan önce ya da sonra fatura oluşturmak "
+"için kullanılır.             \n"
+"* 'Bitti' durumu, onarım bittiğinde kullanılır.            \n"
+"* 'İptal' durumu, onarım siparişi iptal edildiğinde kullanılır."
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -50,11 +61,16 @@ msgid ""
 "date on the production lot in order to know if whether the repair should be "
 "invoiced to the customer or not."
 msgstr ""
+"Onarım siparişleri ürün onarımlarınızı düzenlemenizi sağlar. Bir onarım "
+"siparişinde, kaldırılacak bileşenleri ayrıntılayabilir, farklı işlemler için "
+"harcadığınız süreleri ekleyebilir, çıkarabilir ve kayıt edebilirsiniz. "
+"Onarım siparişi, müşteriye kesilip kesilmeyeceğini belirlemek için ürün "
+"partisine ait garanti tarihini kullanır."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Group By..."
-msgstr ""
+msgstr "Şuna göre grupla"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -69,18 +85,21 @@ msgid ""
 "that you can select the locations in the Info tab, if you have the extended "
 "view."
 msgstr ""
+"Bu kutuyu, ürün onarılır onarılmaz teslimatı yapmak isterseniz işaretleyin. "
+"İşaretlenirse, seçilen ürün için toplama oluşturulacaktır. Genişletilmiş "
+"görünümdeyseniz, Bilgi Sekmesinde konumları seçebileceğinize dikkat edin."
 
 #. 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 "Onarım Siparişini İptal Et"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,to_invoice:0
 #: field:mrp.repair.line,to_invoice:0
 msgid "To Invoice"
-msgstr "Fatura Adresi"
+msgstr "Faturalandırılacak"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -90,18 +109,18 @@ msgstr "Yazdırma Tarihi"
 #. module: mrp_repair
 #: field:mrp.repair.make_invoice,group:0
 msgid "Group by partner invoice address"
-msgstr "Cari Fatura Adreslerine göre Gruplandı"
+msgstr "Paydaş Fatura Adreslerine göre Gruplandır"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
-msgstr ""
+msgstr "Ücretlerde tanımlanmış ürün yok!"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Set to Draft"
-msgstr "Taslak olarak Ayarla"
+msgstr "Taslağa  Ayarla"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -118,13 +137,13 @@ msgstr "Teslimat Adresi"
 #: model:ir.model,name:mrp_repair.model_mrp_repair_make_invoice
 #: view:mrp.repair:0
 msgid "Make Invoice"
-msgstr ""
+msgstr "Fatura Oluştur"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,price_subtotal:0
 #: field:mrp.repair.line,price_subtotal:0
 msgid "Subtotal"
-msgstr "Alt Toplam"
+msgstr "Ara Toplam"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -134,12 +153,12 @@ msgstr "Fatura Adresi:"
 #. module: mrp_repair
 #: field:mrp.repair,guarantee_limit:0
 msgid "Guarantee limit"
-msgstr "Garanti limiti"
+msgstr "Garanti sınırı"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Notes"
-msgstr ""
+msgstr "Notlar"
 
 #. module: mrp_repair
 #: model:ir.module.module,description:mrp_repair.module_meta_information
@@ -154,13 +173,22 @@ msgid ""
 "           * Repair quotation report\n"
 "           * Notes for the technician and for the final customer\n"
 msgstr ""
+"\n"
+"           Amaç, bütün ürün onarımlarını yapmak için tam bir modül elde "
+"etmektir. Aşağıdaki konular bu modülün kapsamındadır:\n"
+"           * Onarımdaki ürünleri ekle/kaldır\n"
+"           * Stokları etkile\n"
+"           * Faturalama (ürünler ve/veya hizmetler)\n"
+"           * Garanti kavramı\n"
+"           * Onarım teklifi raporu\n"
+"           * Teknisyen ve son müşteri için notlar\n"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_tax:0
 #: field:mrp.repair.fee,tax_id:0
 #: field:mrp.repair.line,tax_id:0
 msgid "Taxes"
-msgstr "Vergi"
+msgstr "Vergiler"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -168,10 +196,10 @@ msgid "Net Total :"
 msgstr "Net Toplam :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Uyarı !"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -181,7 +209,7 @@ msgstr "KDV"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Operations"
-msgstr "Operasyonlar"
+msgstr "İşlemler"
 
 #. module: mrp_repair
 #: field:mrp.repair,move_id:0
@@ -189,16 +217,16 @@ msgid "Move"
 msgstr "Hareket"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
-msgstr ""
+msgstr "Onarım formundan bir Paydaş Adresi seçmelisiniz !"
 
 #. module: mrp_repair
 #: 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 "Onarım Emirleri"
+msgstr "Onarım Siparişleri"
 
 #. module: mrp_repair
 #: model:ir.actions.report.xml,name:mrp_repair.report_mrp_repair
@@ -208,13 +236,13 @@ msgstr "Teklif / Sipariş"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Extra Info"
-msgstr "Extra Bilgi"
+msgstr "Ek Bilgi"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,repair_id:0
 #: field:mrp.repair.line,repair_id:0
 msgid "Repair Order Reference"
-msgstr ""
+msgstr "Onarım Siparişi Referansı"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
@@ -222,10 +250,10 @@ msgid "Draft"
 msgstr "Taslak"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
-msgstr ""
+msgstr "\"%s\" Paydaşı için tanımlanmış bir hesap yok."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -237,33 +265,34 @@ msgstr "Onaylandı"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Repairs order"
-msgstr "Onarım Emri"
+msgstr "Onarım Siparişi"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Repair Order N° :"
-msgstr "Onarım Emri N° :"
+msgstr "Onarım Siparişi 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 "Lot Numarası"
+msgstr "Parti Numarası"
 
 #. module: mrp_repair
 #: field:mrp.repair,fees_lines:0
 msgid "Fees Lines"
-msgstr ""
+msgstr "Ücret Kalemleri"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,type:0
 msgid "Type"
-msgstr "Tipi"
+msgstr "Tür"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Fees Line(s)"
-msgstr ""
+msgstr "Ücret Kalemi(leri)"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -276,17 +305,17 @@ msgid "Shipping address :"
 msgstr "Sevk Adresi :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Hata !"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,product_uom_qty:0
 msgid "Quantity (UoM)"
-msgstr "Miktar (Birim)"
+msgstr "Miktar (Ölçü Birimi)"
 
 #. module: mrp_repair
 #: help:mrp.repair.line,state:0
@@ -299,6 +328,14 @@ msgid ""
 "                  \n"
 "* The 'Cancelled' state is set automatically when user cancel repair order."
 msgstr ""
+" * 'Taslak' durumu, onarım siparişi taslak durumundayken otomatik olarak "
+"ayarlanır.                         \n"
+"* 'Onaylı' durumu, onarım siparişi onaylı durumdayken otomatik olarak "
+"ayarlanır.                         \n"
+"* 'Done' durumu, onarım siparişi tamamlandığında otomatik olarak ayarlanır.  "
+"                      \n"
+"* 'Cancelled' durumu, kullanıcı onarım siparişini iptal ettiğinde otomatik "
+"olarak ayarlanır."
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -311,6 +348,8 @@ msgid ""
 "This operation will cancel the Repair process, but will not cancel it's "
 "Invoice. Do you want to continue?"
 msgstr ""
+"Bu eylem Onarım işlemini iptal edecektir ama faturasını iptal etmeyecektir. "
+"Devam etmek istiyor musunuz?"
 
 #. module: mrp_repair
 #: field:mrp.repair,pricelist_id:0
@@ -327,17 +366,17 @@ msgstr "Teklif Notları"
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Uyarı!"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Search Reair Orders"
-msgstr ""
+msgstr "Onarım Siparişi Ara"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Add)"
-msgstr ""
+msgstr "(Ekle)"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_line
@@ -349,7 +388,7 @@ msgstr "Onarım Kalemi"
 #: view:mrp.repair:0
 #: field:mrp.repair,partner_id:0
 msgid "Partner"
-msgstr "Ortak"
+msgstr "Paydaş"
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_method:0
@@ -364,7 +403,7 @@ msgstr "Onarıldı"
 #. module: mrp_repair
 #: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
 msgid "Products Repairs Module - Manage All products Repairs"
-msgstr ""
+msgstr "Ürün Onarımları Modülü - Bütün ürün Onarımlarını Yönet"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,invoice_line_id:0
@@ -385,7 +424,7 @@ msgstr "Onarım Öncesi"
 #. module: mrp_repair
 #: field:mrp.repair,location_id:0
 msgid "Current Location"
-msgstr "Geçerli Lokasyon"
+msgstr "Geçerli Konum"
 
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
@@ -402,7 +441,7 @@ msgstr "Faturalandı"
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
 msgid "No"
-msgstr "Hayır"
+msgstr "No"
 
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
@@ -412,78 +451,78 @@ msgstr "Faturaları Oluştur"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Remove)"
-msgstr ""
+msgstr "(Kaldır)"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
 msgid "Add"
-msgstr ""
+msgstr "Ekle"
 
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "Gerçekten fatura(ları) oluşturmak istiyor musunuz?"
 
 #. module: mrp_repair
 #: field:mrp.repair,name:0
 msgid "Repair Reference"
-msgstr ""
+msgstr "Onarım Referansı"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair
 msgid "Repair Order"
-msgstr ""
+msgstr "Onarım Siparişi"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Under Repair"
-msgstr "Onarımdakiler"
+msgstr "Onarımda"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Ready To Repair"
-msgstr ""
+msgstr "Onarıma Hazır"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr "Tutar"
+msgstr "Vergisiz Tutar"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
-msgstr "Garanti Limiti"
+msgstr "Garanti Sınırı"
 
 #. module: mrp_repair
 #: field:mrp.repair,default_address_id:0
 msgid "unknown"
-msgstr ""
+msgstr "bilinmeyen"
 
 #. module: mrp_repair
 #: field:mrp.repair,product_id:0
 #: report:repair.order:0
 msgid "Product to Repair"
-msgstr "Ürün Onarımı"
+msgstr "Onarılacak Ürün"
 
 #. 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 "Fiyat Listesi, varsayılan olarak seçilen paydaşa aittir."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
-msgstr ""
+msgstr "Tarih"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_fee
 msgid "Repair Fees Line"
-msgstr ""
+msgstr "Onarım Ücretleri Kalemi"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -498,7 +537,7 @@ msgstr "Hesapla"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Confirm Repair"
-msgstr "Düzeltmeyi Onayla"
+msgstr "Onarımı Onayla"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -511,16 +550,16 @@ msgid "End Repair"
 msgstr "Onarım Bitir"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
-msgstr ""
+msgstr "\"%s\" Ürünü için tanımlı hesap yok."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Quotations"
-msgstr ""
+msgstr "Teklifler"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom_qty:0
@@ -538,7 +577,7 @@ msgstr "Onarımı Başlat"
 #: field:mrp.repair,state:0
 #: field:mrp.repair.line,state:0
 msgid "State"
-msgstr ""
+msgstr "Durum"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -566,6 +605,10 @@ msgid ""
 "operation and fee you will add will be set as 'not to invoiced' by default. "
 "Note that you can change manually afterwards."
 msgstr ""
+"Garanti sınırı şöyle hesaplanır: son işlem tarihi + seçilen ürüne ait "
+"tanımlı garanti. Eğer geçerli tarih garanti sınırının altındaysa, "
+"ekleyeceğiniz her işlem ve ücret varsayılan olarak faturalandırılmayacak "
+"olarak işaretlenir. Daha sonra el ile değiştirebileceğinizi unutmayın."
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_id:0
@@ -575,18 +618,18 @@ msgstr "Fatura"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Fees"
-msgstr ""
+msgstr "Ücretler"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 #: view:mrp.repair.make_invoice:0
 msgid "Cancel"
-msgstr "İptal"
+msgstr "Vazgeç"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
-msgstr "Hedef Lokasyon"
+msgstr "Hedef Konum"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -596,12 +639,12 @@ msgstr "Operasyon Kalemi (leri)"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "History"
-msgstr "Geçmiş Bilgisi"
+msgstr "Geçmiş"
 
 #. module: mrp_repair
 #: field:mrp.repair,location_dest_id:0
 msgid "Delivery Location"
-msgstr "Teslimat Lokasyonu"
+msgstr "Teslimat Konumu"
 
 #. module: mrp_repair
 #: help:mrp.repair,invoice_method:0
@@ -610,11 +653,14 @@ msgid ""
 "selected is different from 'No Invoice', it also allow you to select the "
 "pricelist and invoicing address."
 msgstr ""
+"Bu alan, sipariş emrine ait işakışını değiştirmenizi sağlar. Seçilen değer "
+"'Faturasız' dan farklı ise, fiyat listesi ve fatura adresi seçmenize izin "
+"verir."
 
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Fatura Oluştur"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,name:0
@@ -626,12 +672,12 @@ msgstr "Açıklama"
 #. module: mrp_repair
 #: field:mrp.repair,operations:0
 msgid "Operation Lines"
-msgstr "Operasyon Kalemleri"
+msgstr "İşlem Kalemleri"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "invoiced"
-msgstr ""
+msgstr "faturalanmış"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -643,7 +689,7 @@ msgstr "Ürün"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Invoice Corrected"
-msgstr ""
+msgstr "Fatura Düzeltildi"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -653,13 +699,13 @@ msgstr "Fiyat"
 #. module: mrp_repair
 #: field:mrp.repair,deliver_bool:0
 msgid "Deliver"
-msgstr "Teslimat"
+msgstr "Teslim Et"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,internal_notes:0
 msgid "Internal Notes"
-msgstr "Dahili Notlar"
+msgstr "İç Notlar"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -669,24 +715,24 @@ msgstr "Vergi:"
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
-msgstr ""
+msgstr "Toplama"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Untaxed amount"
-msgstr "Tutar"
+msgstr "Vergisiz Tutar"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/wizard/cancel_repair.py:41
 #, python-format
 msgid "Active ID is not Found"
-msgstr ""
+msgstr "Etkin No Bulunmadı"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Repair order is not invoiced."
-msgstr ""
+msgstr "Onarım siparişi faturanladırılmamış"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -696,12 +742,12 @@ msgstr "Toplam Tutar"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "UoM"
-msgstr "Birim"
+msgstr "Ölçü Birimi"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
 msgid "Remove"
-msgstr ""
+msgstr "Kaldır"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom:0
@@ -750,6 +796,7 @@ msgstr "Durumlar"
 msgid ""
 "This field allow you to choose the parner that will be invoiced and delivered"
 msgstr ""
+"Bu alan faturalandırılacak ve teslimat yapılacak paydaşı seçmenizi sağlar"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
@@ -762,10 +809,10 @@ msgid "Ready to Repair"
 msgstr "Onarıma Hazır"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
-msgstr ""
+msgstr "Paydaş Yok !"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index bedaa22b433..caacb2e3247 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -117,7 +117,7 @@ class mrp_repair(osv.osv):
         'product_id': fields.many2one('product.product', string='Product to Repair', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'partner_id' : fields.many2one('res.partner', 'Partner', select=True, help='This field allow you to choose the parner that will be invoiced and delivered'),
         'address_id': fields.many2one('res.partner.address', 'Delivery Address', domain="[('partner_id','=',partner_id)]"),
-        'default_address_id': fields.function(_get_default_address, method=True, type="many2one", relation="res.partner.address"),
+        'default_address_id': fields.function(_get_default_address, type="many2one", relation="res.partner.address"),
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number', select=True, domain="[('product_id','=',product_id)]"),
         'state': fields.selection([
             ('draft','Quotation'),
@@ -156,17 +156,17 @@ class mrp_repair(osv.osv):
         'deliver_bool': fields.boolean('Deliver', help="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."),
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'repaired': fields.boolean('Repaired', readonly=True),
-        'amount_untaxed': fields.function(_amount_untaxed, method=True, string='Untaxed Amount',
+        'amount_untaxed': fields.function(_amount_untaxed, string='Untaxed Amount',
             store={
                 'mrp.repair': (lambda self, cr, uid, ids, c={}: ids, ['operations'], 10),
                 'mrp.repair.line': (_get_lines, ['price_unit', 'price_subtotal', 'product_id', 'tax_id', 'product_uom_qty', 'product_uom'], 10),
             }),
-        'amount_tax': fields.function(_amount_tax, method=True, string='Taxes',
+        'amount_tax': fields.function(_amount_tax, string='Taxes',
             store={
                 'mrp.repair': (lambda self, cr, uid, ids, c={}: ids, ['operations'], 10),
                 'mrp.repair.line': (_get_lines, ['price_unit', 'price_subtotal', 'product_id', 'tax_id', 'product_uom_qty', 'product_uom'], 10),
             }),
-        'amount_total': fields.function(_amount_total, method=True, string='Total',
+        'amount_total': fields.function(_amount_total, string='Total',
             store={
                 'mrp.repair': (lambda self, cr, uid, ids, c={}: ids, ['operations'], 10),
                 'mrp.repair.line': (_get_lines, ['price_unit', 'price_subtotal', 'product_id', 'tax_id', 'product_uom_qty', 'product_uom'], 10),
@@ -558,7 +558,7 @@ class mrp_repair(osv.osv):
                     'name': repair.name,
                     'picking_id': picking,
                     'product_id': repair.product_id.id,
-                    'product_qty': 1.0,
+                    'product_qty': move.product_uom_qty or 1.0,
                     'product_uom': repair.product_id.uom_id.id,
                     'prodlot_id': repair.prodlot_id and repair.prodlot_id.id or False,
                     'address_id': repair.address_id and repair.address_id.id or False,
@@ -661,7 +661,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok','=',True)], required=True),
         'invoiced': fields.boolean('Invoiced',readonly=True),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price')),
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal',digits_compute= dp.get_precision('Sale Price')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal',digits_compute= dp.get_precision('Sale Price')),
         'tax_id': fields.many2many('account.tax', 'repair_operation_line_tax', 'repair_operation_line_id', 'tax_id', 'Taxes'),
         'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2), required=True),
         'product_uom': fields.many2one('product.uom', 'Product UoM', required=True),
@@ -750,7 +750,7 @@ class mrp_repair_fee(osv.osv, ProductChangeMixin):
         'product_uom_qty': fields.float('Quantity', digits=(16,2), required=True),
         'price_unit': fields.float('Unit Price', required=True),
         'product_uom': fields.many2one('product.uom', 'Product UoM', required=True),
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal',digits_compute= dp.get_precision('Sale Price')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal',digits_compute= dp.get_precision('Sale Price')),
         'tax_id': fields.many2many('account.tax', 'repair_fee_line_tax', 'repair_fee_line_id', 'tax_id', 'Taxes'),
         'invoice_line_id': fields.many2one('account.invoice.line', 'Invoice Line', readonly=True),
         'to_invoice': fields.boolean('To Invoice'),
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index c8554070a7c..16cdfc86b3d 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -116,7 +116,7 @@
                     <page string="Invoicing">
                         <field name="invoice_method" colspan="4"/>
                         <field
-                            name="pricelist_id" context="product_id=product_id"
+                            name="pricelist_id" context="{'product_id':product_id}"
                             attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
                         <field name="partner_invoice_id" attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
                         <!-- <field name="invoice_id"/> -->
diff --git a/addons/outlook/i18n/fi.po b/addons/outlook/i18n/fi.po
new file mode 100644
index 00000000000..c99b602787c
--- /dev/null
+++ b/addons/outlook/i18n/fi.po
@@ -0,0 +1,147 @@
+# Finnish 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-06-20 09:14+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-21 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: outlook
+#: field:outlook.installer,doc_file:0
+msgid "Installation Manual"
+msgstr "Asennusohje"
+
+#. module: outlook
+#: field:outlook.installer,plugin_file:0
+msgid "Outlook Plug-in"
+msgstr "Outlook liitännäinen"
+
+#. module: outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr "Kuvaus"
+
+#. module: outlook
+#: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
+#: view:outlook.installer:0
+msgid "Outlook Plug-In"
+msgstr "Outlook liitännäinen"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Skip"
+msgstr "Ohita"
+
+#. module: outlook
+#: model:ir.module.module,shortdesc:outlook.module_meta_information
+msgid "Outlook Interface"
+msgstr "Outlook liittymä"
+
+#. module: outlook
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
+msgstr "Tiedostonimi"
+
+#. module: outlook
+#: field:outlook.installer,outlook:0
+msgid "Outlook Plug-in "
+msgstr "Outlook liitännäinen "
+
+#. 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 ""
+
+#. module: outlook
+#: help:outlook.installer,doc_file:0
+msgid "The documentation file :- how to install Outlook Plug-in."
+msgstr "Dokumentointi : -kuinka outlook liitännäinen asennetaan."
+
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr ""
+
+#. 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 liitännäisen konfiguraatio"
+
+#. module: outlook
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Konfiguraation eteneminen"
+
+#. 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 ""
+"Tämä liitännäien sallii sinun linkittää sähköpostisi OpenERP dokumentteihin. "
+"Voit liittää sen mihin tahansa OpenERP:iin  tai luoda uuden."
+
+#. 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 ""
+"Voit valita objektin jonka haluat liittää sähköpostiin ja sen liitteisiin."
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "title"
+msgstr "otsikko"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr ""
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Asennus ja konfigurointivaiheet"
+
+#. module: outlook
+#: field:outlook.installer,config_logo:0
+msgid "Image"
+msgstr "Kuva"
+
+#. 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 liitännäistiedosto. Talleta se tiedostona ja asenna outlookissa."
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Configure"
+msgstr "Konfiguroi"
diff --git a/addons/outlook/i18n/pt_BR.po b/addons/outlook/i18n/pt_BR.po
index 632c054af70..ebc9c361bbc 100644
--- a/addons/outlook/i18n/pt_BR.po
+++ b/addons/outlook/i18n/pt_BR.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-24 12:41+0000\n"
-"Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\n"
+"PO-Revision-Date: 2011-05-24 18:04+0000\n"
+"Last-Translator: Eduardo de Jesus <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-25 04:39+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
@@ -138,9 +138,9 @@ msgstr "Imagem"
 #: help:outlook.installer,plugin_file:0
 msgid ""
 "outlook plug-in file. Save as this file and install this plug-in in outlook."
-msgstr ""
+msgstr "Plug-in do Outlook. Salve e instale esse plug-in no Outlook."
 
 #. module: outlook
 #: view:outlook.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
diff --git a/addons/outlook/outlook_installer.xml b/addons/outlook/outlook_installer.xml
index e9fd756ff3d..1cb55f51e6e 100644
--- a/addons/outlook/outlook_installer.xml
+++ b/addons/outlook/outlook_installer.xml
@@ -9,10 +9,10 @@
             <field name="arch" type="xml">
                 <data>
                     <form position="attributes">
-                        <attribute name="string">Outlook Plug-In Configuration</attribute>
+                        <attribute name="string">Load Outlook Plug-In</attribute>
                     </form>
                     <separator string="title" position="attributes">
-                        <attribute name="string">Outlook Plug-In</attribute>
+                        <attribute name="string">Load 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>
@@ -49,7 +49,7 @@
         </record>
 
         <record id="action_outlook_installer" model="ir.actions.act_window">
-            <field name="name">Outlook Plug-In Configuration</field>
+            <field name="name">Load Outlook Plug-In</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">outlook.installer</field>
             <field name="view_id" ref="view_outlook_installer"/>
@@ -57,14 +57,17 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-
+        
         <record id="outlook_installer_todo" model="ir.actions.todo">
             <field name="action_id" ref="action_outlook_installer"/>
+            <field name="category_id" ref="base.category_sales_management_config"/>
+            <field name="type">normal</field>
+            <field name="state">skip</field>
             <field name="sequence">4</field>
         </record>
 
         <record id="action_outlook_wizard" model="ir.actions.act_window">
-            <field name="name">Outlook Plug-In Configuration</field>
+            <field name="name">Load Outlook Plug-In</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">outlook.installer</field>
             <field name="view_id" ref="view_outlook_installer"/>
@@ -81,7 +84,7 @@
 
         <menuitem id="menu_base_config_plugins_outlook"
                   action="action_outlook_wizard"
-                  name="Outlook Plug-In"
+                  name="Load Outlook Plug-In"
                   parent="base.menu_base_config_plugins"
                   sequence="10" />
     </data>
diff --git a/addons/pad/i18n/fi.po b/addons/pad/i18n/fi.po
new file mode 100644
index 00000000000..fbec40b9370
--- /dev/null
+++ b/addons/pad/i18n/fi.po
@@ -0,0 +1,77 @@
+# Finnish 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-06-20 09:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-21 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:32
+#, python-format
+msgid "Ok"
+msgstr "OK"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:29
+#, python-format
+msgid "Name"
+msgstr "Nimi"
+
+#. module: pad
+#: help:res.company,pad_index:0
+msgid "The root URL of the company's pad instance"
+msgstr "Peruspolku yrityksen PAD instassiin"
+
+#. module: pad
+#: model:ir.model,name:pad.model_res_company
+msgid "Companies"
+msgstr "Yritykset"
+
+#. module: pad
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Virhe! Et voi luoda sisäkkäisiä yrityksiä."
+
+#. module: pad
+#: code:addons/pad/web/editors.py:17
+#, python-format
+msgid "Write"
+msgstr "Kirjoita"
+
+#. 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 "Padin peruspolku (URL)"
+
+#. 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 "Parannettu tuki (Ether)PAD liitännöille"
diff --git a/addons/pad/i18n/tr.po b/addons/pad/i18n/tr.po
new file mode 100644
index 00000000000..39cfd9f874d
--- /dev/null
+++ b/addons/pad/i18n/tr.po
@@ -0,0 +1,77 @@
+# Turkish 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-05-28 19:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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-05-29 04:36+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:32
+#, python-format
+msgid "Ok"
+msgstr "Tamam"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:29
+#, python-format
+msgid "Name"
+msgstr "Ad"
+
+#. 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 "Firmalar"
+
+#. module: pad
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Hata! İç içe tekrarlayan şirketler seçemezsiniz."
+
+#. module: pad
+#: code:addons/pad/web/editors.py:17
+#, python-format
+msgid "Write"
+msgstr "Yaz"
+
+#. 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/i18n/zh_CN.po b/addons/pad/i18n/zh_CN.po
new file mode 100644
index 00000000000..1f7644a6c9e
--- /dev/null
+++ b/addons/pad/i18n/zh_CN.po
@@ -0,0 +1,80 @@
+# Chinese (Simplified) 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-07-07 16:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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-07-08 04:43+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:32
+#, python-format
+msgid "Ok"
+msgstr "确定"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:29
+#, python-format
+msgid "Name"
+msgstr "名称"
+
+#. module: pad
+#: help:res.company,pad_index:0
+msgid "The root URL of the company's pad instance"
+msgstr "公司PAD实例的根网址"
+
+#. module: pad
+#: model:ir.model,name:pad.model_res_company
+msgid "Companies"
+msgstr "公司"
+
+#. module: pad
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "错误！您不能创建递归公司."
+
+#. module: pad
+#: code:addons/pad/web/editors.py:17
+#, python-format
+msgid "Write"
+msgstr "写"
+
+#. 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 ""
+"\n"
+"在Web客户端加入增强的PAD附件支持，让公司自定义PAD的安装可以链接到新的PAD\n"
+"    "
+
+#. module: pad
+#: field:res.company,pad_index:0
+msgid "Pad root URL"
+msgstr "PAD根网址"
+
+#. 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 "增强支持PAD附件"
diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po
index e3a3804294a..45535da24dc 100644
--- a/addons/point_of_sale/i18n/zh_CN.po
+++ b/addons/point_of_sale/i18n/zh_CN.po
@@ -7,32 +7,33 @@ 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: 2011-01-24 15:18+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2011-06-29 01:01+0000\n"
+"Last-Translator: shjerryzhou <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-04-29 04:57+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-30 04:34+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
 msgid "Discount Notes"
-msgstr ""
+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 "日销售情况"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_confirm
 msgid "Point of Sale Confirm"
-msgstr ""
+msgstr "POS确认"
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "应用折扣"
 
@@ -44,7 +45,7 @@ msgstr "设为草稿"
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
 msgid "Product Nb."
-msgstr ""
+msgstr "产品号"
 
 #. module: point_of_sale
 #: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
@@ -54,41 +55,45 @@ msgstr "POS"
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Today"
-msgstr ""
+msgstr "今天"
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "增加业务伙伴:"
 
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
 msgid "All Cashboxes Of the day :"
-msgstr ""
+msgstr "当日所有钱箱"
 
 #. module: point_of_sale
 #: view:pos.box.entries:0
 msgid "Put Money"
-msgstr ""
+msgstr "存钱"
 
 #. 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 "收银机分析"
 
 #. 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 "销售详情"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
 msgid "Are you sure you want to close the statements ?"
-msgstr ""
+msgstr "你确定想关闭收银机吗？"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "扫描产品"
 
@@ -98,10 +103,10 @@ msgstr "扫描产品"
 #: view:report.pos.order:0
 #: field:report.pos.order,day:0
 msgid "Day"
-msgstr ""
+msgstr "天"
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "增加付款:"
 
@@ -109,7 +114,7 @@ msgstr "增加付款:"
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "My Sales"
-msgstr ""
+msgstr "我的销售订单"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_out
@@ -119,29 +124,31 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.sales.user.today.current.user:0
 msgid "Today's Sales By Current User"
-msgstr ""
+msgstr "此用户今天销售情况"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "金额"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "增值税"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Origin"
-msgstr ""
+msgstr "原始"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "税"
 
@@ -153,16 +160,17 @@ msgstr "交易数合计"
 #. module: point_of_sale
 #: help:account.journal,special_journal:0
 msgid "Will put all the orders in waiting status till being accepted"
-msgstr ""
+msgstr "将设置所有订单为等待状态，知道被接受"
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "业务伙伴"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "今天合计"
 
@@ -170,41 +178,47 @@ msgstr "今天合计"
 #: view:report.pos.order:0
 #: field:report.pos.order,average_price:0
 msgid "Average Price"
-msgstr ""
+msgstr "平均价格"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "折扣(%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "折扣合计"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "状态"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 msgid "Add payment"
-msgstr ""
+msgstr "新增付款"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
 msgid "Sales by month"
-msgstr ""
+msgstr "月销售情况"
 
 #. 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 "用户销售情况"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -216,62 +230,63 @@ msgstr "折扣(%)"
 #: field:pos.box.entries,ref:0
 #: field:pos.box.out,ref:0
 msgid "Ref"
-msgstr ""
+msgstr "关联单号"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "总价格"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "杂项"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
 #: report:pos.sales.user:0
 msgid "Sales Report"
-msgstr ""
+msgstr "销售报表"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_discount.py:52
 #, python-format
 msgid "No Order Lines"
-msgstr ""
+msgstr "无订单明细"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Other Information"
-msgstr ""
+msgstr "其它信息"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Product Type"
-msgstr ""
+msgstr "产品类型"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: view:pos.payment.report.date:0
 msgid "Dates"
-msgstr ""
+msgstr "日期"
 
 #. module: point_of_sale
 #: field:res.company,company_discount:0
 msgid "Max Discount(%)"
-msgstr ""
+msgstr "最大折扣(%)"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
-msgstr ""
+msgstr "现金登记管理"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
-msgstr ""
+msgstr "没找到有效的价格表明细。"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -281,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 "毛利"
 
 #. module: point_of_sale
 #: field:pos.order.line,discount:0
@@ -302,7 +317,7 @@ msgstr "总数量"
 #. 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 "用户月销售情况"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:54
@@ -311,57 +326,60 @@ msgid ""
 "You can not open a Cashbox for \"%s\".\n"
 "Please close its related cash register."
 msgstr ""
+"你不能为\"%s\"打开钱箱。\n"
+"请关闭相关的收银机。"
 
 #. module: point_of_sale
 #: help:pos.order,user_salesman_id:0
 msgid "User who is logged into the system."
-msgstr ""
+msgstr "系统的登录用户"
 
 #. module: point_of_sale
 #: field:product.product,income_pdt:0
 msgid "Product for Input"
-msgstr ""
+msgstr "输入类产品"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Mode of Payment"
-msgstr ""
+msgstr "支付方式"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
 msgid "Daily Operations"
-msgstr ""
+msgstr "日常操作"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Search Cash Statements"
-msgstr ""
+msgstr "查询现金对账单"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
 msgid "Are you sure you want to close your sales ?"
-msgstr ""
+msgstr "你确定要关闭你的销售订单吗？"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. 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 "用户月销售情况"
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "付款日期"
 
@@ -369,40 +387,42 @@ msgstr "付款日期"
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Closing Date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "October"
-msgstr ""
+msgstr "十月"
 
 #. module: point_of_sale
 #: field:account.bank.statement.line,am_out:0
 msgid "To count"
-msgstr ""
+msgstr "计算"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "摘要"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Quotations"
-msgstr ""
+msgstr "报价单"
 
 #. module: point_of_sale
 #: field:report.pos.order,delay_payment:0
 msgid "Delay Payment"
-msgstr ""
+msgstr "延期付款"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "数量"
 
@@ -414,10 +434,11 @@ msgstr ""
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Period"
-msgstr ""
+msgstr "期间"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "净合计:"
 
@@ -429,7 +450,7 @@ msgstr "说明"
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Codes"
-msgstr ""
+msgstr "编码"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
@@ -446,12 +467,15 @@ msgstr ""
 #: view:pos.sales.user.today:0
 #: view:pos.sales.user.today.current_user:0
 msgid "Print Report"
-msgstr ""
+msgstr "打印报表"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "单价"
 
@@ -459,7 +483,7 @@ msgstr "单价"
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
 #, python-format
 msgid "Please check that income account is set to %s"
-msgstr ""
+msgstr "请检查是否%s设置了收入类科目"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_add_product.py:56
@@ -469,30 +493,36 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_add_product
 #, python-format
 msgid "Add Product"
-msgstr ""
+msgstr "新增产品"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_am:0
 msgid "Invoice Amount"
-msgstr ""
+msgstr "发票金额"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "分类帐"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "电话:"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "付款"
 
@@ -500,7 +530,7 @@ msgstr "付款"
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "期末结余"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
@@ -510,7 +540,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.payment.report.date:0
 msgid "Sale by Date and User"
-msgstr ""
+msgstr "按日期和用户查看销售情况"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:69
@@ -518,11 +548,11 @@ msgstr ""
 msgid ""
 "Cannot delete a point of sale which is closed or contains confirmed "
 "cashboxes!"
-msgstr ""
+msgstr "不能删除已关闭或者有已确认钱箱的销售终端！"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "税收模式"
 
@@ -530,75 +560,78 @@ msgstr "税收模式"
 #: code:addons/point_of_sale/wizard/pos_close_statement.py:48
 #, python-format
 msgid "Cash registers are already closed."
-msgstr ""
+msgstr "收银机已关闭。"
 
 #. module: point_of_sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的EAN编码"
 
 #. 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 "开启收银机"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
 msgid "Save & New"
-msgstr ""
+msgstr "保存并新建"
 
 #. module: point_of_sale
 #: report:pos.details:0
 msgid "Sales total(Revenue)"
-msgstr ""
+msgstr "销售总计（总收入）"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "付款合计"
 
 #. module: point_of_sale
 #: field:account.journal,check_dtls:0
 msgid "Check Details"
-msgstr ""
+msgstr "详细检查"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "产品数量"
 
 #. module: point_of_sale
 #: field:pos.order,contract_number:0
 msgid "Contract Number"
-msgstr ""
+msgstr "联系号码"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. 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 "用户的产品"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"你必须在销售窗口选择一条报价单！\n"
+"请在选择某个产品之前设置它。"
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "小计"
 
@@ -607,39 +640,39 @@ msgstr "小计"
 #: model:ir.model,name:point_of_sale.model_pos_close_statement
 #: view:pos.close.statement:0
 msgid "Close Statements"
-msgstr ""
+msgstr "关闭收银机"
 
 #. module: point_of_sale
 #: view:account.journal:0
 msgid "Extended Configureation"
-msgstr ""
+msgstr "扩展配置"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Starting Balance"
-msgstr ""
+msgstr "期初余额"
 
 #. module: point_of_sale
 #: report:pos.payment.report.user:0
 msgid "Payment By User"
-msgstr ""
+msgstr "用户付款"
 
 #. module: point_of_sale
 #: field:pos.order,type_rec:0
 msgid "Type of Receipt"
-msgstr ""
+msgstr "收据类型"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# 明细"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_accepted
 msgid "Accepted Sales"
-msgstr ""
+msgstr "已接受的销售订单"
 
 #. module: point_of_sale
 #: help:account.journal,check_dtls:0
@@ -650,11 +683,10 @@ msgstr ""
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "St.Name"
-msgstr ""
+msgstr "St.Name"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "销售合计"
 
@@ -664,7 +696,7 @@ msgid "Sum of subtotals"
 msgstr "合计小计"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "付款日期"
 
@@ -681,9 +713,13 @@ msgstr "创建日期"
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
 msgid "Today's Sales"
-msgstr ""
+msgstr "今天的销售情况"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "POS "
@@ -696,31 +732,32 @@ msgid "Total :"
 msgstr "合计:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
-msgstr ""
+msgstr "明细创建失败！"
 
 #. module: point_of_sale
 #: field:report.sales.by.margin.pos,product_name:0
 #: field:report.sales.by.margin.pos.month,product_name:0
 msgid "Product Name"
-msgstr ""
+msgstr "产品名称"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "无效动作！"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "价格表"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "已开票合计"
 
@@ -728,17 +765,17 @@ msgstr "已开票合计"
 #: view:report.pos.order:0
 #: field:report.pos.order,product_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "数量#"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_return
 msgid "Point of sale return"
-msgstr ""
+msgstr "POS退款"
 
 #. 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 "按月利润率查看销售情况"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -747,15 +784,15 @@ 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 "订单日期"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Today's Closed Cashbox"
-msgstr ""
+msgstr "今日关闭的钱箱"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "发票草稿"
 
@@ -764,7 +801,7 @@ msgstr "发票草稿"
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "凭证金额必须和对账单明细上的金额一致"
 
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
@@ -775,7 +812,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sales_user_today_current_user
 #: view:pos.sales.user.today.current_user:0
 msgid "Sales for Current User"
-msgstr ""
+msgstr "当前用户的销售订单"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -786,26 +823,26 @@ msgstr "财务状况备注:"
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Opening Date"
-msgstr ""
+msgstr "开启日期"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Taxes :"
-msgstr ""
+msgstr "税："
 
 #. module: point_of_sale
 #: field:report.transaction.pos,disc:0
 msgid "Disc."
-msgstr ""
+msgstr "折扣"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "增值税:"
 
@@ -817,16 +854,16 @@ msgstr "POS单明细"
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Receipt :"
-msgstr ""
+msgstr "收据："
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "未知"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "日期"
@@ -834,17 +871,17 @@ msgstr "日期"
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "扩展过滤器..."
 
 #. module: point_of_sale
 #: field:pos.order,num_sale:0
 msgid "Internal Note"
-msgstr ""
+msgstr "内部备注"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "公司"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_transaction_pos
@@ -855,7 +892,7 @@ msgstr "POS交易"
 #: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "UserError "
-msgstr ""
+msgstr "UserError "
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_entries
@@ -863,21 +900,21 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
-msgstr ""
+msgstr "你不能修改此订单，它已经付款了。"
 
 #. module: point_of_sale
 #: field:pos.details,date_end:0
 #: field:pos.sale.user,date_end:0
 msgid "Date End"
-msgstr ""
+msgstr "结束日期"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Your Reference"
-msgstr ""
+msgstr "你的关联单号"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,no_trans:0
@@ -885,22 +922,21 @@ msgid "Number of Transaction"
 msgstr "交易数"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "取消"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Return Picking"
-msgstr ""
+msgstr "退回分拣单"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
@@ -910,36 +946,36 @@ msgstr "销售(参考)"
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Information"
-msgstr ""
+msgstr "信息"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl
 msgid "Input Operations"
-msgstr ""
+msgstr "输入操作"
 
 #. module: point_of_sale
 #: 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 "POS收银机分析"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_sales_user_today
 msgid "Sale by Users"
-msgstr ""
+msgstr "按用户查看销售订单"
 
 #. module: point_of_sale
 #: report:pos.payment.report:0
 msgid "Payment For Sale"
-msgstr ""
+msgstr "销售付款"
 
 #. module: point_of_sale
 #: field:pos.order,first_name:0
 msgid "First Name"
-msgstr ""
+msgstr "名字"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "其它"
 
@@ -958,28 +994,31 @@ msgstr "金额合计"
 #: 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 "收银机"
 
 #. module: point_of_sale
 #: view:account.journal:0
 #: field:account.journal,journal_users:0
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "价格"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
-msgstr "条码"
+msgstr "条形码"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "POS"
@@ -987,18 +1026,18 @@ msgstr "POS"
 #. module: point_of_sale
 #: field:report.cash.register,date:0
 msgid "Create Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
 msgid "Output Operations"
-msgstr ""
+msgstr "输出操作"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Start Period"
-msgstr ""
+msgstr "开始期间"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -1006,12 +1045,12 @@ msgstr ""
 #: report:pos.sales.user.today:0
 #: report:pos.sales.user.today.current.user:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_open_statement
 msgid "Open Cash Registers"
-msgstr ""
+msgstr "打开收银机"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1021,15 +1060,15 @@ 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 "每个公司的日记账名称必须唯一！"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "供应商退货"
 
@@ -1039,7 +1078,7 @@ msgstr "供应商退货"
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1049,53 +1088,54 @@ msgstr "POS单"
 #. 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 "所有关闭的钱箱"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
-msgstr ""
+msgstr "没有价格表！"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "选择待处理的销售单"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Order date"
-msgstr ""
+msgstr "订单日期"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "基础"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Account"
-msgstr ""
+msgstr "科目"
 
 #. module: point_of_sale
 #: field:pos.order,sale_manager:0
 msgid "Salesman Manager"
-msgstr ""
+msgstr "销售经理"
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "备注"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "销售单"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "税"
@@ -1103,12 +1143,13 @@ msgstr "税"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: 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 "销售明细"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "代码"
 
@@ -1118,30 +1159,30 @@ msgstr "代码"
 #: 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 "产品"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report
 msgid "Payment Report For Sale"
-msgstr ""
+msgstr "销售的支付报表"
 
 #. module: point_of_sale
 #: field:account.journal,special_journal:0
 msgid "Special Journal"
-msgstr ""
+msgstr "专用日记账"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_all_closed_cashbox_of_the_day
 msgid "All closed cashbox of the day"
-msgstr ""
+msgstr "当日所有关闭的钱箱"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Extra Info"
-msgstr ""
+msgstr "附加信息"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "传真:"
 
@@ -1179,21 +1220,27 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,price_type:0
 msgid "Price method"
-msgstr ""
+msgstr "定价方式"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Print the receipt of the sale"
-msgstr ""
+msgstr "打印销售订单的收据"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "分拣单"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "数量"
 
@@ -1201,18 +1248,25 @@ msgstr "数量"
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "Month -1"
-msgstr ""
+msgstr "上月"
 
 #. 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 "用户的销售订单"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "错误！"
@@ -1220,34 +1274,34 @@ msgstr "错误！"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_confirm
 msgid "Sale Confirm"
-msgstr ""
+msgstr "确认售出"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "state"
-msgstr ""
+msgstr "状态"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Prices"
-msgstr ""
+msgstr "价格"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
-msgstr ""
+msgstr "请为产品%s提供一个科目"
 
 #. module: point_of_sale
 #: field:report.pos.order,delay_validation:0
 msgid "Delay Validation"
-msgstr ""
+msgstr "验证延迟"
 
 #. module: point_of_sale
 #: field:pos.order,nb_print:0
@@ -1257,29 +1311,29 @@ msgstr "打印数"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_make_payment
 msgid "Point of Sale Payment"
-msgstr ""
+msgstr "POS付款"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "End Period"
-msgstr ""
+msgstr "结束期间"
 
 #. module: point_of_sale
 #: field:account.journal,auto_cash:0
 msgid "Automatic Opening"
-msgstr ""
+msgstr "自动打开"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_ded:0
 msgid "Discount(Amount)"
-msgstr ""
+msgstr "折扣（金额）"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_add_product.py:51
 #, python-format
 msgid "Active ID is not found"
-msgstr ""
+msgstr "没有发现有效的ID"
 
 #. module: point_of_sale
 #: field:account.bank.statement.line,is_acc:0
@@ -1292,7 +1346,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,month:0
 msgid "Month"
-msgstr ""
+msgstr "本月"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1302,7 +1356,7 @@ msgstr "POS销售单"
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
-msgstr ""
+msgstr "对账单名称"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
@@ -1311,114 +1365,121 @@ msgstr ""
 #: field:pos.box.out,journal_id:0
 #: field:pos.make.payment,journal:0
 msgid "Cash Register"
-msgstr ""
+msgstr "收银机"
 
 #. module: point_of_sale
 #: field:pos.payment.report.date,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_receipt
 msgid "Point of sale receipt"
-msgstr ""
+msgstr "POS收银条"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_payment.py:91
 #, python-format
 msgid "No order lines defined for this sale "
-msgstr ""
+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 "按用户日利润率查看销售报表"
 
 #. module: point_of_sale
 #: field:pos.order,note_2:0
 msgid "Customer Note"
-msgstr ""
+msgstr "客户备注"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
-msgstr ""
+msgstr "订单没有订单明细"
 
 #. module: point_of_sale
 #: field:report.cash.register,balance_start:0
 msgid "Opening Balance"
-msgstr ""
+msgstr "期初余额"
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "付款"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
 msgid "All sales lines"
-msgstr ""
+msgstr "所有销售明细"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
 #: selection:report.cash.register,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "报价单"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "合计:"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
 msgid "Sales by margin"
-msgstr ""
+msgstr "按利润率查看销售"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_config_journal
 msgid "Journal Configuration"
-msgstr ""
+msgstr "日记账配置"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Statement lines"
-msgstr ""
+msgstr "对账单明细"
 
 #. module: point_of_sale
 #: help:pos.order,user_id:0
 msgid ""
 "Person who uses the the cash register. It could be a reliever, a student or "
 "an interim employee."
-msgstr ""
+msgstr "使用收银机的人。可以是一个救济者，学生或临时员工。"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_id:0
 msgid "Nbr Invoice"
-msgstr ""
+msgstr "发票编号"
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "收入"
 
 #. module: point_of_sale
 #: field:pos.order,invoice_wanted:0
 msgid "Create Invoice"
-msgstr "创建发票"
+msgstr "生成发票"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "完成"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "发票"
 
@@ -1431,11 +1492,10 @@ msgstr ""
 #: view:account.bank.statement:0
 #: selection:report.cash.register,state:0
 msgid "Open"
-msgstr ""
+msgstr "开放"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "单据参考"
 
@@ -1443,7 +1503,7 @@ msgstr "单据参考"
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_repport_date
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_payment_report_date
 msgid "Sales lines Report"
-msgstr ""
+msgstr "销售明细报表"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_entries
@@ -1454,34 +1514,42 @@ msgstr ""
 #. module: point_of_sale
 #: selection:pos.order,price_type:0
 msgid "Tax excluded"
-msgstr ""
+msgstr "不含税"
 
 #. module: point_of_sale
 #: 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 "单位数量的毛利润"
 
 #. 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 "按用户和利润查看销售情况"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "税:"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_pos_order
 msgid "Point of Sale Orders Statistics"
-msgstr ""
+msgstr "POS订单统计"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "产品"
 
@@ -1493,23 +1561,23 @@ msgstr "销售单明细"
 #. module: point_of_sale
 #: field:product.product,disc_controle:0
 msgid "Discount Control"
-msgstr ""
+msgstr "折扣控制"
 
 #. module: point_of_sale
 #: field:report.cash.register,balance_end_real:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "期末余额"
 
 #. 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 "销售详情"
 
 #. module: point_of_sale
 #: field:pos.payment.report.date,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: point_of_sale
 #: field:pos.order,date_order:0
@@ -1520,68 +1588,73 @@ msgstr "订单日期"
 #: 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 "用户销售明细"
 
 #. module: point_of_sale
 #: field:res.company,max_diff:0
 msgid "Max Difference for Cashboxes"
-msgstr ""
+msgstr "钱箱最大的差异"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "Yes"
-msgstr ""
+msgstr "是"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "没有为此产品定义收入类科目： \\\"%s\\\" (id:%d)"
 
 #. module: point_of_sale
 #: view:pos.make.payment:0
 msgid "The cash register must be opened to be able to execute a payment."
-msgstr ""
+msgstr "收银机必须处于开启状态才能处理支付业务。"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Net Total :"
-msgstr ""
+msgstr "总净重："
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Product Description"
-msgstr ""
+msgstr "产品描述"
 
 #. module: point_of_sale
 #: field:pos.details,date_start:0
 #: field:pos.sale.user,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "开始日期"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "合计"
 
 #. module: point_of_sale
 #: view:pos.sale.user:0
 msgid "Sale By User"
-msgstr ""
+msgstr "用户的销售订单"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
 msgid "Open Cash Register"
-msgstr ""
+msgstr "开启收银机"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: model:ir.actions.report.xml,name:point_of_sale.account_statement
 msgid "Statement"
-msgstr ""
+msgstr "银行单据"
 
 #. module: point_of_sale
 #: field:pos.order,name:0
@@ -1591,7 +1664,7 @@ msgstr "订单描述"
 #. module: point_of_sale
 #: field:pos.make.payment,num_sale:0
 msgid "Num.File"
-msgstr ""
+msgstr "Num.File"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment_report
@@ -1599,54 +1672,70 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_payment_report
 #: view:pos.payment.report:0
 msgid "Payment Report"
-msgstr ""
+msgstr "付款分析报表"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_view_pos_return
 msgid "Return lines"
-msgstr ""
+msgstr "退货明细"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "公司"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "发票日期"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
+"找不到此产品和数量的价格表。\n"
+"你必须修改产品，或价格表的数量。"
 
 #. module: point_of_sale
 #: field:pos.order.line,serial_number:0
 msgid "Serial Number"
-msgstr ""
+msgstr "序列号"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Reprint"
-msgstr ""
+msgstr "重新打印"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "You have to open at least one cashbox"
-msgstr ""
+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 "今日用户的付款分析"
 
 #. module: point_of_sale
 #: field:stock.picking,pos_order:0
@@ -1658,74 +1747,73 @@ msgstr "POS单"
 #: code:addons/point_of_sale/wizard/pos_payment.py:91
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "出错！"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "条款号"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "有效期"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "领料/提货"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "商店"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr "最近输出的领料/提货"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "银行对账单明细"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "银行对账单"
 
 #. module: point_of_sale
 #: report:pos.user.product:0
 msgid "Ending Date"
-msgstr ""
+msgstr "结束日期"
 
 #. 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分析报表"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_discount
 msgid "Add Discount"
-msgstr ""
+msgstr "增加折扣"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
 msgid "Close Cash Register"
-msgstr ""
+msgstr "关闭收银机"
 
 #. module: point_of_sale
 #: field:pos.order.line,qty_rfd:0
 msgid "Refunded Quantity"
-msgstr ""
+msgstr "退货数量"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "扫描条码"
 
@@ -1733,62 +1821,63 @@ msgstr "扫描条码"
 #: field:pos.box.entries,product_id:0
 #: field:pos.box.out,product_id:0
 msgid "Operation"
-msgstr ""
+msgstr "操作"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 msgid "Sales Order"
-msgstr ""
+msgstr "销售订单"
 
 #. module: point_of_sale
 #: field:pos.order,journal_entry:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "日记账簿"
 
 #. module: point_of_sale
 #: selection:report.cash.register,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "已确认"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "已取消的发票"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "确定"
 
 #. module: point_of_sale
 #: report:pos.payment.report.date:0
 msgid "Sales Lines"
-msgstr ""
+msgstr "销售明细"
 
 #. module: point_of_sale
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "错误！您不能创建递归公司."
 
 #. module: point_of_sale
 #: field:pos.discount,discount:0
 msgid "Discount "
-msgstr ""
+msgstr "折扣 "
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "供应商发票"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
-msgstr ""
+msgstr "明细修改失败！"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "付款名称"
 
@@ -1805,7 +1894,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today_current_user
 msgid "Today's Sales by Current User"
-msgstr ""
+msgstr "当前用户今日销售订单"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_out
@@ -1815,58 +1904,58 @@ msgstr ""
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "每个公司的日记账代码必须唯一！"
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "设置"
 
 #. module: point_of_sale
 #: report:pos.user.product:0
 msgid "Starting Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: point_of_sale
 #: field:pos.order,date_validation:0
 #: field:report.pos.order,date_validation:0
 msgid "Validation Date"
-msgstr ""
+msgstr "审核日期"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
-msgstr ""
+msgstr "你没有权限审核此销售订单！"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
 msgid "Invoices"
-msgstr ""
+msgstr "发票"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,total_discount:0
 msgid "Total Discount"
-msgstr ""
+msgstr "总折扣"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Take Money"
-msgstr ""
+msgstr "取钱"
 
 #. 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 "销售明细"
 
 #. module: point_of_sale
 #: field:product.product,am_out:0
@@ -1878,26 +1967,35 @@ msgstr ""
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:54
 #, python-format
 msgid "Message"
-msgstr ""
+msgstr "消息"
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "POS"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "销售员"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "已开票"
 
@@ -1906,20 +2004,21 @@ msgstr "已开票"
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "No"
-msgstr ""
+msgstr "否"
 
 #. module: point_of_sale
 #: field:pos.order.line,notice:0
 msgid "Discount Notice"
-msgstr ""
+msgstr "折扣通告"
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "增加"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "草稿"
 
@@ -1931,45 +2030,57 @@ msgstr "POS单明细"
 #. module: point_of_sale
 #: view:pos.open.statement:0
 msgid "Are you sure you want to open the statements ?"
-msgstr ""
+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付款分析报表"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "形式发票"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
-msgstr ""
+msgstr "请提供业务伙伴。"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
-msgstr ""
+msgstr "没有为此日记账：\"%s\" (id:%d)定义应收账款科目"
 
 #. module: point_of_sale
 #: field:pos.order,user_salesman_id:0
 msgid "Cashier"
-msgstr ""
+msgstr "收银员"
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "用户"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "销售用户"
 
@@ -1977,26 +2088,32 @@ msgstr "销售用户"
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Print Receipt"
-msgstr ""
+msgstr "打印收银条"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Orders lines"
-msgstr ""
+msgstr "POS订单明细"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "错误"
@@ -2004,40 +2121,49 @@ msgstr "错误"
 #. module: point_of_sale
 #: field:report.transaction.pos,journal_id:0
 msgid "Sales Journal"
-msgstr ""
+msgstr "销售日记账"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "退货"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
-msgstr ""
+msgstr "请为此销售单生成发票。"
 
 #. module: point_of_sale
 #: report:pos.sales.user:0
 #: report:pos.sales.user.today:0
 #: field:report.pos.order,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "订购日期"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_close_statement
 msgid "Close Cash Registers"
-msgstr ""
+msgstr "关闭收银机"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.payment.report.date:0
 #: report:pos.payment.report.user:0
 msgid "Disc(%)"
-msgstr ""
+msgstr "折扣（%）"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "关闭"
 
@@ -2049,32 +2175,32 @@ msgstr "单据明细"
 #. module: point_of_sale
 #: field:pos.order.line,price_subtotal:0
 msgid "Subtotal w/o Tax"
-msgstr ""
+msgstr "税额小计w/o"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Add product"
-msgstr ""
+msgstr "添加产品"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
 msgid "Pyament Report"
-msgstr ""
+msgstr "付款分析报表"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,jl_id:0
 msgid "Cash Journals"
-msgstr ""
+msgstr "现金日记账"
 
 #. module: point_of_sale
 #: view:pos.details:0
 msgid "POS Details :"
-msgstr ""
+msgstr "POS详情："
 
 #. module: point_of_sale
 #: report:pos.sales.user.today:0
 msgid "Today's Sales By User"
-msgstr ""
+msgstr "今日用户销售情况"
 
 #. module: point_of_sale
 #: view:pos.box.entries:0
@@ -2086,14 +2212,14 @@ msgstr ""
 #: code:addons/point_of_sale/wizard/pos_box_out.py:99
 #, python-format
 msgid "please check that account is set to %s"
-msgstr ""
+msgstr "请检查科目是否设置为%s"
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "说明"
 
@@ -2101,39 +2227,39 @@ msgstr "说明"
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Sales lines"
-msgstr ""
+msgstr "销售明细"
 
 #. module: point_of_sale
 #: field:pos.order,note:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "内部备注"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
 msgid "Save & Close"
-msgstr ""
+msgstr "保存并关闭"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Running"
-msgstr ""
+msgstr "正在运行"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_all_closed_cashbox_of_the_day
 msgid "All Cashboxes Of the day"
-msgstr ""
+msgstr "当日所有钱箱"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all
 #: 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 "POS分析"
 
 #. module: point_of_sale
 #: field:pos.make.payment,partner_id:0
@@ -2141,7 +2267,7 @@ msgstr ""
 #: field:pos.order,partner_id:0
 #: view:report.pos.order:0
 msgid "Customer"
-msgstr ""
+msgstr "客户"
 
 #. module: point_of_sale
 #: field:pos.make.payment,is_acc:0
@@ -2149,18 +2275,18 @@ msgstr ""
 #: selection:pos.order,state:0
 #: selection:report.pos.order,state:0
 msgid "Advance"
-msgstr ""
+msgstr "预支"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "    Today    "
-msgstr ""
+msgstr "    今日    "
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_out.py:95
@@ -2169,42 +2295,53 @@ msgid ""
 "The maximum value you can still withdraw is exceeded. \n"
 " Remaining value is equal to %d "
 msgstr ""
+"超出你能提取的最大金额。\n"
+"当前余额是%d。 "
 
 #. module: point_of_sale
 #: field:pos.order,remboursed:0
 msgid "Remboursed"
-msgstr ""
+msgstr "已报销"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree_open
 msgid "Opened Sales"
-msgstr ""
+msgstr "未结销售订单"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "付款"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "打印日期"
 
 #. 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 "按用户月利润查看销售情况"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "查询销售订单"
 
 #. module: point_of_sale
 #: field:pos.order,account_move:0
@@ -2218,13 +2355,13 @@ msgstr "凭证"
 #: view:pos.order:0
 #, python-format
 msgid "Make Payment"
-msgstr ""
+msgstr "付款"
 
 #. 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 "今日用户销售情况"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -2232,7 +2369,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #~ msgid "Detail of Sales"
 #~ msgstr "销售详情"
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 1f4df6e482f..31c580ba506 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -250,20 +250,19 @@ class pos_order(osv.osv):
             states={'draft': [('readonly', False)]}, readonly=True),
         'date_order': fields.datetime('Date Ordered', readonly=True, select=True),
         'date_validation': fields.function(_get_date_payment,
-                                           method=True,
                                            string='Validation Date',
                                            type='date', select=True, store=True),
-        'date_payment': fields.function(_get_date_payment2, method=True,
+        'date_payment': fields.function(_get_date_payment2,
                                         string='Payment Date',
                                         type='date', select=True, store=True),
         'date_validity': fields.date('Validity Date', required=True),
         'user_id': fields.many2one('res.users', 'Connected Salesman', help="Person who uses the the cash register. It could be a reliever, a student or an interim employee."),
         'user_salesman_id': fields.many2one('res.users', 'Cashier', required=True, help="User who is logged into the system."),
         'sale_manager': fields.many2one('res.users', 'Salesman Manager'),
-        'amount_tax': fields.function(_amount_all, method=True, string='Taxes', digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
-        'amount_total': fields.function(_amount_all, method=True, string='Total', multi='all'),
-        'amount_paid': fields.function(_amount_all, string='Paid', states={'draft': [('readonly', False)]}, readonly=True, method=True, digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
-        'amount_return': fields.function(_amount_all, 'Returned', method=True, digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
+        'amount_tax': fields.function(_amount_all, string='Taxes', digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
+        'amount_total': fields.function(_amount_all, string='Total', multi='all'),
+        'amount_paid': fields.function(_amount_all, string='Paid', states={'draft': [('readonly', False)]}, readonly=True, digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
+        'amount_return': fields.function(_amount_all, 'Returned', digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
         'lines': fields.one2many('pos.order.line', 'order_id', 'Order Lines', states={'draft': [('readonly', False)]}, readonly=True),
         'price_type': fields.selection([
                                 ('tax_excluded','Tax excluded')],
@@ -955,7 +954,7 @@ class account_bank_statement_line(osv.osv):
             res[line.id] = line.statement_id and line.statement_id.journal_id and line.statement_id.journal_id.name or None
         return res
     _columns= {
-        'journal_id': fields.function(_get_statement_journal, method=True,store=True, string='Journal', type='char', size=64),
+        'journal_id': fields.function(_get_statement_journal,store=True, string='Journal', type='char', size=64),
         'am_out': fields.boolean("To count"),
         'is_acc': fields.boolean("Is accompte"),
         'pos_statement_id': fields.many2one('pos.order', ondelete='cascade'),
@@ -1141,12 +1140,12 @@ class pos_order_line(osv.osv):
         'notice': fields.char('Discount Notice', size=128, required=True),
         'serial_number': fields.char('Serial Number', size=128),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], required=True, change_default=True),
-        'price_unit': fields.function(_get_amount, method=True, string='Unit Price', store=True),
+        'price_unit': fields.function(_get_amount, string='Unit Price', store=True),
         'price_ded': fields.float('Discount(Amount)', digits_compute=dp.get_precision('Point Of Sale')),
         'qty': fields.float('Quantity'),
         'qty_rfd': fields.float('Refunded Quantity'),
-        'price_subtotal': fields.function(_amount_line_all, method=True, multi='pos_order_line_amount', string='Subtotal w/o Tax'),
-        'price_subtotal_incl': fields.function(_amount_line_all, method=True, multi='pos_order_line_amount', string='Subtotal'),
+        'price_subtotal': fields.function(_amount_line_all, multi='pos_order_line_amount', string='Subtotal w/o Tax'),
+        'price_subtotal_incl': fields.function(_amount_line_all, multi='pos_order_line_amount', string='Subtotal'),
         'discount': fields.float('Discount (%)', digits=(16, 2)),
         'order_id': fields.many2one('pos.order', 'Order Ref', ondelete='cascade'),
         'create_date': fields.datetime('Creation Date', readonly=True),
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index e08ec7cbaf9..1435f6cc2b6 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -639,12 +639,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Other">
-                      <field  name="company_discount" colspan="4"/>
-                      <field  name="max_diff" colspan="4"/>
-                    </page>
-                </notebook>
+                <field name="currency_id" position="after">
+                    <separator string="Point of Sale" colspan="4"/>
+                    <field  name="company_discount" />
+                    <field  name="max_diff" />
+                </field>
             </field>
            </record>
 
@@ -654,15 +653,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group[@name='misc']" position="before">
-                    <group colspan="2" col="2">
-                        <separator string="Point of Sale" colspan="2"/>
-                        <field name="income_pdt" string="Product for Input Operation"/>
-                        <field name="expense_pdt" string="Product for Output Operation"/>
-                        <field name="am_out"/>
-                        <field name="disc_controle"/>
-                    </group>
-                </xpath>
+                  <field name="company_id" position="after">
+                  <separator string="Point of Sale" colspan="2"/>
+                      <field name="income_pdt"/>
+                      <field name="expense_pdt"/>
+                      <field name="am_out"/>
+                      <field name="disc_controle"/>
+                  </field>
             </field>
         </record>
 
diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py
new file mode 100644
index 00000000000..89397d2eab5
--- /dev/null
+++ b/addons/portal/__init__.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.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/>.
+#
+##############################################################################
+
+import portal
+import wizard
+import res_user
+import ir_ui_menu
+
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
new file mode 100644
index 00000000000..6bb69cd91c9
--- /dev/null
+++ b/addons/portal/__openerp__.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.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/>.
+#
+##############################################################################
+
+{
+    'name' : "Portal",
+    'version' : "1.0",
+    'depends' : ["base", "share"],
+    'author' : "OpenERP SA",
+    'category': 'Tools',
+    'description': """
+This module defines 'portals' to customize the access to your OpenERP database
+for external users.
+
+A portal defines customized user menu and access rights for a group of users
+(the ones associated to that portal).  It also associates user groups to the
+portal users (adding a group in the portal automatically adds it to the portal
+users, etc).  That feature is very handy when used in combination with the
+module 'share'.
+    """,
+    'website': 'http://www.openerp.com',
+    'data': [
+        'security/portal_security.xml',
+        'security/ir.model.access.csv',
+        'portal_view.xml',
+        'res_user_view.xml',
+        'wizard/portal_wizard_view.xml',
+        'wizard/share_wizard_view.xml',
+    ],
+    'installable': True,
+    'certificate' : '',
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal/i18n/en_US.po b/addons/portal/i18n/en_US.po
new file mode 100644
index 00000000000..ffc18da1f14
--- /dev/null
+++ b/addons/portal/i18n/en_US.po
@@ -0,0 +1,393 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* portal
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1-dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-07-04 14:16+0000\n"
+"PO-Revision-Date: 2011-07-04 14:16+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:55
+#, python-format
+msgid "Please select at least one user to share with"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:59
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,group_id:0
+msgid "Group"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,other_group_ids:0
+msgid "Those groups are assigned to the portal's users"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,group_ids:0
+msgid "Existing groups"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal_wizard_user
+msgid "Portal User Config"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard.user:0
+msgid "Portal User"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,override_menu:0
+msgid "Enable this option to override the Menu Action of portal users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,user_email:0
+msgid "E-mail"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Other Groups assigned to Users"
+msgstr ""
+
+#. module: portal
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+#: field:res.portal,widget_ids:0
+msgid "Widgets"
+msgstr ""
+
+#. module: portal
+#: model:ir.module.module,description:portal.module_meta_information
+msgid "\n"
+"This module defines 'portals' to customize the access to your OpenERP database\n"
+"for external users.\n"
+"\n"
+"A portal defines customized user menu and access rights for a group of users\n"
+"(the ones associated to that portal).  It also associates user groups to the\n"
+"portal users (adding a group in the portal automatically adds it to the portal\n"
+"users, etc).  That feature is very handy when used in combination with the\n"
+"module 'share'.\n"
+"    "
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+msgid "Who do you want to share with?"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid "Send Invitations"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,url:0
+msgid "The url where portal users can connect to the server"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.widget,widget_id:0
+msgid "Widget"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard,message:0
+msgid "This text is included in the welcome email sent to the users"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,menu_action_id:0
+msgid "If set, replaces the standard menu for the portal's users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,parent_menu_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Portal Name"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard.user:0
+msgid "Portal Users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,override_menu:0
+msgid "Override Menu Action of Users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,menu_action_id:0
+msgid "Menu Action"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,name:0
+msgid "User Name"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal_widget
+msgid "Portal Widgets"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal
+#: model:ir.module.module,shortdesc:portal.module_meta_information
+#: view:res.portal:0
+#: field:res.portal.widget,portal_id:0
+#: field:res.portal.wizard,portal_id:0
+msgid "Portal"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:35
+#, python-format
+msgid "Your OpenERP account at %(company)s"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/portal.py:110
+#: code:addons/portal/portal.py:184
+#, python-format
+msgid "%s Menu"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard,portal_id:0
+msgid "The portal in which new users must be added"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,widget_ids:0
+msgid "Widgets assigned to portal users"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:163
+#, python-format
+msgid "(missing url)"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,user_ids:0
+msgid "Existing users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard.user,user_email:0
+msgid "Will be used as user login.  Also necessary to send the account information to new users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,url:0
+msgid "URL"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Widgets assigned to Users"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard.user,lang:0
+msgid "The language for the user's user interface"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Website"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Create Parent Menu"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid "The following text will be included in the welcome email sent to users."
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:135
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: portal
+#: constraint:res.portal.wizard.user:0
+msgid "Invalid email address"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:136
+#, python-format
+msgid "You must have an email address in your User Preferences to send emails."
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_ir_ui_menu
+msgid "ir.ui.menu"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,group_id:0
+msgid "The group extended by this portal"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+#: view:res.portal.wizard:0
+#: field:res.portal.wizard,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,other_group_ids:0
+msgid "Other User Groups"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.portal_list_action
+#: model:ir.ui.menu,name:portal.portal_list_menu
+#: model:ir.ui.menu,name:portal.portal_menu
+#: view:res.portal:0
+msgid "Portals"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,parent_menu_id:0
+msgid "The menu action opens the submenus of this menu item"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.widget,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: portal
+#: field:res.users,partner_id:0
+msgid "Related Partner"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Portal Menu"
+msgstr ""
+
+#. module: portal
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+#: field:res.portal.wizard,message:0
+msgid "Invitation message"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:36
+#, python-format
+msgid "Dear %(name)s,\n"
+"\n"
+"You have been created an OpenERP account at %(url)s.\n"
+"\n"
+"Your login account data is:\n"
+"Database: %(db)s\n"
+"User:     %(login)s\n"
+"Password: %(password)s\n"
+"\n"
+"%(message)s\n"
+"\n"
+"--\n"
+"OpenERP - Open Source Business Applications\n"
+"http://www.openerp.com\n"
+""
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal_wizard
+msgid "Portal Wizard"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard.user,name:0
+msgid "The user's real name"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.address_wizard_action
+#: model:ir.actions.act_window,name:portal.partner_wizard_action
+#: view:res.portal.wizard:0
+msgid "Add Portal Access"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,help:portal.portal_list_action
+msgid "\n"
+"A portal helps defining specific views and rules for a group of users (the\n"
+"portal group).  A portal menu, widgets and specific groups may be assigned to\n"
+"the portal's users.\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_share_wizard
+msgid "Share Wizard"
+msgstr ""
+
diff --git a/addons/portal/i18n/portal.pot b/addons/portal/i18n/portal.pot
new file mode 100644
index 00000000000..ffc18da1f14
--- /dev/null
+++ b/addons/portal/i18n/portal.pot
@@ -0,0 +1,393 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* portal
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1-dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-07-04 14:16+0000\n"
+"PO-Revision-Date: 2011-07-04 14:16+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:55
+#, python-format
+msgid "Please select at least one user to share with"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:59
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,group_id:0
+msgid "Group"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,other_group_ids:0
+msgid "Those groups are assigned to the portal's users"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,group_ids:0
+msgid "Existing groups"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal_wizard_user
+msgid "Portal User Config"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard.user:0
+msgid "Portal User"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,override_menu:0
+msgid "Enable this option to override the Menu Action of portal users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,user_email:0
+msgid "E-mail"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Other Groups assigned to Users"
+msgstr ""
+
+#. module: portal
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+#: field:res.portal,widget_ids:0
+msgid "Widgets"
+msgstr ""
+
+#. module: portal
+#: model:ir.module.module,description:portal.module_meta_information
+msgid "\n"
+"This module defines 'portals' to customize the access to your OpenERP database\n"
+"for external users.\n"
+"\n"
+"A portal defines customized user menu and access rights for a group of users\n"
+"(the ones associated to that portal).  It also associates user groups to the\n"
+"portal users (adding a group in the portal automatically adds it to the portal\n"
+"users, etc).  That feature is very handy when used in combination with the\n"
+"module 'share'.\n"
+"    "
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+msgid "Who do you want to share with?"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid "Send Invitations"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,url:0
+msgid "The url where portal users can connect to the server"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.widget,widget_id:0
+msgid "Widget"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard,message:0
+msgid "This text is included in the welcome email sent to the users"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,menu_action_id:0
+msgid "If set, replaces the standard menu for the portal's users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,parent_menu_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Portal Name"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard.user:0
+msgid "Portal Users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,override_menu:0
+msgid "Override Menu Action of Users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,menu_action_id:0
+msgid "Menu Action"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,name:0
+msgid "User Name"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal_widget
+msgid "Portal Widgets"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal
+#: model:ir.module.module,shortdesc:portal.module_meta_information
+#: view:res.portal:0
+#: field:res.portal.widget,portal_id:0
+#: field:res.portal.wizard,portal_id:0
+msgid "Portal"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:35
+#, python-format
+msgid "Your OpenERP account at %(company)s"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/portal.py:110
+#: code:addons/portal/portal.py:184
+#, python-format
+msgid "%s Menu"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard,portal_id:0
+msgid "The portal in which new users must be added"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,widget_ids:0
+msgid "Widgets assigned to portal users"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:163
+#, python-format
+msgid "(missing url)"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,user_ids:0
+msgid "Existing users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard.user,user_email:0
+msgid "Will be used as user login.  Also necessary to send the account information to new users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,url:0
+msgid "URL"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Widgets assigned to Users"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard.user,lang:0
+msgid "The language for the user's user interface"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Website"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Create Parent Menu"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid "The following text will be included in the welcome email sent to users."
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:135
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: portal
+#: constraint:res.portal.wizard.user:0
+msgid "Invalid email address"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:136
+#, python-format
+msgid "You must have an email address in your User Preferences to send emails."
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_ir_ui_menu
+msgid "ir.ui.menu"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,group_id:0
+msgid "The group extended by this portal"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+#: view:res.portal.wizard:0
+#: field:res.portal.wizard,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,other_group_ids:0
+msgid "Other User Groups"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.portal_list_action
+#: model:ir.ui.menu,name:portal.portal_list_menu
+#: model:ir.ui.menu,name:portal.portal_menu
+#: view:res.portal:0
+msgid "Portals"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,parent_menu_id:0
+msgid "The menu action opens the submenus of this menu item"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.widget,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: portal
+#: field:res.users,partner_id:0
+msgid "Related Partner"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Portal Menu"
+msgstr ""
+
+#. module: portal
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+#: field:res.portal.wizard,message:0
+msgid "Invitation message"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:36
+#, python-format
+msgid "Dear %(name)s,\n"
+"\n"
+"You have been created an OpenERP account at %(url)s.\n"
+"\n"
+"Your login account data is:\n"
+"Database: %(db)s\n"
+"User:     %(login)s\n"
+"Password: %(password)s\n"
+"\n"
+"%(message)s\n"
+"\n"
+"--\n"
+"OpenERP - Open Source Business Applications\n"
+"http://www.openerp.com\n"
+""
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal_wizard
+msgid "Portal Wizard"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard.user,name:0
+msgid "The user's real name"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.address_wizard_action
+#: model:ir.actions.act_window,name:portal.partner_wizard_action
+#: view:res.portal.wizard:0
+msgid "Add Portal Access"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,help:portal.portal_list_action
+msgid "\n"
+"A portal helps defining specific views and rules for a group of users (the\n"
+"portal group).  A portal menu, widgets and specific groups may be assigned to\n"
+"the portal's users.\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_share_wizard
+msgid "Share Wizard"
+msgstr ""
+
diff --git a/addons/portal/ir_ui_menu.py b/addons/portal/ir_ui_menu.py
new file mode 100644
index 00000000000..a4fe364a4fd
--- /dev/null
+++ b/addons/portal/ir_ui_menu.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.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/>.
+#
+##############################################################################
+
+import logging
+
+from osv import osv, fields
+from tools.safe_eval import safe_eval
+
+class portal_menu(osv.osv):
+    """
+        Fix menu class to customize the login search for menus,
+        as web client 6.0 does not support the menu action properly yet
+    """
+    _name = 'ir.ui.menu'
+    _inherit = 'ir.ui.menu'
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        if context is None:
+            context = {}
+        
+        # if the user belongs to a portal, we have to rewrite any search on the
+        # top menus to be under the portal's parent menu
+        if not context.get('ir.ui.menu.full_list') and uid != 1 and \
+                args == [('parent_id', '=', False)]:
+            portal_obj = self.pool.get('res.portal')
+            portal_ids = portal_obj.search(cr, uid, [('users', 'in', uid)])
+            if portal_ids:
+                if len(portal_ids) > 1:
+                    log = logging.getLogger('ir.ui.menu')
+                    log.warning('User %s belongs to several portals', str(uid))
+                p = portal_obj.browse(cr, uid, portal_ids[0])
+                # if the portal overrides the menu, use its domain
+                if p.menu_action_id:
+                    args = safe_eval(p.menu_action_id.domain)
+        
+        return super(portal_menu, self).search(cr, uid, args, offset=offset,
+                    limit=limit, order=order, context=context, count=count)
+
+portal_menu()
+
diff --git a/addons/portal/portal.py b/addons/portal/portal.py
new file mode 100644
index 00000000000..78483d6a1f1
--- /dev/null
+++ b/addons/portal/portal.py
@@ -0,0 +1,235 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.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/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+
+
+class portal(osv.osv):
+    """
+        A portal is a group of users with specific menu, widgets, and typically
+        restricted access rights.
+    """
+    _name = 'res.portal'
+    _description = 'Portal'
+    _inherits = {'res.groups': 'group_id'}
+    
+    _columns = {
+        'group_id': fields.many2one('res.groups', required=True, ondelete='cascade',
+            string='Group',
+            help='The group extended by this portal'),
+        'other_group_ids': fields.many2many('res.groups',
+            'portal_group_rel', 'portal_id', 'group_id',
+            string='Other User Groups',
+            help="Those groups are assigned to the portal's users"),
+        'url': fields.char('URL', size=64,
+            help="The url where portal users can connect to the server"),
+        'menu_action_id': fields.many2one('ir.actions.act_window', readonly=True,
+            # ISSUE: 'ondelete' constraints do not seem effective on this field...
+            string='Menu Action',
+            help="If set, replaces the standard menu for the portal's users"),
+        'parent_menu_id': fields.many2one('ir.ui.menu', ondelete='restrict',
+            string='Parent Menu',
+            help='The menu action opens the submenus of this menu item'),
+        'widget_ids': fields.one2many('res.portal.widget', 'portal_id',
+            string='Widgets',
+            help='Widgets assigned to portal users'),
+    }
+    
+    def copy(self, cr, uid, id, values, context=None):
+        """ override copy(): menu_action_id must be different """
+        values['menu_action_id'] = None
+        return super(portal, self).copy(cr, uid, id, values, context)
+    
+    def create(self, cr, uid, values, context=None):
+        """ extend create() to assign the portal menu to users """
+        if context is None:
+            context = {}
+        
+        # create portal (admin should not be included)
+        context['noadmin'] = True
+        portal_id = super(portal, self).create(cr, uid, values, context)
+        
+        # assign menu action and widgets to users
+        if values.get('users') or values.get('other_group_ids') or values.get('menu_action_id'):
+            self._assign_menu_and_groups(cr, uid, [portal_id], context)
+        if values.get('users') or values.get('widget_ids'):
+            self._assign_widgets(cr, uid, [portal_id], context)
+        
+        return portal_id
+    
+    def write(self, cr, uid, ids, values, context=None):
+        """ extend write() to reflect changes on users """
+        # first apply portal changes
+        super(portal, self).write(cr, uid, ids, values, context)
+        
+        # assign menu action and widgets to users
+        if values.get('users') or values.get('other_group_ids') or values.get('menu_action_id'):
+            self._assign_menu_and_groups(cr, uid, ids, context)
+        if values.get('users') or values.get('widget_ids'):
+            self._assign_widgets(cr, uid, ids, context)
+        
+        # if parent_menu_id has changed, apply the change on menu_action_id
+        if 'parent_menu_id' in values:
+            act_window_obj = self.pool.get('ir.actions.act_window')
+            portals = self.browse(cr, uid, ids, context)
+            action_ids = [p.menu_action_id.id for p in portals if p.menu_action_id]
+            if action_ids:
+                action_values = {'domain': [('parent_id', '=', values['parent_menu_id'])]}
+                act_window_obj.write(cr, uid, action_ids, action_values, context)
+        
+        return True
+    
+    def do_create_menu(self, cr, uid, ids, context=None):
+        """ create a parent menu for the given portals """
+        menu_obj = self.pool.get('ir.ui.menu')
+        menu_root = self._res_xml_id(cr, uid, 'portal', 'portal_menu')
+        
+        for p in self.browse(cr, uid, ids, context):
+            # create a menuitem under 'portal.portal_menu'
+            menu_values = {
+                'name': _('%s Menu') % p.name,
+                'parent_id': menu_root,
+                'groups_id': [(6, 0, [p.group_id.id])],
+            }
+            menu_id = menu_obj.create(cr, uid, menu_values, context)
+            # set the parent_menu_id to item_id
+            self.write(cr, uid, [p.id], {'parent_menu_id': menu_id}, context)
+        
+        return True
+
+    def _assign_menu_and_groups(self, cr, uid, ids, context=None):
+        """ assign portal menu and other groups to users of portals (ids) """
+        user_obj = self.pool.get('res.users')
+        for p in self.browse(cr, uid, ids, context):
+            # user groups = portal group + other groups
+            group_ids = [p.group_id.id] + [g.id for g in p.other_group_ids]
+            user_values = {'groups_id': [(6, 0, group_ids)]}
+            # user menu action = portal menu action if set in portal
+            if p.menu_action_id:
+                user_values['menu_id'] = p.menu_action_id.id
+            user_ids = [u.id for u in p.users if u.id != 1]
+            user_obj.write(cr, uid, user_ids, user_values, context)
+
+    def _assign_widgets(self, cr, uid, ids, context=None):
+        """ assign portal widgets to users of portals (ids) """
+        widget_user_obj = self.pool.get('res.widget.user')
+        for p in self.browse(cr, uid, ids, context):
+            for w in p.widget_ids:
+                values = {'sequence': w.sequence, 'widget_id': w.widget_id.id}
+                for u in p.users:
+                    if u.id == 1: continue
+                    values['user_id'] = u.id
+                    widget_user_obj.create(cr, uid, values, context)
+
+    def _res_xml_id(self, cr, uid, module, xml_id):
+        """ return the resource id associated to the given xml_id """
+        data_obj = self.pool.get('ir.model.data')
+        data_id = data_obj._get_id(cr, uid, module, xml_id)
+        return data_obj.browse(cr, uid, data_id).res_id
+
+portal()
+
+
+
+class portal_override_menu(osv.osv):
+    """
+        extend res.portal with a boolean field 'Override Users Menu', that
+        triggers the creation or removal of menu_action_id
+    """
+    _name = 'res.portal'
+    _inherit = 'res.portal'
+    
+    def _get_override_menu(self, cr, uid, ids, field_name, arg, context=None):
+        assert field_name == 'override_menu'
+        result = {}
+        for p in self.browse(cr, uid, ids, context):
+            result[p.id] = bool(p.menu_action_id)
+        return result
+    
+    def _set_override_menu(self, cr, uid, id, field_name, field_value, arg, context=None):
+        assert field_name == 'override_menu'
+        if field_value:
+            self.create_menu_action(cr, uid, id, context)
+        else:
+            self.write(cr, uid, [id], {'menu_action_id': False}, context)
+    
+    def create_menu_action(self, cr, uid, id, context=None):
+        """ create, if necessary, a menu action that opens the menu items below
+            parent_menu_id """
+        p = self.browse(cr, uid, id, context)
+        if not p.menu_action_id:
+            actions_obj = self.pool.get('ir.actions.act_window')
+            parent_id = p.parent_menu_id.id if p.parent_menu_id else False
+            action_values = {
+                'name': _('%s Menu') % p.name,
+                'type': 'ir.actions.act_window',
+                'usage': 'menu',
+                'res_model': 'ir.ui.menu',
+                'view_type': 'tree',
+                'view_id': self._res_xml_id(cr, uid, 'base', 'view_menu'),
+                'domain': [('parent_id', '=', parent_id)],
+            }
+            action_id = actions_obj.create(cr, uid, action_values, context)
+            self.write(cr, uid, [id], {'menu_action_id': action_id}, context)
+    
+    _columns = {
+        'override_menu': fields.function(
+            _get_override_menu, fnct_inv=_set_override_menu,
+            type='boolean', string='Override Menu Action of Users',
+            help='Enable this option to override the Menu Action of portal users'),
+    }
+
+portal_override_menu()
+
+
+
+class portal_widget(osv.osv):
+    """
+        Similar to res.widget.user (res_widget.py), but with a portal instead.
+        New users in a portal are assigned the portal's widgets.
+    """
+    _name='res.portal.widget'
+    _description = 'Portal Widgets'
+    _order = 'sequence'
+    _columns = {
+        'sequence': fields.integer('Sequence'),
+        'portal_id': fields.many2one('res.portal', select=1, ondelete='cascade',
+            string='Portal'),
+        'widget_id': fields.many2one('res.widget', required=True, ondelete='cascade',
+            string='Widget'),
+    }
+
+    def create(self, cr, uid, values, context=None):
+        domain = [('portal_id', '=', values.get('portal_id')),
+                  ('widget_id', '=', values.get('widget_id'))]
+        existing = self.search(cr, uid, domain, context=context)
+        if existing:
+            res = existing[0]
+        else:
+            res = super(portal_widget, self).create(cr, uid, values, context=context)
+        return res
+
+portal_widget()
+
+
+
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
new file mode 100644
index 00000000000..d43c6115ad6
--- /dev/null
+++ b/addons/portal/portal_view.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- menu Administration/Portals -->
+        <menuitem name="Portals" id="portal_menu" parent="base.menu_administration"
+            groups="group_portal_manager"/>
+
+        <!-- menu Administration/Portals/Portals -->
+        <record id="portal_list_action" model="ir.actions.act_window">
+            <field name="name">Portals</field>
+            <field name="res_model">res.portal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <!-- a context is necessary to get the right portal form view -->
+            <field name="context">{'form_view_ref': 'portal.portal_form_view'}</field>
+            <field name="help">
+A portal helps defining specific views and rules for a group of users (the
+portal group).  A portal menu, widgets and specific groups may be assigned to
+the portal's users.
+            </field>
+        </record>
+        <menuitem name="Portals" id="portal_list_menu"
+            parent="portal_menu" sequence="1" action="portal_list_action"/>
+
+        <!-- portal tree view -->
+        <record id="portal_list_view" model="ir.ui.view">
+            <field name="name">Portal List</field>
+            <field name="model">res.portal</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Portals">
+                    <field name="name" string="Portal Name"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- portal form view -->
+        <record id="portal_form_view" model="ir.ui.view">
+            <field name="name">Portal Form</field>
+            <field name="model">res.portal</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_groups_form"/>
+            <field name="arch" type="xml">
+                <page string="Users" position="before">
+                    <page string="Portal">
+                        <group colspan="2" col="2">
+                            <separator string="Website" colspan="2"/>
+                            <field name="url" widget="url"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <separator string="Portal Menu" colspan="2"/>
+                            <field name="override_menu"/>
+                            <field name="parent_menu_id"
+                                context="{'ir.ui.menu.full_list': True}"/>
+                            <label colspan="1"/>
+                            <button name="do_create_menu" type="object"
+                                string="Create Parent Menu"/>
+                        </group>
+                        <separator string="Other Groups assigned to Users" colspan="2"/>
+                        <separator string="Widgets assigned to Users" colspan="2"/>
+                        <!-- load group_id in order to exclude it from other_group_ids -->
+                        <field name="group_id" invisible="1"/>
+                        <field name="other_group_ids" nolabel="1" colspan="2"
+                            domain="[('id', '!=', group_id)]"/>
+                        <field name="widget_ids" nolabel="1" colspan="2">
+                            <tree string="Widgets" editable="bottom">
+                                <field name="sequence"/>
+                                <field name="widget_id"/>
+                            </tree>
+                        </field>
+                    </page>
+                </page>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/portal/res_user.py b/addons/portal/res_user.py
new file mode 100644
index 00000000000..2f32a65b761
--- /dev/null
+++ b/addons/portal/res_user.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.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/>.
+#
+##############################################################################
+
+from osv import osv, fields
+
+
+
+class res_users(osv.osv):
+    _inherit = 'res.users'
+    _columns = {
+        'partner_id': fields.many2one('res.partner',
+            string='Related Partner'),
+    }
+
+res_users()
+
diff --git a/addons/portal/res_user_view.xml b/addons/portal/res_user_view.xml
new file mode 100644
index 00000000000..716493f2787
--- /dev/null
+++ b/addons/portal/res_user_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- add partner field in user form -->
+        <record id="view_users_form" model="ir.ui.view">
+            <field name="name">res.portal.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">
+                <field name="address_id" position="before">
+                    <field name="partner_id"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/portal/security/ir.model.access.csv b/addons/portal/security/ir.model.access.csv
new file mode 100644
index 00000000000..db83f9ae77e
--- /dev/null
+++ b/addons/portal/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_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
new file mode 100644
index 00000000000..015a390cdae
--- /dev/null
+++ b/addons/portal/security/portal_security.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="group_portal_manager" model="res.groups">
+            <field name="name">Portal / 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>
+        </record>
+        <record id="group_portal_officer" model="res.groups">
+            <field name="name">Portal / Officer</field>
+            <field name="comment">Portal officers can create new portal users with the portal wizard.</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/portal/wizard/__init__.py b/addons/portal/wizard/__init__.py
new file mode 100644
index 00000000000..90b71a62c30
--- /dev/null
+++ b/addons/portal/wizard/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.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/>.
+#
+##############################################################################
+
+import portal_wizard
+import share_wizard
+
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
new file mode 100644
index 00000000000..152a2bb7b38
--- /dev/null
+++ b/addons/portal/wizard/portal_wizard.py
@@ -0,0 +1,226 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.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/>.
+#
+##############################################################################
+
+import logging
+import random
+
+from osv import osv, fields
+from tools.misc import email_re, email_send
+from tools.translate import _
+
+from base.res.res_user import _lang_get
+
+
+
+# welcome email sent to new portal users (note that calling tools.translate._
+# has no effect except exporting those strings for translation)
+WELCOME_EMAIL_SUBJECT = _("Your OpenERP account at %(company)s")
+WELCOME_EMAIL_BODY = _("""Dear %(name)s,
+
+You have been created an OpenERP account at %(url)s.
+
+Your login account data is:
+Database: %(db)s
+User:     %(login)s
+Password: %(password)s
+
+%(message)s
+
+--
+OpenERP - Open Source Business Applications
+http://www.openerp.com
+""")
+
+ROOT_UID = 1
+
+# character sets for passwords, excluding 0, O, o, 1, I, l
+_PASSU = 'ABCDEFGHIJKLMNPQRSTUVWXYZ'
+_PASSL = 'abcdefghijkmnpqrstuvwxyz'
+_PASSD = '23456789'
+
+def random_password():
+    # get 3 uppercase letters, 3 lowercase letters, 2 digits, and shuffle them
+    chars = map(random.choice, [_PASSU] * 3 + [_PASSL] * 3 + [_PASSD] * 2)
+    random.shuffle(chars)
+    return ''.join(chars)
+
+def extract_email(user_email):
+    """ extract the email address from a user-friendly email address """
+    m = email_re.search(user_email or "")
+    return m and m.group(0) or ""
+
+
+
+class wizard(osv.osv_memory):
+    """
+        A wizard to create portal users from instances of either 'res.partner'
+        or 'res.partner.address'.  The purpose is to provide an OpenERP database
+        access to customers or suppliers.
+    """
+    _name = 'res.portal.wizard'
+    _description = 'Portal Wizard'
+    
+    _columns = {
+        'portal_id': fields.many2one('res.portal', required=True,
+            string='Portal',
+            help="The portal in which new users must be added"),
+        'user_ids': fields.one2many('res.portal.wizard.user', 'wizard_id',
+            string='Users'),
+        'message': fields.text(string='Invitation message',
+            help="This text is included in the welcome email sent to the users"),
+    }
+
+    def _default_user_ids(self, cr, uid, context):
+        """ determine default user_ids from the active records """
+        def create_user_from_address(address):
+            return {    # a user config based on a contact (address)
+                'name': address.name,
+                'user_email': extract_email(address.email),
+                'lang': address.partner_id and address.partner_id.lang or 'en_US',
+                'partner_id': address.partner_id and address.partner_id.id,
+            }
+        
+        user_ids = []
+        if context.get('active_model') == 'res.partner.address':
+            address_obj = self.pool.get('res.partner.address')
+            address_ids = context.get('active_ids', [])
+            addresses = address_obj.browse(cr, uid, address_ids, context)
+            user_ids = map(create_user_from_address, addresses)
+        
+        elif context.get('active_model') == 'res.partner':
+            partner_obj = self.pool.get('res.partner')
+            partner_ids = context.get('active_ids', [])
+            partners = partner_obj.browse(cr, uid, partner_ids, context)
+            for p in partners:
+                # add one user per contact, or one user if no contact
+                if p.address:
+                    user_ids.extend(map(create_user_from_address, p.address))
+                else:
+                    user_ids.append({'lang': p.lang or 'en_US', 'partner_id': p.id})
+        
+        return user_ids
+
+    _defaults = {
+        'user_ids': _default_user_ids
+    }
+
+    def action_create(self, cr, uid, ids, context=None):
+        """ create new users in portal(s), and notify them by email """
+        # we copy the context to change the language for translating emails
+        context0 = context or {}
+        context0['noshortcut'] = True           # prevent shortcut creation
+        context = context0.copy()
+        
+        user_obj = self.pool.get('res.users')
+        user = user_obj.browse(cr, ROOT_UID, uid, context0)
+        if not user.user_email:
+            raise osv.except_osv(_('Email required'),
+                _('You must have an email address in your User Preferences'
+                  ' to send emails.'))
+        
+        portal_obj = self.pool.get('res.portal')
+        for wiz in self.browse(cr, uid, ids, context):
+            # determine existing users
+            login_cond = [('login', 'in', [u.user_email for u in wiz.user_ids])]
+            user_ids = user_obj.search(cr, ROOT_UID, login_cond)
+            users = user_obj.browse(cr, ROOT_UID, user_ids)
+            logins = [u.login for u in users]
+            
+            # create new users in portal (skip existing logins)
+            new_users_data = [ {
+                    'name': u.name,
+                    'login': u.user_email,
+                    'password': random_password(),
+                    'user_email': u.user_email,
+                    'context_lang': u.lang,
+                    'partner_id': u.partner_id and u.partner_id.id,
+                } for u in wiz.user_ids if u.user_email not in logins ]
+            portal_obj.write(cr, ROOT_UID, [wiz.portal_id.id],
+                {'users': [(0, 0, data) for data in new_users_data]}, context0)
+            
+            # send email to all users (translated in their language)
+            data = {
+                'company': user.company_id.name,
+                'message': wiz.message or "",
+                'url': wiz.portal_id.url or _("(missing url)"),
+                'db': cr.dbname,
+            }
+            dest_uids = user_obj.search(cr, ROOT_UID, login_cond)
+            dest_users = user_obj.browse(cr, ROOT_UID, user_ids)
+            for dest_user in dest_users:
+                context['lang'] = dest_user.context_lang
+                data['login'] = dest_user.login
+                data['password'] = dest_user.password
+                data['name'] = dest_user.name
+                
+                email_from = user.user_email
+                email_to = dest_user.user_email
+                subject = _(WELCOME_EMAIL_SUBJECT) % data
+                body = _(WELCOME_EMAIL_BODY) % data
+                res = email_send(email_from, [email_to], subject, body)
+                if not res:
+                    logging.getLogger('res.portal.wizard').warning(
+                        'Failed to send email from %s to %s', email_from, email_to)
+        
+        return {'type': 'ir.actions.act_window_close'}
+
+wizard()
+
+
+
+class wizard_user(osv.osv_memory):
+    """
+        A model to configure users in the portal wizard.
+    """
+    _name = 'res.portal.wizard.user'
+    _description = 'Portal User Config'
+
+    _columns = {
+        'wizard_id': fields.many2one('res.portal.wizard', required=True,
+            string='Wizard'),
+        'name': fields.char(size=64, required=True,
+            string='User Name',
+            help="The user's real name"),
+        'user_email': fields.char(size=64, required=True,
+            string='E-mail',
+            help="Will be used as user login.  "  
+                 "Also necessary to send the account information to new users"),
+        'lang': fields.selection(_lang_get, required=True,
+            string='Language',
+            help="The language for the user's user interface"),
+        'partner_id': fields.many2one('res.partner',
+            string='Partner'),
+    }
+
+    def _check_email(self, cr, uid, ids):
+        """ check syntax of email address """
+        for wuser in self.browse(cr, uid, ids):
+            if not email_re.match(wuser.user_email): return False
+        return True
+
+    _constraints = [
+        (_check_email, 'Invalid email address', ['email']),
+    ]
+
+wizard_user()
+
+
+
diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_view.xml
new file mode 100644
index 00000000000..537055e5fb2
--- /dev/null
+++ b/addons/portal/wizard/portal_wizard_view.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- wizard action on res.partner -->
+        <act_window id="partner_wizard_action"
+            name="Add Portal Access"
+            src_model="res.partner"
+            res_model="res.portal.wizard"
+            view_type="form" view_mode="form"
+            key2="client_action_multi" target="new"
+            groups="group_portal_officer"/>
+
+        <!-- wizard action on res.partner.address -->
+        <act_window id="address_wizard_action"
+            name="Add Portal Access"
+            src_model="res.partner.address"
+            res_model="res.portal.wizard"
+            view_type="form" view_mode="form"
+            key2="client_action_multi" target="new"
+            groups="group_portal_officer"/>
+
+        <!-- wizard view -->
+        <record id="wizard_view" model="ir.ui.view">
+            <field name="name">Add Portal Access</field>
+            <field name="model">res.portal.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Add Portal Access">
+                    <field name="portal_id" widget="selection"/>
+                    <newline/>
+                    <notebook colspan="4">
+                        <page string="Users">
+                            <field name="user_ids" nolabel="1" colspan="4"/>
+                        </page>
+                        <page string="Invitation message">
+                            <label string="The following text will be included in the welcome email sent to users."/>
+                            <field name="message" nolabel="1" colspan="4"/>
+                        </page>
+                    </notebook>
+                    <label colspan="2"/>
+                    <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                    <button string="Send Invitations"
+                        name="action_create" type="object" icon="gtk-ok"/>
+                </form>
+            </field>
+        </record>
+
+        <!-- wizard user list view -->
+        <record id="wizard_user_tree_view" model="ir.ui.view">
+            <field name="name">Portal Users</field>
+            <field name="model">res.portal.wizard.user</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <!-- the attribute 'editable' is set below to make the elements
+                     editable in the web client 6.0 -->
+                <tree string="Portal Users" editable="bottom">
+                    <field name="name"/>
+                    <field name="user_email"/>
+                    <field name="partner_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- wizard user form view -->
+        <record id="wizard_user_form_view" model="ir.ui.view">
+            <field name="name">Portal User</field>
+            <field name="model">res.portal.wizard.user</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Portal User">
+                    <group colspan="2" col="2">
+                        <field name="name"/>
+                        <field name="user_email"/>
+                        <field name="lang"/>
+                        <field name="partner_id"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/portal/wizard/share_wizard.py b/addons/portal/wizard/share_wizard.py
new file mode 100644
index 00000000000..c1366b5dbf0
--- /dev/null
+++ b/addons/portal/wizard/share_wizard.py
@@ -0,0 +1,190 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.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/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+UID_ROOT = 1
+SHARED_DOCS_MENU = "Documents"
+SHARED_DOCS_CHILD_MENU = "Shared Documents"
+
+class share_wizard_portal(osv.osv_memory):
+    """Inherited share wizard to automatically create appropriate
+       menus in the selected portal upon sharing with a portal group."""
+    _inherit = "share.wizard"
+
+    def _user_type_selection(self, cr, uid, context=None):
+        selection = super(share_wizard_portal, self)._user_type_selection(cr, uid, context=context)
+        selection.extend([('existing','Users you already shared with'),
+                          ('groups','Existing Groups (e.g Portal Groups)')])
+        return selection
+
+    _columns = {
+        'user_ids': fields.many2many('res.users', 'share_wizard_res_user_rel', 'share_id', 'user_id', 'Existing users', domain=[('share', '=', True)]),
+        'group_ids': fields.many2many('res.groups', 'share_wizard_res_group_rel', 'share_id', 'group_id', 'Existing groups', domain=[('share', '=', False)]),
+
+        # no clean way to extend selection yet, copy the field. 
+        'user_type': fields.selection(_user_type_selection,'Users to share with',
+             help="Select the type of user(s) you would like to share data with."),
+    }
+
+    def is_portal_manager(self, cr, uid, context=None):
+        return self.has_group(cr, uid, module='portal', group_xml_id='group_portal_manager', context=context)
+
+    def _check_preconditions(self, cr, uid, wizard_data, context=None):
+        if wizard_data.user_type == 'existing':
+            self._assert(wizard_data.user_ids,
+                     _('Please select at least one user to share with'),
+                     context=context)
+        elif wizard_data.user_type == 'groups':
+            self._assert(wizard_data.group_ids,
+                     _('Please select at least one group to share with'),
+                     context=context)
+        return super(share_wizard_portal, self)._check_preconditions(cr, uid, wizard_data, context=context)
+
+    def _create_or_get_submenu_named(self, cr, uid, parent_menu_id, menu_name, context=None):
+        if not parent_menu_id:
+            return
+        Menus = self.pool.get('ir.ui.menu')
+        parent_menu = Menus.browse(cr, uid, parent_menu_id) # No context
+        menu_id = None
+        max_seq = 10
+        for child_menu in parent_menu.child_id:
+            max_seq = max(max_seq, child_menu.sequence)
+            if child_menu.name == menu_name:
+                menu_id = child_menu.id
+                break
+        if not menu_id:
+            # not found, create it
+            menu_id = Menus.create(cr, UID_ROOT,
+                                    {'name': menu_name,
+                                     'parent_id': parent_menu.id,
+                                     'sequence': max_seq + 10, # at the bottom
+                                    })
+        return menu_id
+
+    def _sharing_root_menu_id(self, cr, uid, portal, context=None):
+        """Create or retrieve root ID of sharing menu in portal menu
+
+           :param portal: browse_record of portal, constructed with a context WITHOUT language
+        """
+        parent_menu_id = self._create_or_get_submenu_named(cr, uid, portal.parent_menu_id.id, SHARED_DOCS_MENU, context=context)
+        if parent_menu_id:
+            child_menu_id = self._create_or_get_submenu_named(cr, uid, parent_menu_id, SHARED_DOCS_CHILD_MENU, context=context)
+            return child_menu_id
+
+    def _create_shared_data_menu(self, cr, uid, wizard_data, portal, context=None):
+        """Create sharing menus in portal menu according to share wizard options.
+
+           :param wizard_data: browse_record of share.wizard
+           :param portal: browse_record of portal, constructed with a context WITHOUT language
+        """
+        root_menu_id = self._sharing_root_menu_id(cr, uid, portal, context=context)
+        if not root_menu_id:
+            # no specific parent menu, cannot create the sharing menu at all.
+            return
+        # Create the shared action and menu
+        action_def = self._shared_action_def(cr, uid, wizard_data, context=None)
+        action_id = self.pool.get('ir.actions.act_window').create(cr, UID_ROOT, action_def)
+        menu_data = {'name': action_def['name'],
+                     'sequence': 10,
+                     'action': 'ir.actions.act_window,'+str(action_id),
+                     'parent_id': root_menu_id,
+                     'icon': 'STOCK_JUSTIFY_FILL'}
+        menu_id =  self.pool.get('ir.ui.menu').create(cr, UID_ROOT, menu_data)
+        return menu_id
+
+    def _create_share_users_group(self, cr, uid, wizard_data, context=None):
+        # Override of super() to handle the possibly selected "existing users"
+        # and "existing groups".
+        # In both cases, we call super() to create the share group, but when
+        # sharing with existing groups, we will later delete it, and copy its
+        # access rights and rules to the selected groups.
+        group_id = super(share_wizard_portal,self)._create_share_users_group(cr, uid, wizard_data, context=context)
+
+        # For sharing with existing groups, we don't create a share group, instead we'll
+        # alter the rules of the groups so they can see the shared data
+        if wizard_data.group_ids:
+            # get the list of portals and the related groups to install their menus.
+            Portals = self.pool.get('res.portal')
+            all_portals = Portals.browse(cr, UID_ROOT, Portals.search(cr, UID_ROOT, [])) #no context!
+            all_portal_group_ids = [p.group_id.id for p in all_portals]
+
+            # populate result lines with the users of each group and
+            # setup the menu for portal groups
+            for group in wizard_data.group_ids:
+                if group.id in all_portal_group_ids:
+                    portal = all_portals[all_portal_group_ids.index(group.id)]
+                    self._create_shared_data_menu(cr, uid, wizard_data, portal, context=context)
+
+                for user in group.users:
+                    new_line = {'user_id': user.id,
+                                'newly_created': False}
+                    wizard_data.write({'result_line_ids': [(0,0,new_line)]})
+
+        elif wizard_data.user_ids:
+            # must take care of existing users, by adding them to the new group, which is group_ids[0],
+            # and adding the shortcut
+            selected_user_ids = [x.id for x in wizard_data.user_ids]
+            self.pool.get('res.users').write(cr, UID_ROOT, selected_user_ids, {'groups_id': [(4,group_id)]})
+            self._setup_action_and_shortcut(cr, uid, wizard_data, selected_user_ids, make_home=False, context=context)
+            # populate the result lines for existing users too
+            for user in wizard_data.user_ids:
+                new_line = { 'user_id': user.id,
+                             'newly_created': False}
+                wizard_data.write({'result_line_ids': [(0,0,new_line)]})
+
+        return group_id
+
+    def copy_share_group_access_and_delete(self, cr, wizard_data, share_group_id, context=None):
+        # In the case of sharing with existing groups, the strategy is to copy
+        # access rights and rules from the share group, so that we can
+        if not wizard_data.group_ids: return
+        Groups = self.pool.get('res.groups')
+        Rules = self.pool.get('ir.rule')
+        Rights = self.pool.get('ir.model.access')
+        share_group = Groups.browse(cr, UID_ROOT, share_group_id)
+        share_rule_ids = [r.id for r in share_group.rule_groups]
+        for target_group in wizard_data.group_ids:
+            # Link the rules to the group. This is appropriate because as of
+            # v6.1, the algorithm for combining them will OR the rules, hence
+            # extending the visible data.
+            Rules.write(cr, UID_ROOT, share_rule_ids, {'groups': [(4,target_group.id)]})
+            self._logger.debug("Linked sharing rules from temporary sharing group to group %s", target_group)
+
+            # Copy the access rights. This is appropriate too because
+            # groups have the UNION of all permissions granted by their
+            # access right lines.
+            for access_line in share_group.model_access:
+                Rights.copy(cr, UID_ROOT, access_line.id, default={'group_id': target_group.id})
+            self._logger.debug("Copied access rights from temporary sharing group to group %s", target_group)
+
+        # finally, delete it after removing its users
+        Groups.write(cr, UID_ROOT, [share_group_id], {'users': [(6,0,[])]})
+        Groups.unlink(cr, UID_ROOT, [share_group_id])
+        self._logger.debug("Deleted temporary sharing group %s", share_group_id)
+
+    def _finish_result_lines(self, cr, uid, wizard_data, share_group_id, context=None):
+        super(share_wizard_portal,self)._finish_result_lines(cr, uid, wizard_data, share_group_id, context=context)
+        self.copy_share_group_access_and_delete(cr, wizard_data, share_group_id, context=context)
+
+share_wizard_portal()
+
diff --git a/addons/portal/wizard/share_wizard_view.xml b/addons/portal/wizard/share_wizard_view.xml
new file mode 100644
index 00000000000..f16334b68a3
--- /dev/null
+++ b/addons/portal/wizard/share_wizard_view.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="share_step1_form_portal" model="ir.ui.view">
+            <field name="name">share.step1.form.portal</field>
+            <field name="model">share.wizard</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="share.share_step1_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/group[@name='emails_group']" position="before">
+                    <group name="groups_group" colspan="4" col="4" groups="portal.group_portal_manager">
+	                    <separator colspan="4" string="Who do you want to share with?"/>
+	                    <field name="user_type" />
+                    </group>
+                    <group name="user_group" colspan="4" attrs="{'invisible':[('user_type','!=','existing')]}">
+                        <field colspan="4" nolabel="1" name="user_ids" mode="tree">
+                            <tree string="Existing users">
+                                <field name="login"/>
+                            </tree>
+                        </field>
+                    </group>
+                    <group colspan="4" attrs="{'invisible':[('user_type','!=','groups')]}">
+                        <field colspan="4" nolabel="1" name="group_ids" mode="tree">
+                            <tree string="Existing groups">
+                                <field name="name"/>
+                            </tree>
+                        </field>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="share_step2_form_portal" model="ir.ui.view">
+            <field name="name">share.step2.form.portal</field>
+            <field name="model">share.wizard</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="share.share_step2_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/field[@name='result_line_ids']/tree/field[@name='login']" position="after">
+                    <field name="share_url" groups="portal.group_portal_manager"/>
+                </xpath>
+                <xpath expr="/form/field[@name='result_line_ids']/form/field[@name='login']" position="after">
+                    <field name="share_url" colspan="4" groups="portal.group_portal_manager"/>
+                </xpath>
+                <xpath expr="/form/field[@name='result_line_ids']" position="after">
+                    <field colspan="4" name="share_root_url" groups="portal.group_portal_manager"/>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/procurement/i18n/fi.po b/addons/procurement/i18n/fi.po
new file mode 100644
index 00000000000..6895606767f
--- /dev/null
+++ b/addons/procurement/i18n/fi.po
@@ -0,0 +1,899 @@
+# Finnish 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-06-20 09:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-21 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr "Kysy uusia tuotteita"
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_sched
+msgid "Schedulers"
+msgstr "Ajastimet"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_make_procurement
+msgid "Make Procurements"
+msgstr "Tee hankinnat"
+
+#. 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 ""
+"Liipaisee automaattisen hankinnan kaikille tuotteille joiden näennäisvarasto "
+"on alle 0. Tätä vaihtoehtoa ei yleensä käytetä, vaan tuotteille on parempi "
+"määrittää varastosäännöt."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Group By..."
+msgstr "Ryhmittely.."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Draft procurement of the product and location of that orderpoint"
+msgstr "Luonnnos hankinta tuotteelle ja tilauspisteen paikalle"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:288
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr "Tuotteelle ei ole määritelty toimittajaa!"
+
+#. module: procurement
+#: field:make.procurement,uom_id:0
+msgid "Unit of Measure"
+msgstr "Mittayksikkö"
+
+#. module: procurement
+#: field:procurement.order,procure_method:0
+msgid "Procurement Method"
+msgstr "Hankintatapa"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:304
+#, python-format
+msgid "No address defined for the supplier"
+msgstr "Toimittajan osoitetta ei ole määritetty"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_procurement_compute
+msgid "Compute Stock Minimum Rules Only"
+msgstr "Laske vain varaston minimirajat"
+
+#. module: procurement
+#: field:procurement.order,company_id:0
+#: field:stock.warehouse.orderpoint,company_id:0
+msgid "Company"
+msgstr "Yritys"
+
+#. module: procurement
+#: field:procurement.order,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr "Myyntiyksikkö määrä"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,name:0
+msgid "Reason"
+msgstr "Syy"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "Compute Procurements"
+msgstr "Laske hankinnat"
+
+#. module: procurement
+#: field:procurement.order,message:0
+msgid "Latest error"
+msgstr "Viimeisin virhe"
+
+#. module: procurement
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr "Ei käytetä laskutoimituksiin - vain tietoja varten."
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Latest procurement"
+msgstr "Viimeisin hankinta"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Notes"
+msgstr "Huomautukset"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "on order"
+msgstr "tilauksessa"
+
+#. module: procurement
+#: help:procurement.order,message:0
+msgid "Exception occurred while computing procurement orders."
+msgstr "Hankintatilausten laskennassa sattui poikkeus."
+
+#. 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 "Minimivarasto sääntöjen haku"
+
+#. 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 "Aikataulutuksen parametrit"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_move
+msgid "Stock Move"
+msgstr "Varastosiirto"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Planification"
+msgstr "Suunnittelu"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Ready"
+msgstr "Valmis"
+
+#. module: procurement
+#: field:procurement.order.compute.all,automatic:0
+msgid "Automatic orderpoint"
+msgstr "Automaattinen tilauspiste"
+
+#. module: procurement
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr "Ominaisuuksien koostumus"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Confirmed"
+msgstr "Vahvistettu"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Retry"
+msgstr "Yritä uudelleen"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+#: view:procurement.orderpoint.compute:0
+msgid "Parameters"
+msgstr "Parametrit"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Confirm"
+msgstr "Vahvista"
+
+#. 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 "Prosessoitavat hankintatilaukset"
+
+#. module: procurement
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Virhe! Et voi luoda sisäkkäisiä yrityksiä."
+
+#. module: procurement
+#: field:procurement.order,priority:0
+msgid "Priority"
+msgstr "Prioriteetti"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,state:0
+msgid "State"
+msgstr "Tila"
+
+#. module: procurement
+#: field:procurement.order,location_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr "Sijainti"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_picking
+msgid "Picking List"
+msgstr "Keräilylista"
+
+#. module: procurement
+#: field:make.procurement,warehouse_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr "Varasto"
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr "Paras hinta (ei vielä aktiivinen!)"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Product & Location"
+msgstr "Tuote & Sijainti"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute
+msgid "Compute Procurement"
+msgstr "Laske hankinta"
+
+#. module: procurement
+#: model:ir.module.module,shortdesc:procurement.module_meta_information
+#: field:stock.move,procurements:0
+msgid "Procurements"
+msgstr "Hankinnat"
+
+#. module: procurement
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range Days"
+msgstr "Ajastimen jakson päivät"
+
+#. 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 "Suunniteltu päivämäärä"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Group By"
+msgstr "Ryhmittelyn peruste"
+
+#. module: procurement
+#: field:make.procurement,qty:0
+#: field:procurement.order,product_qty:0
+msgid "Quantity"
+msgstr "Määrä"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:377
+#, python-format
+msgid "Not enough stock and no minimum orderpoint rule defined."
+msgstr "Ei tarpeeksi varastoa eikä minimitilauspistesääntöä määriteltynä"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:137
+#, python-format
+msgid "Invalid action !"
+msgstr "Virheellinen toiminto!"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "References"
+msgstr "Viitteet"
+
+#. module: procurement
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Konfiguraatio"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr "Määrän kerroin"
+
+#. 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 "Automaattiset hankinnat"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Max Quantity"
+msgstr "Maksimimäärä"
+
+#. 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 "Hankinta"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action
+msgid "Procurement Orders"
+msgstr "Hankintatilaukset"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "To Fix"
+msgstr "Korjattavaksi"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Exceptions"
+msgstr "Poikkeukset"
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_serviceonorder0
+msgid "Assignment from Production or Purchase Order."
+msgstr "Määritys tuotannosta tai ostotilaukselta."
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property
+msgid "Property"
+msgstr "Ominaisuus"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_make_procurement
+#: view:make.procurement:0
+msgid "Procurement Request"
+msgstr "Hankintapyyntö"
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Compute Stock"
+msgstr "Laske varasto"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Late"
+msgstr "Myöhässä"
+
+#. module: procurement
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Palvelu"
+
+#. 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 "Liittyvät hankintatilaukset"
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid ""
+"Wizard checks all the stock minimum rules and generate procurement order."
+msgstr "Velho tarkistaa kaikki minimivarastosäännöt ja luo hankintatilauksen"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_min_qty:0
+msgid "Min Quantity"
+msgstr "Minimimäärä"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Urgent"
+msgstr "Kiireellinen"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr "plus"
+
+#. 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 ""
+"Ole hyvä ja tarkista määrä hankintatilauksella. Sen ei tulisi olla alle 1 !"
+
+#. 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 ""
+"Jos aktiivisen kentän tilaksi asetetaan epätosi (false) se mahdollistaa "
+"tilauspisteen piilottamisen ilman sen poistamista"
+
+#. 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 "Jos tuotteen varastosaldo on alle 0, toimii se tilauspisteenä"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Lines"
+msgstr "Hankinnan rivit"
+
+#. 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 "Huomautus"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Draft"
+msgstr "Luonnos"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr "Tämä ohjattu toiminto ajoittaa hankinnat."
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Status"
+msgstr "Tila"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Normal"
+msgstr "Tavallinen"
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Erä ei ole samaa tuotetta"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr "Aktiivinen"
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_procureproducts0
+msgid "Procure Products"
+msgstr "Hanki tuotteita"
+
+#. module: procurement
+#: field:procurement.order,date_planned:0
+msgid "Scheduled date"
+msgstr "Arvioitu päivämäärä"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Exception"
+msgstr "Poikkeus"
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:179
+#, python-format
+msgid "Automatic OP: %s"
+msgstr "Automaattinen tilauspiste: %s"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
+msgid "Automatic Order Point"
+msgstr "Automaattinen tilauspiste"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr "Minimivarastosääntö"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_res_company
+msgid "Companies"
+msgstr "Yritykset"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Extra Information"
+msgstr "Lisätiedot"
+
+#. module: procurement
+#: help:procurement.order,name:0
+msgid "Procurement name."
+msgstr "Hankinnan nimi"
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Tälle tuotteelle pitää määrittää valmistuserä"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Reason"
+msgstr "Hankinnan syy"
+
+#. module: procurement
+#: sql_constraint:stock.warehouse.orderpoint:0
+msgid "Qty Multiple must be greater than zero."
+msgstr "Määrän kertoimen tulee olla yli 0"
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr "Tilaa maksimiin"
+
+#. module: procurement
+#: field:procurement.order,date_close:0
+msgid "Date Closed"
+msgstr "Sulkemispäivä"
+
+#. 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 "Ei voi poistaa hankintatilauksia jotka ovat tilassa %s !"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:324
+#, python-format
+msgid "Data Insufficient !"
+msgstr "Riittämätön data!"
+
+#. 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 "Ominaisuusryhmä"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Misc"
+msgstr "Sekalaiset"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Locations"
+msgstr "Sijainnit"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "from stock"
+msgstr "varastosta"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "General Information"
+msgstr "Yleiset tiedot"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Run Procurement"
+msgstr "Suorita hankinta"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Done"
+msgstr "Valmis"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will by rounded up to this multiple."
+msgstr "Hankinnan määrä pyöristetään ylös tähän moninkertaan."
+
+#. 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 "Peruuta"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr "Uusintatilauksen tapa"
+
+#. module: procurement
+#: field:procurement.order,origin:0
+msgid "Source Document"
+msgstr "Lähdedokumentti"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Not urgent"
+msgstr "Ei kiireellinen"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Laske kaikki ajastimet"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Current"
+msgstr "Nykyinen"
+
+#. module: procurement
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr "Poikkeavat hankinnat"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Details"
+msgstr "Yksityiskohdat"
+
+#. 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 "Hankinnan poikkeamat"
+
+#. 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 "Varaston minimirajat"
+
+#. module: procurement
+#: field:procurement.order,close_move:0
+msgid "Close Move at end"
+msgstr "Sulje siirto lopussa"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Scheduled Date"
+msgstr "Suunniteltu päivämäärä"
+
+#. 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 "Tuote"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary"
+msgstr "Väliaikainen"
+
+#. module: procurement
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+msgid "Description"
+msgstr "Kuvaus"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr "minimi"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Quantity Rules"
+msgstr "Määräsäännöt"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Running"
+msgstr "Käynnissä olevat"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product UOM"
+msgstr "Tuotteen mittayksikkö"
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_serviceonorder0
+msgid "Make to Order"
+msgstr "Valmista tilaukselle"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "UOM"
+msgstr "Mittayksikkö"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Odotetaan"
+
+#. 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 "Varaus"
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr "Hankintatapa riippuu tuotteen tyypistä"
+
+#. 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 "MRP ja logistiikka ajastin"
+
+#. module: procurement
+#: field:mrp.property,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr "Nimi"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr "maksimi"
+
+#. module: procurement
+#: field:procurement.order,product_uos:0
+msgid "Product UoS"
+msgstr "Tuotteen myyntiyksikkö"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:353
+#, python-format
+msgid "from stock: products assigned."
+msgstr "varastosta: tuotteet määrätty."
+
+#. 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 "Laske ajastimet"
+
+#. 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 "Tuotteen mittayksikkö"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Search Procurement"
+msgstr "Hae hankinnoista"
+
+#. 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 ""
+"Aikaikkuna jonka ajastin analysoi hankintojen laskennassa. Kaikki hankinnat "
+"jotka eivät ole jakson tänään  ja tänään+jakso sisällä ohitetaan tulevia "
+"laskentoja varten"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Very Urgent"
+msgstr "Erittäin kiireellinen"
+
+#. module: procurement
+#: field:procurement.orderpoint.compute,automatic:0
+msgid "Automatic Orderpoint"
+msgstr "Automaattinen tilauspiste"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Details"
+msgstr "Hankinnan yksityiskohdat"
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:180
+#, python-format
+msgid "SCHEDULER"
+msgstr "AJASTIN"
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 743ef85a9ea..f05ca64144d 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -527,7 +527,7 @@ class stock_warehouse_orderpoint(osv.osv):
             help="The procurement quantity will be rounded up to this multiple."),
         'procurement_id': fields.many2one('procurement.order', 'Latest procurement', ondelete="set null"),
         'company_id': fields.many2one('res.company','Company',required=True),
-        'procurement_draft_ids': fields.function(_get_draft_procurements, method=True, type='many2many', relation="procurement.order", \
+        'procurement_draft_ids': fields.function(_get_draft_procurements, type='many2many', relation="procurement.order", \
                                 string="Related Procurement Orders",help="Draft procurement of the product and location of that orderpoint"),
     }
     _defaults = {
diff --git a/addons/procurement/security/procurement_security.xml b/addons/procurement/security/procurement_security.xml
index 2e250db461c..b6b15d565c6 100644
--- a/addons/procurement/security/procurement_security.xml
+++ b/addons/procurement/security/procurement_security.xml
@@ -6,14 +6,14 @@
             <field name="name">procurement multi-company</field>
             <field name="model_id" search="[('model','=','procurement.order')]" model="ir.model"/>
             <field name="global" eval="True"/>
-            <field name="domain_force">['|','|',('company_id','child_of',[user.company_id.id]),('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id])]</field>
+            <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
         </record>
 
         <record model="ir.rule" id="stock_warehouse_orderpoint_rule">
             <field name="name">stock_warehouse.orderpoint multi-company</field>
             <field name="model_id" search="[('model','=','stock.warehouse.orderpoint')]" model="ir.model"/>
             <field name="global" eval="True"/>
-            <field name="domain_force">['|','|',('company_id','child_of',[user.company_id.id]),('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id])]</field>
+            <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
         </record>
 
     </data>
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index a1ee0d144b5..bcddcc93bdf 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -55,6 +55,7 @@ Print product labels with barcode.
         'product_data.xml',
         'product_report.xml',
         'product_view.xml',
+        'wizard/product_installer.xml',
         'product_shortcut_data.xml',
         'pricelist_view.xml',
         'partner_view.xml',
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index 854d6666f3d..fab7b68520a 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\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 23:51+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-06-04 14:36+0000\n"
+"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-05 04:35+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
 msgid "DDR 512MB PC400"
-msgstr ""
+msgstr "DDR 512MB PC400"
 
 #. module: product
 #: field:product.packaging,rows:0
 msgid "Number of Layers"
-msgstr ""
+msgstr "số lớp"
 
 #. module: product
 #: constraint:product.pricelist.item:0
@@ -53,12 +53,12 @@ msgstr "Có thể bán"
 #. module: product
 #: model:product.template,name:product.product_product_mb2_product_template
 msgid "Mainboard ASUStek A7V8X-X"
-msgstr ""
+msgstr "Mainboard ASUStek A7V8X-X"
 
 #. module: product
 #: help:product.template,seller_qty:0
 msgid "This is minimum quantity to purchase from Main Supplier."
-msgstr ""
+msgstr "Đây là số lượng tối thiểu để mua từ Nhà cung cấp Chính."
 
 #. module: product
 #: model:product.uom,name:product.uom_day
@@ -73,7 +73,7 @@ msgstr "Đơn vị đo"
 #. module: product
 #: model:product.template,name:product.product_product_pc2_product_template
 msgid "Basic+ PC (assembly on order)"
-msgstr ""
+msgstr "Cơ bản + PC (lắp ráp về trật tự)"
 
 #. module: product
 #: field:product.product,incoming_qty:0
@@ -91,6 +91,7 @@ msgid ""
 "This pricelist will be used, instead of the default one, for sales to the "
 "current partner"
 msgstr ""
+"Bảng giá này sẽ được sử dụng, thay vì mặc định, để bán cho đối tác hiện tại"
 
 #. module: product
 #: constraint:product.supplierinfo:0
@@ -98,11 +99,13 @@ msgid ""
 "Error: The default UOM and the Supplier Product UOM must be in the same "
 "category."
 msgstr ""
+"Lỗi: Đơn vị đo lường và mặc định của Nhà cung cấp sản phẩm của đơn vị đo "
+"phải được trong cùng thể loại."
 
 #. module: product
 #: field:product.template,seller_qty:0
 msgid "Supplier Quantity"
-msgstr ""
+msgstr "Chất lượng cung ứng"
 
 #. module: product
 #: selection:product.template,mes_type:0
@@ -111,8 +114,8 @@ msgstr "Cố định"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Cảnh báo !"
@@ -146,7 +149,7 @@ msgstr "Tham chiếu"
 #. module: product
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Lỗi ! Bạn không thể tạo ra loại đệ quy."
 
 #. module: product
 #: help:pricelist.partnerinfo,min_quantity:0
@@ -154,6 +157,9 @@ msgid ""
 "The minimal quantity to trigger this rule, expressed in the supplier UoM if "
 "any or in the default UoM of the product otherrwise."
 msgstr ""
+"Số lượng tối thiểu để kích hoạt các quy tắc này, thể hiện trong các đơn vị "
+"cung cấp số đo nếu có hoặc trong các đơn vị đo mặc định của các sản phẩm "
+"khác khôn ngoan."
 
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
@@ -193,12 +199,12 @@ msgstr "Các loại đơn vị đo"
 #. module: product
 #: model:product.template,name:product.product_product_cpu1_product_template
 msgid "Processor AMD Athlon XP 1800+"
-msgstr ""
+msgstr "Processor AMD Athlon XP 1800+"
 
 #. module: product
 #: model:product.template,name:product.product_product_20_product_template
 msgid "HDD on demand"
-msgstr ""
+msgstr "HDD theo yêu cầu"
 
 #. module: product
 #: field:product.price_list,price_list:0
@@ -223,7 +229,7 @@ msgstr "Khác"
 #. module: product
 #: model:product.template,name:product.product_product_worker0_product_template
 msgid "Worker"
-msgstr ""
+msgstr "Công nhân"
 
 #. module: product
 #: help:product.template,sale_ok:0
@@ -231,6 +237,8 @@ msgid ""
 "Determines if the product can be visible in the list of product within a "
 "selection from a sale order line."
 msgstr ""
+"Xác định các sản phẩm có thể được hiển thị trong danh sách các sản phẩm "
+"trong một lựa chọn từ một đường để bán."
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
@@ -257,10 +265,10 @@ msgstr "Loại sản phẩm"
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr "  e.g: 1 * (đơn vị) = ratio * (đơn vị tham chiếu)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Sản phẩm: "
@@ -293,12 +301,12 @@ msgstr ""
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
 msgid "Supplier name, price, product code, ..."
-msgstr ""
+msgstr "tên NCC, giá, mã sản phẩm, ..."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd3_product_template
 msgid "HDD Seagate 7200.8 160GB"
-msgstr ""
+msgstr "HDD Seagate 7200.8 160GB"
 
 #. module: product
 #: field:product.product,ean13:0
@@ -308,7 +316,7 @@ msgstr "EAN13"
 #. module: product
 #: field:product.template,seller_id:0
 msgid "Main Supplier"
-msgstr ""
+msgstr "Nhà Cung Cấp Chính"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_ul_form_action
@@ -335,7 +343,7 @@ msgstr "Quy tắc này chỉ áp dụng nếu đối tác mua/bán nhiều hơn
 #. module: product
 #: model:product.template,name:product.product_product_woodmm0_product_template
 msgid "Wood 2mm"
-msgstr ""
+msgstr "gỗ 2mm"
 
 #. module: product
 #: field:product.price_list,qty1:0
@@ -345,7 +353,7 @@ msgstr "Số lượng-1"
 #. module: product
 #: help:product.packaging,ul_qty:0
 msgid "The number of packages by layer"
-msgstr ""
+msgstr "Số lượng các gói của lớp"
 
 #. module: product
 #: field:product.packaging,qty:0
@@ -362,7 +370,7 @@ msgstr "Tình trạng"
 #. module: product
 #: help:product.template,categ_id:0
 msgid "Select category for the current product"
-msgstr ""
+msgstr "lựa chọn danh mục của sản phẩm"
 
 #. module: product
 #: field:product.product,outgoing_qty:0
@@ -533,7 +541,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1258,7 +1266,7 @@ msgid "Pallet Dimension"
 msgstr "Kích thước pallet"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -1728,7 +1736,7 @@ msgstr ""
 "Giá cơ bản để tính giá bán cho khách hàng. Đôi khi được gọi là giá catalog."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Mục đối tác của form sản phẩm"
@@ -2150,7 +2158,7 @@ msgid "Description"
 msgstr "Mô tả"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2197,7 +2205,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Bảng giá khác"
diff --git a/addons/product/partner.py b/addons/product/partner.py
index 7aa9b3bc426..f779f3dcd4d 100644
--- a/addons/product/partner.py
+++ b/addons/product/partner.py
@@ -32,7 +32,6 @@ class res_partner(osv.osv):
             relation='product.pricelist', 
             domain=[('type','=','sale')],
             string="Sale Pricelist", 
-            method=True,
             view_load=True,
             help="This pricelist will be used, instead of the default one, for sales to the current partner"),
     }
diff --git a/addons/product/product.py b/addons/product/product.py
index 38ee641507c..9deaf3398b1 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -102,7 +102,7 @@ class product_uom(osv.osv):
                     '1 * (reference unit) = ratio * (this unit)'),
         'factor_inv': fields.function(_factor_inv, digits_compute=dp.get_precision('Product UoM'),
             fnct_inv=_factor_inv_write,
-            method=True, string='Ratio',
+            string='Ratio',
             help='How many times this UoM is bigger than the reference UoM in this category:\n'\
                     '1 * (this unit) = ratio * (reference unit)', required=True),
         'rounding': fields.float('Rounding Precision', digits_compute=dp.get_precision('Product UoM'), required=True,
@@ -206,7 +206,7 @@ class product_category(osv.osv):
     _description = "Product Category"
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
-        'complete_name': fields.function(_name_get_fnc, method=True, type="char", string='Name'),
+        'complete_name': fields.function(_name_get_fnc, type="char", string='Name'),
         'parent_id': fields.many2one('product.category','Parent Category', select=True),
         'child_id': fields.one2many('product.category', 'parent_id', string='Child Categories'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of product categories."),
@@ -296,9 +296,9 @@ class product_template(osv.osv):
             help='Coefficient to convert UOM to UOS\n'
             ' uos = uom * coeff'),
         'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type', required=True),
-        'seller_delay': fields.function(_calc_seller, method=True, type='integer', string='Supplier Lead Time', multi="seller_delay", help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."),
-        'seller_qty': fields.function(_calc_seller, method=True, type='float', string='Supplier Quantity', multi="seller_qty", help="This is minimum quantity to purchase from Main Supplier."),
-        'seller_id': fields.function(_calc_seller, method=True, type='many2one', relation="res.partner", string='Main Supplier', help="Main Supplier who has highest priority in Supplier List.", multi="seller_id"),
+        'seller_delay': fields.function(_calc_seller, type='integer', string='Supplier Lead Time', multi="seller_delay", help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."),
+        'seller_qty': fields.function(_calc_seller, type='float', string='Supplier Quantity', multi="seller_qty", help="This is minimum quantity to purchase from Main Supplier."),
+        'seller_id': fields.function(_calc_seller, type='many2one', relation="res.partner", string='Main Supplier', help="Main Supplier who has highest priority in Supplier List.", multi="seller_id"),
         'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Partners'),
         'loc_rack': fields.char('Rack', size=16),
         'loc_row': fields.char('Row', size=16),
@@ -317,8 +317,12 @@ class product_template(osv.osv):
         if 'categ_id' in context and context['categ_id']:
             return context['categ_id']
         md = self.pool.get('ir.model.data')
-        res = md.get_object_reference(cr, uid, 'product', 'cat0') or False
-        return res and res[1] or False
+        res = False
+        try:
+            res = md.get_object_reference(cr, uid, 'product', 'cat0')[1]
+        except ValueError:
+            res = False
+        return res
 
     def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id):
         if uom_id:
@@ -465,14 +469,14 @@ class product_product(osv.osv):
     _inherits = {'product.template': 'product_tmpl_id'}
     _order = 'default_code,name_template'
     _columns = {
-        'qty_available': fields.function(_product_qty_available, method=True, type='float', string='Real Stock'),
-        'virtual_available': fields.function(_product_virtual_available, method=True, type='float', string='Virtual Stock'),
-        'incoming_qty': fields.function(_product_incoming_qty, method=True, type='float', string='Incoming'),
-        'outgoing_qty': fields.function(_product_outgoing_qty, method=True, type='float', string='Outgoing'),
-        'price': fields.function(_product_price, method=True, type='float', string='Pricelist', digits_compute=dp.get_precision('Sale Price')),
-        'lst_price' : fields.function(_product_lst_price, method=True, type='float', string='Public Price', digits_compute=dp.get_precision('Sale Price')),
-        'code': fields.function(_product_code, method=True, type='char', string='Reference'),
-        'partner_ref' : fields.function(_product_partner_ref, method=True, type='char', string='Customer ref'),
+        'qty_available': fields.function(_product_qty_available, type='float', string='Real Stock'),
+        'virtual_available': fields.function(_product_virtual_available, type='float', string='Virtual Stock'),
+        'incoming_qty': fields.function(_product_incoming_qty, type='float', string='Incoming'),
+        'outgoing_qty': fields.function(_product_outgoing_qty, type='float', string='Outgoing'),
+        'price': fields.function(_product_price, type='float', string='Pricelist', digits_compute=dp.get_precision('Sale Price')),
+        'lst_price' : fields.function(_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Sale Price')),
+        'code': fields.function(_product_code, type='char', string='Reference'),
+        'partner_ref' : fields.function(_product_partner_ref, type='char', string='Customer ref'),
         'default_code' : fields.char('Reference', size=64),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the product without removing it."),
         'variants': fields.char('Variants', size=64),
@@ -729,7 +733,7 @@ class product_supplierinfo(osv.osv):
         'sequence' : fields.integer('Sequence', help="Assigns the priority to the list of product supplier."),
         'product_uom': fields.many2one('product.uom', string="Supplier UoM", help="Choose here the Unit of Measure in which the prices and quantities are expressed below."),
         'min_qty': fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase to this supplier, expressed in the supplier Product UoM if not empty, in the default unit of measure of the product otherwise."),
-        'qty': fields.function(_calc_qty, method=True, store=True, type='float', string='Quantity', multi="qty", help="This is a quantity which is converted into Default Uom."),
+        'qty': fields.function(_calc_qty, store=True, type='float', string='Quantity', multi="qty", help="This is a quantity which is converted into Default Uom."),
         'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True),
         'delay' : fields.integer('Delivery Lead Time', required=True, help="Lead time in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning."),
         'pricelist_ids': fields.one2many('pricelist.partnerinfo', 'suppinfo_id', 'Supplier Pricelist'),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 71835c183f8..1d30bc2bb43 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -21,6 +21,8 @@
                    <newline/>
                    <group expand="0" string="Context..." groups="base.group_extended">
                        <field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
+                       <separator orientation="vertical" groups="base.group_multi_company" />
+                       <field name="company_id" widget="selection" groups="base.group_multi_company" />
                    </group>
                    <newline/>
                    <group  expand='0' string='Group by...' groups="base.group_extended">
@@ -29,6 +31,8 @@
                        <filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'uom_id'}" />
                        <separator orientation="vertical"/>
                        <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}" />
+                       <separator orientation="vertical" groups="base.group_multi_company"/>
+                       <filter string='Company' icon="terp-go-home" domain="[]" context="{'group_by' : 'company_id'}" groups="base.group_multi_company" />
                    </group>
 
                 </search>
@@ -54,6 +58,7 @@
                     <field name="price" invisible="not context.get('pricelist',False)"/>
                     <field name="standard_price"/>
                     <field name="state" groups="base.group_extended"/>
+                    <field name="company_id" groups="base.group_multi_company" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -290,8 +295,7 @@
             <field name="res_model">product.product</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('categ_id','child_of',[active_id])]</field>
-            <field name="context">{'categ_id':active_id}</field>
+            <field name="context">{'categ_id':active_id, 'search_default_categ_id':active_id}</field>
         </record>
         <record id="ir_product_category_open" model="ir.values">
             <field eval="'tree_but_open'" name="key2"/>
diff --git a/addons/product/wizard/product_installer.xml b/addons/product/wizard/product_installer.xml
new file mode 100644
index 00000000000..aefab59dde8
--- /dev/null
+++ b/addons/product/wizard/product_installer.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+         <record id="product_form_config_action" model="ir.actions.act_window">
+            <field name="name">Create some Products</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="product.product_normal_form_view"/>
+            <field name="help">Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased.</field>
+        </record>
+        
+         <!--      register configuration wizard -->
+        <record id="config_wizard_res_product_installer" model="ir.actions.todo">
+            <field name="action_id" ref="product_form_config_action"/>
+            <field name="category_id" ref="base.category_sales_management_config"/>
+            <field name="target">current</field>
+            <field name="type">normal</field>
+            <field name="sequence">20</field>
+            <field name="state">skip</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/product_expiry/i18n/fi.po b/addons/product_expiry/i18n/fi.po
new file mode 100644
index 00000000000..03098dfc7b1
--- /dev/null
+++ b/addons/product_expiry/i18n/fi.po
@@ -0,0 +1,181 @@
+# Finnish 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-06-27 06:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: product_expiry
+#: model:ir.model,name:product_expiry.model_stock_production_lot
+msgid "Production lot"
+msgstr "Tuotantoerä"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_from_product_template
+msgid "Ham"
+msgstr "Kinkku"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_lait_product_template
+msgid "Cow milk"
+msgstr "Maito"
+
+#. module: product_expiry
+#: model:ir.module.module,shortdesc:product_expiry.module_meta_information
+msgid "Products date of expiry"
+msgstr "Tuotteet viimeisen käyttöpäivän mukaan"
+
+#. module: product_expiry
+#: field:product.product,life_time:0
+msgid "Product Life Time"
+msgstr "Tuotteen elinikä"
+
+#. module: product_expiry
+#: help:stock.production.lot,use_date:0
+msgid ""
+"The date on which the lot starts deteriorating without becoming dangerous."
+msgstr ""
+"Päivä jolloin erän laatu alkaa heikkenemään ennenkun se tulee vaaralliseksi."
+
+#. module: product_expiry
+#: field:product.product,use_time:0
+msgid "Product Use Time"
+msgstr "Tuotteen käyttöaika"
+
+#. module: product_expiry
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
+"Sarjanumeron ja sisäisen viitenumeron yhdistelmän on oltava uniikki !"
+
+#. module: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid "The date on which the lot should be removed."
+msgstr "Päivä jolloin erä tulisi poistaa."
+
+#. module: product_expiry
+#: model:ir.model,name:product_expiry.model_product_product
+msgid "Product"
+msgstr "Tuote"
+
+#. module: product_expiry
+#: help:product.product,alert_time:0
+msgid ""
+"The number of days after which an alert should be notified about the "
+"production lot."
+msgstr "Päivien määrä jonka jälkeen tuote-erästä tulee hälytys."
+
+#. module: product_expiry
+#: field:product.product,removal_time:0
+msgid "Product Removal Time"
+msgstr "Tuotteen poistopäivä"
+
+#. module: product_expiry
+#: field:stock.production.lot,removal_date:0
+msgid "Removal Date"
+msgstr "Poistopäivä"
+
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid ""
+"The date on which the lot may become dangerous and should not be consumed."
+msgstr ""
+"Päivä jolloin erä muuttuu vaaralliseksi, eikä sitä tule enään käyttää."
+
+#. module: product_expiry
+#: model:ir.module.module,description:product_expiry.module_meta_information
+msgid ""
+"Track different dates on products and production lots:\n"
+" - end of life\n"
+" - best before date\n"
+" - removal date\n"
+" - alert date\n"
+"Used, for example, in food industries."
+msgstr ""
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_pain_product_template
+msgid "Bread"
+msgstr "Leipä"
+
+#. module: product_expiry
+#: model:product.uom,name:product_expiry.product_uom_ltr
+#: model:product.uom.categ,name:product_expiry.product_uom_categ_vol
+msgid "LTR"
+msgstr ""
+
+#. module: product_expiry
+#: view:product.product:0
+#: view:stock.production.lot:0
+msgid "Dates"
+msgstr "Päivämäärät"
+
+#. module: product_expiry
+#: field:stock.production.lot,life_date:0
+msgid "End of Life Date"
+msgstr "Elinkaaren loppupäivä"
+
+#. module: product_expiry
+#: field:stock.production.lot,use_date:0
+msgid "Best before Date"
+msgstr "Parasta ennen päiväys"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_jambon_product_template
+msgid "French cheese Camenbert"
+msgstr "Ranskalaista Camenbert juustoa"
+
+#. module: product_expiry
+#: help:product.product,removal_time:0
+msgid "The number of days before a production lot should be removed."
+msgstr "Päivien määrä ennenkuin tuotantoerä tulisi poistaa."
+
+#. module: product_expiry
+#: field:stock.production.lot,alert_date:0
+msgid "Alert Date"
+msgstr "Hälytyspäivä"
+
+#. module: product_expiry
+#: help:product.product,use_time:0
+msgid ""
+"The number of days before a production lot starts deteriorating without "
+"becoming dangerous."
+msgstr ""
+
+#. module: product_expiry
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Virhe: Väärä EAN-koodi"
+
+#. module: product_expiry
+#: help:product.product,life_time:0
+msgid ""
+"The number of days before a production lot may become dangerous and should "
+"not be consumed."
+msgstr ""
+"Päivien määrä ennenkuin tuotantoerä voi tulla vaaralliseksi eikä sitä enään "
+"tulisi käyttää."
+
+#. module: product_expiry
+#: help:stock.production.lot,alert_date:0
+msgid ""
+"The date on which an alert should be notified about the production lot."
+msgstr "Päivä jolloin tästä tuotantoerästä tulisi tehdä hälytys."
+
+#. module: product_expiry
+#: field:product.product,alert_time:0
+msgid "Product Alert Time"
+msgstr "Tuotten hälytysaika"
diff --git a/addons/product_manufacturer/i18n/fi.po b/addons/product_manufacturer/i18n/fi.po
new file mode 100644
index 00000000000..4d8ac103ccc
--- /dev/null
+++ b/addons/product_manufacturer/i18n/fi.po
@@ -0,0 +1,87 @@
+# Finnish 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-06-20 10:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-21 04:36+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: product_manufacturer
+#: model:ir.module.module,description:product_manufacturer.module_meta_information
+msgid "A module that add manufacturers and attributes on the product form"
+msgstr "Moduuli jo lisää valmistajia ja attribuutteja tuotelomakkeelle"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pref:0
+msgid "Manufacturer Product Code"
+msgstr "Valmistajan tuotekoodi"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Tuote"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+msgid "Product Template Name"
+msgstr "Tuotemallipohjan nimi"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
+msgid "Product attributes"
+msgstr "Tuotteen attribuutit"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+#: view:product.product:0
+msgid "Product Attributes"
+msgstr "Tuotteen attribuutit"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,name:0
+msgid "Attribute"
+msgstr "Attribuutti"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,value:0
+msgid "Value"
+msgstr "Arvo"
+
+#. module: product_manufacturer
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Virhe: Väärä EAN-koodi"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,attribute_ids:0
+msgid "Attributes"
+msgstr "Attribuutit"
+
+#. module: product_manufacturer
+#: model:ir.module.module,shortdesc:product_manufacturer.module_meta_information
+msgid "Products Attributes & Manufacturers"
+msgstr "Tuotteen attribuutit ja valmistajat"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pname:0
+msgid "Manufacturer Product Name"
+msgstr "Valmistajan tuotenimi"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,manufacturer:0
+msgid "Manufacturer"
+msgstr "Valmistaja"
diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
index 37639c3b223..5895feedf3f 100644
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@@ -92,38 +92,38 @@ class product_product(osv.osv):
         return res
 
     _columns = {
-        'date_from': fields.function(_product_margin, method=True, type='date', string='From Date', multi='product_margin'),
-        'date_to': fields.function(_product_margin, method=True, type='date', string='To Date', multi='product_margin'),
-        'invoice_state': fields.function(_product_margin, method=True, type='selection', selection=[
+        'date_from': fields.function(_product_margin, type='date', string='From Date', multi='product_margin'),
+        'date_to': fields.function(_product_margin, type='date', string='To Date', multi='product_margin'),
+        'invoice_state': fields.function(_product_margin, type='selection', selection=[
                 ('paid','Paid'),('open_paid','Open and Paid'),('draft_open_paid','Draft, Open and Paid')
             ], string='Invoice State',multi='product_margin', readonly=True),
-        'sale_avg_price' : fields.function(_product_margin, method=True, type='float', string='Avg. Unit Price', multi='product_margin',
+        'sale_avg_price' : fields.function(_product_margin, type='float', string='Avg. Unit Price', multi='product_margin',
             help="Avg. Price in Customer Invoices)"),
-        'purchase_avg_price' : fields.function(_product_margin, method=True, type='float', string='Avg. Unit Price', multi='product_margin',
+        'purchase_avg_price' : fields.function(_product_margin, type='float', string='Avg. Unit Price', multi='product_margin',
             help="Avg. Price in Supplier Invoices "),
-        'sale_num_invoiced' : fields.function(_product_margin, method=True, type='float', string='# Invoiced', multi='product_margin',
+        'sale_num_invoiced' : fields.function(_product_margin, type='float', string='# Invoiced', multi='product_margin',
             help="Sum of Quantity in Customer Invoices"),
-        'purchase_num_invoiced' : fields.function(_product_margin, method=True, type='float', string='# Invoiced', multi='product_margin',
+        'purchase_num_invoiced' : fields.function(_product_margin, type='float', string='# Invoiced', multi='product_margin',
             help="Sum of Quantity in Supplier Invoices"),
-        'sales_gap' : fields.function(_product_margin, method=True, type='float', string='Sales Gap', multi='product_margin',
+        'sales_gap' : fields.function(_product_margin, type='float', string='Sales Gap', multi='product_margin',
             help="Expected Sale - Turn Over"),
-        'purchase_gap' : fields.function(_product_margin, method=True, type='float', string='Purchase Gap', multi='product_margin',
+        'purchase_gap' : fields.function(_product_margin, type='float', string='Purchase Gap', multi='product_margin',
             help="Normal Cost - Total Cost"),
-        'turnover' : fields.function(_product_margin, method=True, type='float', string='Turnover' ,multi='product_margin',
+        'turnover' : fields.function(_product_margin, type='float', string='Turnover' ,multi='product_margin',
             help="Sum of Multification of Invoice price and quantity of Customer Invoices"),
-        'total_cost'  : fields.function(_product_margin, method=True, type='float', string='Total Cost', multi='product_margin',
+        'total_cost'  : fields.function(_product_margin, type='float', string='Total Cost', multi='product_margin',
             help="Sum of Multification of Invoice price and quantity of Supplier Invoices "),
-        'sale_expected' :  fields.function(_product_margin, method=True, type='float', string='Expected Sale', multi='product_margin',
+        'sale_expected' :  fields.function(_product_margin, type='float', string='Expected Sale', multi='product_margin',
             help="Sum of Multification of Sale Catalog price and quantity of Customer Invoices"),
-        'normal_cost'  : fields.function(_product_margin, method=True, type='float', string='Normal Cost', multi='product_margin',
+        'normal_cost'  : fields.function(_product_margin, type='float', string='Normal Cost', multi='product_margin',
             help="Sum of Multification of Cost price and quantity of Supplier Invoices"),
-        'total_margin' : fields.function(_product_margin, method=True, type='float', string='Total Margin', multi='product_margin',
+        'total_margin' : fields.function(_product_margin, type='float', string='Total Margin', multi='product_margin',
             help="Turnorder - Standard price"),
-        'expected_margin' : fields.function(_product_margin, method=True, type='float', string='Expected Margin', multi='product_margin',
+        'expected_margin' : fields.function(_product_margin, type='float', string='Expected Margin', multi='product_margin',
             help="Expected Sale - Normal Cost"),
-        'total_margin_rate' : fields.function(_product_margin, method=True, type='float', string='Total Margin (%)', multi='product_margin',
+        'total_margin_rate' : fields.function(_product_margin, type='float', string='Total Margin (%)', multi='product_margin',
             help="Total margin * 100 / Turnover"),
-        'expected_margin_rate' : fields.function(_product_margin, method=True, type='float', string='Expected Margin (%)', multi='product_margin',
+        'expected_margin_rate' : fields.function(_product_margin, type='float', string='Expected Margin (%)', multi='product_margin',
             help="Expected margin * 100 / Expected Sale"),
     }
 
diff --git a/addons/product_visible_discount/i18n/fi.po b/addons/product_visible_discount/i18n/fi.po
new file mode 100644
index 00000000000..5e067054acc
--- /dev/null
+++ b/addons/product_visible_discount/i18n/fi.po
@@ -0,0 +1,81 @@
+# Finnish 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-06-09 10:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:147
+#, python-format
+msgid "No Purchase Pricelist Found !"
+msgstr "Ostohintalistaa ei löytynyt!"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:155
+#, python-format
+msgid "No Sale Pricelist Found "
+msgstr "Myyntihintalisaa ei löytynyt "
+
+#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_meta_information
+msgid ""
+"\n"
+"    This module lets you calculate discounts on Sale Order lines and Invoice "
+"lines base on the partner's pricelist.\n"
+"    To this end, a new check box named \"Visible Discount\" is added to the "
+"pricelist form.\n"
+"    Example:\n"
+"        For the product PC1 and the partner \"Asustek\": if listprice=450, "
+"and the price calculated using Asustek's pricelist is 225\n"
+"        If the check box is checked, we will have on the sale order line: "
+"Unit price=450, Discount=50,00, Net price=225\n"
+"        If the check box is unchecked, we will have on Sale Order and "
+"Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+"    "
+msgstr ""
+
+#. module: product_visible_discount
+#: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "Näkyvä alennus"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Laskun rivi"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:155
+#, python-format
+msgid "You must first define a pricelist for Customer !"
+msgstr "Sinun täytyy ensin määritellä asiakkaan hinnasto!"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_product_pricelist
+msgid "Pricelist"
+msgstr "Hinnasto"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:147
+#, python-format
+msgid "You must first define a pricelist for Supplier !"
+msgstr "Sinun täytyy ensin määritellä toimittajan hinnasto!"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Myyntitilausrivi"
diff --git a/addons/profile_tools/i18n/fi.po b/addons/profile_tools/i18n/fi.po
new file mode 100644
index 00000000000..54edf5dbbbd
--- /dev/null
+++ b/addons/profile_tools/i18n/fi.po
@@ -0,0 +1,145 @@
+# Finnish 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-06-22 09:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: profile_tools
+#: help:misc_tools.installer,idea:0
+msgid "Promote ideas of the employees, votes and discussion on best ideas."
+msgstr ""
+"Edistää työntekijöiden ideoita, äänestystä ja keskustelua parhaista ideoista."
+
+#. 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 ""
+
+#. module: profile_tools
+#: help:misc_tools.installer,lunch:0
+msgid "A simple module to help you to manage Lunch orders."
+msgstr "yksinkertainen moduuli lounastilausten hallintaan."
+
+#. module: profile_tools
+#: field:misc_tools.installer,subscription:0
+msgid "Recurring Documents"
+msgstr "Toistuvat dokumentit"
+
+#. module: profile_tools
+#: model:ir.model,name:profile_tools.model_misc_tools_installer
+msgid "misc_tools.installer"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Configure"
+msgstr "Konfiguroi"
+
+#. module: profile_tools
+#: help:misc_tools.installer,survey:0
+msgid "Allows you to organize surveys."
+msgstr "Mahdollistaa kyselyjen organisoinnin."
+
+#. module: profile_tools
+#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
+msgid "Miscellaneous Tools"
+msgstr "Sekalaiset työkalut"
+
+#. 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 "Lunch"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Extra Tools Configuration"
+msgstr "Ylimääräisten työkalujen konfiguaatio"
+
+#. module: profile_tools
+#: field:misc_tools.installer,idea:0
+msgid "Ideas Box"
+msgstr "Idealaatikkoa"
+
+#. module: profile_tools
+#: help:misc_tools.installer,subscription:0
+msgid "Helps to generate automatically recurring documents."
+msgstr "Auttaa luomaan toistuvia automaattisia dokumentteja."
+
+#. module: profile_tools
+#: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
+msgid "Tools Configuration"
+msgstr "Työkalujen konfigurointi"
+
+#. module: profile_tools
+#: field:misc_tools.installer,pad:0
+msgid "Collaborative Note Pads"
+msgstr "Yhteiset muistiinpanot"
+
+#. module: profile_tools
+#: field:misc_tools.installer,survey:0
+msgid "Survey"
+msgstr "Kysely"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Configure Extra Tools"
+msgstr "Konfiguroi ylimääräiset työkalut"
+
+#. module: profile_tools
+#: field:misc_tools.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Konfiguraation eteneminen"
+
+#. module: profile_tools
+#: field:misc_tools.installer,config_logo:0
+msgid "Image"
+msgstr "Kuva"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "title"
+msgstr "otsikko"
+
+#. module: profile_tools
+#: field:misc_tools.installer,share:0
+msgid "Web Share"
+msgstr "Nettijako"
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
index 6f68b63cc02..44258234d11 100644
--- a/addons/profile_tools/installer.py
+++ b/addons/profile_tools/installer.py
@@ -21,8 +21,7 @@
 from osv import fields, osv
 
 class misc_tools_installer(osv.osv_memory):
-    _name = 'misc_tools.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         'lunch':fields.boolean('Lunch',help='A simple module to help you to manage Lunch orders.'),
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index 235d2d6e392..6804e1dadd0 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -2,54 +2,23 @@
   <data>
     <record id="view_misc_tools_installer" model="ir.ui.view">
       <field name="name">misc_tools.installer.view</field>
-      <field name="model">misc_tools.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes">
-            <attribute name="string">Extra Tools Configuration</attribute>
-          </form>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                <attribute name='string'></attribute>
+          <xpath expr="//group[@name='profile_tools']" position="replace">
+            <newline/>
+            <separator  string="Extra Tools Features" colspan="4" />
+            <field name="share" />
+            <field name="lunch" />
+            <field name="idea" />
+            <field name="survey" />
+            <field name="subscription" />
+            <field name="pad" />            
           </xpath>
-
-          <separator string="title" position="attributes">
-            <attribute name="string">Configure Extra Tools</attribute>
-          </separator>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">Extra Tools are applications that can help you improve your organization although they are not key for company management.</attribute>
-          </xpath>
-          <xpath expr="//button[@string='Install Modules']" position="attributes">
-              <attribute name="string">Configure</attribute>
-          </xpath>
-          <group colspan="8">
-            <field name="share"/>
-            <field name="lunch"/>
-            <field name="idea"/>
-            <field name="survey"/>
-            <field name="subscription" groups="base.group_extended"/>
-            <field name="pad"/>
-          </group>
         </data>
       </field>
     </record>
-
-    <record id="action_misc_tools_installer" model="ir.actions.act_window">
-      <field name="name">Tools Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">misc_tools.installer</field>
-      <field name="view_id" ref="view_misc_tools_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="misc_tools_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_misc_tools_installer"/>
-        <field name="restart">always</field>
-      <field name="sequence">3</field>
-    </record>
   </data>
 </openerp>
diff --git a/addons/project/installer.py b/addons/project/installer.py
index 693e2d58018..36b458da296 100644
--- a/addons/project/installer.py
+++ b/addons/project/installer.py
@@ -22,8 +22,7 @@
 from osv import fields, osv
 
 class project_installer(osv.osv_memory):
-    _name = 'project.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         # Project Management
@@ -41,10 +40,10 @@ class project_installer(osv.osv_memory):
         'project_issue': fields.boolean('Issues Tracker',
             help="Automatically synchronizes project tasks and crm cases."),
         # Methodologies
-        'project_scrum': fields.boolean('SCRUM',
+        'project_scrum': fields.boolean('Methodology: SCRUM',
             help="Implements and tracks the concepts and task types defined "
                  "in the SCRUM methodology."),
-        'project_gtd': fields.boolean('Getting Things Done',
+        'project_gtd': fields.boolean('Methodology: Getting Things Done',
             help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
     }
 project_installer()
diff --git a/addons/project/project.py b/addons/project/project.py
index 6a262e16428..b1461da424c 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -123,7 +123,7 @@ class project(osv.osv):
         return super(project, self).unlink(cr, uid, ids, *args, **kwargs)
 
     _columns = {
-        'complete_name': fields.function(_complete_name, method=True, string="Project Name", type='char', size=250),
+        'complete_name': fields.function(_complete_name, string="Project Name", type='char', size=250),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the project without removing it."),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc.", ondelete="cascade", required=True),
@@ -133,18 +133,18 @@ class project(osv.osv):
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
             help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'tasks': fields.one2many('project.task', 'project_id', "Project tasks"),
-        'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
+        'planned_hours': fields.function(_progress_rate, multi="progress", string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
             store = {
                 'project.project': (lambda self, cr, uid, ids, c={}: ids, ['tasks'], 10),
                 'project.task': (_get_project_task, ['planned_hours', 'effective_hours', 'remaining_hours', 'total_hours', 'progress', 'delay_hours','state'], 10),
             }),
-        'effective_hours': fields.function(_progress_rate, multi="progress", method=True, string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects."),
-        'total_hours': fields.function(_progress_rate, multi="progress", method=True, string='Total Time', help="Sum of total hours of all tasks related to this project and its child projects.",
+        'effective_hours': fields.function(_progress_rate, multi="progress", string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects."),
+        'total_hours': fields.function(_progress_rate, multi="progress", string='Total Time', help="Sum of total hours of all tasks related to this project and its child projects.",
             store = {
                 'project.project': (lambda self, cr, uid, ids, c={}: ids, ['tasks'], 10),
                 'project.task': (_get_project_task, ['planned_hours', 'effective_hours', 'remaining_hours', 'total_hours', 'progress', 'delay_hours','state'], 10),
             }),
-        'progress_rate': fields.function(_progress_rate, multi="progress", method=True, string='Progress', type='float', group_operator="avg", help="Percent of tasks closed according to the total of tasks todo."),
+        'progress_rate': fields.function(_progress_rate, multi="progress", string='Progress', type='float', group_operator="avg", help="Percent of tasks closed according to the total of tasks todo."),
         'warn_customer': fields.boolean('Warn Partner', help="If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'warn_header': fields.text('Mail Header', help="Header added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
@@ -420,7 +420,7 @@ class task(osv.osv):
         return result.keys()
 
     _columns = {
-        'active': fields.function(_is_template, method=True, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
+        'active': fields.function(_is_template, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
         'name': fields.char('Task Summary', size=128, required=True),
         'description': fields.text('Description'),
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority'),
@@ -433,28 +433,28 @@ class task(osv.osv):
         'date_start': fields.datetime('Starting Date',select=True),
         'date_end': fields.datetime('Ending Date',select=True),
         'date_deadline': fields.date('Deadline',select=True),
-        'project_id': fields.many2one('project.project', 'Project', ondelete='cascade'),
+        'project_id': fields.many2one('project.project', 'Project', ondelete='set null', select="1"),
         'parent_ids': fields.many2many('project.task', 'project_task_parent_rel', 'task_id', 'parent_id', 'Parent Tasks'),
         'child_ids': fields.many2many('project.task', 'project_task_parent_rel', 'parent_id', 'task_id', 'Delegated Tasks'),
         'notes': fields.text('Notes'),
         'planned_hours': fields.float('Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
-        'effective_hours': fields.function(_hours_get, method=True, string='Hours Spent', multi='hours', help="Computed using the sum of the task work done.",
+        'effective_hours': fields.function(_hours_get, string='Hours Spent', multi='hours', help="Computed using the sum of the task work done.",
             store = {
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
         'remaining_hours': fields.float('Remaining Hours', digits=(16,2), help="Total remaining time, can be re-estimated periodically by the assignee of the task."),
-        'total_hours': fields.function(_hours_get, method=True, string='Total Hours', multi='hours', help="Computed as: Time Spent + Remaining Time.",
+        'total_hours': fields.function(_hours_get, string='Total Hours', multi='hours', help="Computed as: Time Spent + Remaining Time.",
             store = {
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
-        'progress': fields.function(_hours_get, method=True, string='Progress (%)', multi='hours', group_operator="avg", help="If the task has a progress of 99.99% you should close the task if it's finished or reevaluate the time",
+        'progress': fields.function(_hours_get, string='Progress (%)', multi='hours', group_operator="avg", help="If the task has a progress of 99.99% you should close the task if it's finished or reevaluate the time",
             store = {
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours','state'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
-        'delay_hours': fields.function(_hours_get, method=True, string='Delay Hours', multi='hours', help="Computed as difference of the time estimated by the project manager and the real time to close the task.",
+        'delay_hours': fields.function(_hours_get, string='Delay Hours', multi='hours', help="Computed as difference of the time estimated by the project manager and the real time to close the task.",
             store = {
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
@@ -529,8 +529,6 @@ class task(osv.osv):
     #
     # Override view according to the company definition
     #
-
-
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         users_obj = self.pool.get('res.users')
 
@@ -562,13 +560,27 @@ class task(osv.osv):
                 res['fields'][f]['string'] = res['fields'][f]['string'].replace('Hours',tm)
         return res
 
+    def _check_child_task(self, cr, uid, ids, context=None):
+        if context == None:
+            context = {}
+        tasks = self.browse(cr, uid, ids, context=context)
+        for task in tasks:
+            if task.child_ids:
+                for child in task.child_ids:
+                    if child.state in ['draft', 'open', 'pending']:
+                        raise osv.except_osv(_("Warning !"), _("Child task still open.\nPlease cancel or complete child task first."))
+        return True
+
     def action_close(self, cr, uid, ids, context=None):
         # This action open wizard to send email to partner or project manager after close task.
-        project_id = len(ids) and ids[0] or False
-        if not project_id: return False
-        task = self.browse(cr, uid, project_id, context=context)
+        if context == None:
+            context = {}
+        task_id = len(ids) and ids[0] or False
+        self._check_child_task(cr, uid, ids, context=context)
+        if not task_id: return False
+        task = self.browse(cr, uid, task_id, context=context)
         project = task.project_id
-        res = self.do_close(cr, uid, [project_id], context=context)
+        res = self.do_close(cr, uid, [task_id], context=context)
         if project.warn_manager or project.warn_customer:
             return {
                 'name': _('Send Email after close task'),
@@ -582,7 +594,7 @@ class task(osv.osv):
            }
         return res
 
-    def do_close(self, cr, uid, ids, context=None):
+    def do_close(self, cr, uid, ids, context={}):
         """
         Close Task
         """
@@ -601,7 +613,7 @@ class task(osv.osv):
                         'ref_partner_id': task.partner_id.id,
                         'ref_doc1': 'project.task,%d'% (task.id,),
                         'ref_doc2': 'project.project,%d'% (project.id,),
-                    })
+                    }, context=context)
 
             for parent_id in task.parent_ids:
                 if parent_id.state in ('pending','draft'):
@@ -610,12 +622,12 @@ class task(osv.osv):
                         if child.id != task.id and child.state not in ('done','cancelled'):
                             reopen = False
                     if reopen:
-                        self.do_reopen(cr, uid, [parent_id.id])
+                        self.do_reopen(cr, uid, [parent_id.id], context=context)
             vals.update({'state': 'done'})
             vals.update({'remaining_hours': 0.0})
             if not task.date_end:
                 vals.update({ 'date_end':time.strftime('%Y-%m-%d %H:%M:%S')})
-            self.write(cr, uid, [task.id],vals)
+            self.write(cr, uid, [task.id],vals, context=context)
             message = _("The task '%s' is done") % (task.name,)
             self.log(cr, uid, task.id, message)
         return True
@@ -634,15 +646,15 @@ class task(osv.osv):
                     'ref_partner_id': task.partner_id.id,
                     'ref_doc1': 'project.task,%d' % task.id,
                     'ref_doc2': 'project.project,%d' % project.id,
-                })
-
-            self.write(cr, uid, [task.id], {'state': 'open'})
+                }, context=context)
 
+            self.write(cr, uid, [task.id], {'state': 'open'}, context=context)
         return True
 
-    def do_cancel(self, cr, uid, ids, *args):
+    def do_cancel(self, cr, uid, ids, context={}):
         request = self.pool.get('res.request')
-        tasks = self.browse(cr, uid, ids)
+        tasks = self.browse(cr, uid, ids, context=context)
+        self._check_child_task(cr, uid, ids, context=context)
         for task in tasks:
             project = task.project_id
             if project.warn_manager and project.user_id and (project.user_id.id != uid):
@@ -654,25 +666,25 @@ class task(osv.osv):
                     'ref_partner_id': task.partner_id.id,
                     'ref_doc1': 'project.task,%d' % task.id,
                     'ref_doc2': 'project.project,%d' % project.id,
-                })
+                }, context=context)
             message = _("The task '%s' is cancelled.") % (task.name,)
             self.log(cr, uid, task.id, message)
-            self.write(cr, uid, [task.id], {'state': 'cancelled', 'remaining_hours':0.0})
+            self.write(cr, uid, [task.id], {'state': 'cancelled', 'remaining_hours':0.0}, context=context)
         return True
 
-    def do_open(self, cr, uid, ids, *args):
-        tasks= self.browse(cr,uid,ids)
+    def do_open(self, cr, uid, ids, context={}):
+        tasks= self.browse(cr, uid, ids, context=context)
         for t in tasks:
             data = {'state': 'open'}
             if not t.date_start:
                 data['date_start'] = time.strftime('%Y-%m-%d %H:%M:%S')
-            self.write(cr, uid, [t.id], data)
+            self.write(cr, uid, [t.id], data, context=context)
             message = _("The task '%s' is opened.") % (t.name,)
             self.log(cr, uid, t.id, message)
         return True
 
-    def do_draft(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state': 'draft'})
+    def do_draft(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state': 'draft'}, context=context)
         return True
 
     def do_delegate(self, cr, uid, task_id, delegate_data={}, context=None):
@@ -707,34 +719,48 @@ class task(osv.osv):
         self.log(cr, uid, task.id, message)
         return True
 
-    def do_pending(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state': 'pending'})
+    def do_pending(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state': 'pending'}, context=context)
         for (id, name) in self.name_get(cr, uid, ids):
             message = _("The task '%s' is pending.") % name
             self.log(cr, uid, id, message)
         return True
 
-    def next_type(self, cr, uid, ids, *args):
+    def _change_type(self, cr, uid, ids, next, *args):
+        """
+            go to the next stage
+            if next is False, go to previous stage
+        """
         for task in self.browse(cr, uid, ids):
-            typeid = task.type_id.id
-            types = map(lambda x:x.id, task.project_id.type_ids or [])
-            if types:
+            if  task.project_id.type_ids:
+                typeid = task.type_id.id
+                types_seq={}
+                for type in task.project_id.type_ids :
+                    types_seq[type.id] = type.sequence
+                if next:
+                    types = sorted(types_seq.items(), lambda x, y: cmp(x[1], y[1]))
+                else:
+                    types = sorted(types_seq.items(), lambda x, y: cmp(y[1], x[1]))
+                sorted_types = [x[0] for x in types]
                 if not typeid:
-                    self.write(cr, uid, task.id, {'type_id': types[0]})
-                elif typeid and typeid in types and types.index(typeid) != len(types)-1:
-                    index = types.index(typeid)
-                    self.write(cr, uid, task.id, {'type_id': types[index+1]})
+                    self.write(cr, uid, task.id, {'type_id': sorted_types[0]})
+                elif typeid and typeid in sorted_types and sorted_types.index(typeid) != len(sorted_types)-1:
+                    index = sorted_types.index(typeid)
+                    self.write(cr, uid, task.id, {'type_id': sorted_types[index+1]})
         return True
 
+    def next_type(self, cr, uid, ids, *args):
+        return self._change_type(cr, uid, ids, True, *args)
+
     def prev_type(self, cr, uid, ids, *args):
-        for task in self.browse(cr, uid, ids):
-            typeid = task.type_id.id
-            types = map(lambda x:x.id, task.project_id and task.project_id.type_ids or [])
-            if types:
-                if typeid and typeid in types:
-                    index = types.index(typeid)
-                    self.write(cr, uid, task.id, {'type_id': index and types[index-1] or False})
-        return True
+        return self._change_type(cr, uid, ids, False, *args)
+
+    def unlink(self, cr, uid, ids, context=None):
+        if context == None:
+            context = {}
+        self._check_child_task(cr, uid, ids, context=context)
+        res = super(task, self).unlink(cr, uid, ids, context)
+        return res
 
 task()
 
@@ -743,10 +769,10 @@ class project_work(osv.osv):
     _description = "Project Task Work"
     _columns = {
         'name': fields.char('Work summary', size=128),
-        'date': fields.datetime('Date'),
-        'task_id': fields.many2one('project.task', 'Task', ondelete='cascade', required=True),
+        'date': fields.datetime('Date', select="1"),
+        'task_id': fields.many2one('project.task', 'Task', ondelete='cascade', required=True, select="1"),
         'hours': fields.float('Time Spent'),
-        'user_id': fields.many2one('res.users', 'Done by', required=True),
+        'user_id': fields.many2one('res.users', 'Done by', required=True, select="1"),
         'company_id': fields.related('task_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
     }
 
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 32b235e4691..d6538ac1310 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -3,56 +3,25 @@
 
     <record id="view_project_installer" model="ir.ui.view">
       <field name="name">project.installer.view</field>
-      <field name="model">project.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
           <data>
-          <form position="attributes">
-            <attribute name="string">Project Application Configuration</attribute>
-          </form>
-          <separator string="title" position="attributes">
-            <attribute name="string">Configure Your Project Management Application</attribute>
-          </separator>
-           <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                <attribute name='string'></attribute>
-             </xpath>
-          <xpath expr="//label[@string='description']" position="attributes">
-              <attribute name="string">Various OpenERP applications are available to manage your projects with different level of control and flexibility.</attribute>
-          </xpath>
-          <xpath expr="//button[@string='Install Modules']" position="attributes">
-              <attribute name="string">Configure</attribute>
-          </xpath>
-          <group colspan="8">
-            <field name="project_issue"/>
-            <field name="project_long_term" groups="base.group_extended"/>
-            <field name="hr_timesheet_sheet"/>
-            <field name="project_timesheet"/>
-            <field name="account_budget" groups="base.group_extended"/>
+          <xpath expr="//group[@name='project']" position="replace">
             <newline/>
-            <separator string="Methodologies" colspan="4"/>
-            <field name="project_scrum"/>
-            <field name="project_gtd"/>
-          </group>
+            <separator  string="Project Management Features" colspan="4" />
+            <field name="project_issue" />
+            <field name="project_long_term" />
+            <field name="hr_timesheet_sheet" />
+            <field name="project_timesheet" />
+            <field name="account_budget" />
+            <field name="project_scrum" />
+            <field name="project_gtd" />
+          </xpath>
         </data>
       </field>
     </record>
 
-    <record id="action_project_installer" model="ir.actions.act_window">
-      <field name="name">Project Application Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">project.installer</field>
-      <field name="view_id" ref="view_project_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="project_installer_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_project_installer"/>
-        <field name="restart">always</field>
-        <field name="sequence">3</field>
-    </record>
-
   </data>
 </openerp>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a15d2a6404e..85cde448c6d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -224,7 +224,7 @@
                 <form string="Task edition">
                     <group colspan="6" col="6">
                         <field name="name" select="1"/>
-                        <field name="project_id" select="1"  on_change="onchange_project(project_id)" domain="['|',('user_id','=',uid),('members','=',uid)]" />
+                        <field name="project_id" select="1"  on_change="onchange_project(project_id)"/>
                         <field name="total_hours" widget="float_time"/>
                         <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                         <field name="user_id" select="1" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
@@ -264,11 +264,11 @@
                                 <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
                                 <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
                                 <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
-                                <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
+                                <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending"/>
                                 <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
                             </group>
                         </page>
-                        <page groups="base.group_extended" string="Delegations">
+                        <page groups="base.group_extended" string="Delegations History">
                             <separator string="Parent Tasks" colspan="4"/>
                             <field colspan="4" height="150" name="parent_ids" nolabel="1"/>
                             <separator string="Delegated tasks" colspan="4"/>
@@ -322,7 +322,7 @@
                 <tree colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
                     <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>
-                    <field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]" invisible="context.get('user_invisible', False)"/>
+                    <field name="project_id" icon="gtk-indent" invisible="context.get('user_invisible', False)"/>
                     <field name="user_id" invisible="context.get('user_invisible', False)"/>
                     <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
                     <field name="total_hours" invisible="1"/>
@@ -369,7 +369,7 @@
             <field name="type">gantt</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <gantt color="user_id" date_delay="planned_hours" date_start="date_start" string="Tasks">
+                <gantt color="user_id" date_start="date_start" date_stop="date_end" string="Tasks">
                     <level object="project.project" link="project_id" domain="[]">
                         <field name="name"/>
                     </level>
diff --git a/addons/project/wizard/project_task_close.py b/addons/project/wizard/project_task_close.py
index 97e8e4730c2..010bba9e52b 100644
--- a/addons/project/wizard/project_task_close.py
+++ b/addons/project/wizard/project_task_close.py
@@ -115,7 +115,7 @@ class project_task_close(osv.osv_memory):
                 mail_id = tools.email_send(from_adr, to_adr, subject, tools.ustr(body), email_bcc=[from_adr])
                 if not mail_id:
                     raise osv.except_osv(_('Error'), _("Couldn't send mail! Check the email ids and smtp configuration settings"))
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 project_task_close()
 
diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py
index cffdf2f9ef9..eaf5dea3084 100644
--- a/addons/project/wizard/project_task_delegate.py
+++ b/addons/project/wizard/project_task_delegate.py
@@ -108,6 +108,6 @@ class project_task_delegate(osv.osv_memory):
         delegate_data['user_id'] = delegate_data['user_id'][0]
         delegate_data['name'] = tools.ustr(delegate_data['name'])
         task_pool.do_delegate(cr, uid, task_id, delegate_data, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 project_task_delegate()
diff --git a/addons/project/wizard/project_task_reevaluate.py b/addons/project/wizard/project_task_reevaluate.py
index e4e2fab66e3..d627ffa4408 100644
--- a/addons/project/wizard/project_task_reevaluate.py
+++ b/addons/project/wizard/project_task_reevaluate.py
@@ -79,5 +79,5 @@ class project_task_reevaluate(osv.osv_memory):
             task_pool.write(cr, uid, task_id, {'remaining_hours': data.remaining_hours})
             if context.get('button_reactivate', False):
                 task_pool.do_reopen(cr, uid, [task_id], context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 project_task_reevaluate()
diff --git a/addons/project_caldav/i18n/sv.po b/addons/project_caldav/i18n/sv.po
index fa9aafe45f0..e8de8f114cb 100644
--- a/addons/project_caldav/i18n/sv.po
+++ b/addons/project_caldav/i18n/sv.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-12-12 09:16+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-06-03 14:19+0000\n"
+"Last-Translator: Jan-Eric Lindh <jelindh@gmail.com>\n"
 "Language-Team: Swedish <sv@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-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-04 04:53+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: project_caldav
 #: help:project.task,exdate:0
@@ -184,7 +184,7 @@ msgstr "Plats"
 #. module: project_caldav
 #: view:project.task:0
 msgid "Mail TO"
-msgstr ""
+msgstr "E-posta till"
 
 #. module: project_caldav
 #: selection:project.task,freq:0
diff --git a/addons/project_issue/i18n/nb.po b/addons/project_issue/i18n/nb.po
new file mode 100644
index 00000000000..bb294245223
--- /dev/null
+++ b/addons/project_issue/i18n/nb.po
@@ -0,0 +1,961 @@
+# Norwegian Bokmal 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-06-09 11:14+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\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 "Grupper etter..."
+
+#. 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 "Åpnet"
+
+#. module: project_issue
+#: field:project.issue.report,opening_date:0
+msgid "Date of Opening"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "March"
+msgstr "Mars"
+
+#. module: project_issue
+#: field:project.issue,progress:0
+msgid "Progress (%)"
+msgstr "Fremskritt (%)"
+
+#. module: project_issue
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: project_issue
+#: field:project.issue,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. 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 "project.issue.version"
+
+#. module: project_issue
+#: field:project.issue,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. 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 ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Date Closed"
+msgstr "Dato lukket"
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Add Internal Note"
+msgstr "Legg til internt notat"
+
+#. module: project_issue
+#: field:project.issue,task_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,task_id:0
+msgid "Task"
+msgstr "Oppgave"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By Stage"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,partner_mobile:0
+msgid "Mobile"
+msgstr "Mobil"
+
+#. module: project_issue
+#: field:project.issue,message_ids:0
+msgid "Messages"
+msgstr "Meldinger"
+
+#. 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 "Prosjekt"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_open_project_issue_tree
+msgid "My Open Project issues"
+msgstr "Mine åpne prosjektoppgaver"
+
+#. 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 "Advarsel !"
+
+#. 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 "Ekstra informasjon"
+
+#. 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 " (kopi)"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Previous"
+msgstr "Forrige"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Statistics"
+msgstr "Statistikk"
+
+#. 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 "Versjonsnummer"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Next"
+msgstr "Neste"
+
+#. 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 "Prioritet"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Send New Email"
+msgstr "Send ny e-post"
+
+#. 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 "Versjon"
+
+#. 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 "E-post"
+
+#. module: project_issue
+#: field:project.issue,canal_id:0
+#: field:project.issue.report,canal_id:0
+msgid "Channel"
+msgstr "Kanal"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Lowest"
+msgstr "Laveste"
+
+#. 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 "Versjoner"
+
+#. module: project_issue
+#: field:project.issue,partner_phone:0
+msgid "Phone"
+msgstr "Telefon"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Today"
+msgstr "I dag"
+
+#. 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 "Fullført"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_category_act
+msgid "Categories"
+msgstr "Kategorier"
+
+#. 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 "Kommunikasjon & Historikk"
+
+#. 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 "Kontakt"
+
+#. 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 "Oppgaver"
+
+#. 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 "September"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "December"
+msgstr "Desember"
+
+#. 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 "Måned"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_report
+msgid "project.issue.report"
+msgstr "project.issue.report"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:362
+#: view:project.issue:0
+#, python-format
+msgid "Escalate"
+msgstr "Eskaler"
+
+#. 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 "Kategori"
+
+#. 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 "Utkast"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Low"
+msgstr "Lav"
+
+#. module: project_issue
+#: field:project.issue,date_closed:0
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Closed"
+msgstr "Lukket"
+
+#. 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 "Status"
+
+#. 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 "August"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. 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 "Juni"
+
+#. 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 "November"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Extended Filters..."
+msgstr "Utvidede filter..."
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Search"
+msgstr "Søk"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "January"
+msgstr "Januar"
+
+#. 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 "Dato"
+
+#. 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 "Tildelt til"
+
+#. 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 "Høyeste"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Attachments"
+msgstr "Vedlegg"
+
+#. 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 "Status"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "General"
+msgstr "Generelt"
+
+#. module: project_issue
+#: view:project.issue.version:0
+msgid "Issue Version"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Communication"
+msgstr "Kommunikasjon"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Close"
+msgstr "Lukk"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue.report,state:0
+msgid "Open"
+msgstr "Åpen"
+
+#. 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 "Ansvarlig"
+
+#. 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 "Detaljer"
+
+#. 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 "Svar"
+
+#. 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 "Beskrivelse"
+
+#. 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 "Mai"
+
+#. 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 ""
+
+#~ msgid "Maintenance"
+#~ msgstr "Velikehold"
diff --git a/addons/project_issue/i18n/zh_CN.po b/addons/project_issue/i18n/zh_CN.po
new file mode 100644
index 00000000000..1c41a92d2f9
--- /dev/null
+++ b/addons/project_issue/i18n/zh_CN.po
@@ -0,0 +1,972 @@
+# Chinese (Simplified) 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-06-30 11:51+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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-07-01 04:54+0000\n"
+"X-Generator: Launchpad (build 13168)\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 "分组..."
+
+#. 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 "已开启"
+
+#. module: project_issue
+#: field:project.issue.report,opening_date:0
+msgid "Date of Opening"
+msgstr "距开始日期天数"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "March"
+msgstr "三月"
+
+#. module: project_issue
+#: field:project.issue,progress:0
+msgid "Progress (%)"
+msgstr "进度（％）"
+
+#. module: project_issue
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: project_issue
+#: field:project.issue,email_cc:0
+msgid "Watchers Emails"
+msgstr "关注者的电子邮件"
+
+#. 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 "project.issue.version"
+
+#. module: project_issue
+#: field:project.issue,day_open:0
+msgid "Days to Open"
+msgstr "距开始日期"
+
+#. 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 ""
+"不能升级此缺陷。\n"
+"所属项目没有配置相关项目。"
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "不能升级到相同的项目"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Date Closed"
+msgstr "结束日期"
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,day:0
+msgid "Day"
+msgstr "天"
+
+#. 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 "任务"
+
+#. 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 " (copy)"
+
+#. 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 "可以用缺陷跟踪来管理软件开发中的Bug或售后的产品缺陷等。这里输入您管理缺陷的产品的不同版本。"
+
+#. 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 "project.issue.report"
+
+#. 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 ""
+"\n"
+"        这个模块在项目管理中增加了缺陷管理\n"
+"    "
+
+#. 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 "取消(&C)"
+
+#. 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 ""
+"缺陷（如系统故障、客户投诉、材料破损）在这里搜集。可以输入缺陷处理的阶段（分析原因、正在处理、已完成）。安装了mailgateway模块后，缺陷管理可以与"
+"特定邮件集成（如：support@mycompany.com）"
+
+#. 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 ""
+"当一个业务创建时状态设为'草稿'\n"
+"如果业务正在处理状态设为'开启'\n"
+"当业务结束状态设为'完成'\n"
+"如果业务需要审查状态设为'待定'"
+
+#. 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 "缺陷 ‘%s' 已新建"
+
+#. 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 "缺陷 '%s' 已处理"
+
+#. 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 "ID"
+
+#. 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 "未处理的缺陷（按创建日期）"
+
+#~ msgid "Maintenance"
+#~ msgstr "维护"
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index a8a32847243..b6032241a8e 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -205,18 +205,18 @@ class project_issue(crm.crm_case, osv.osv):
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
         'day_open': fields.function(_compute_day, string='Days to Open', \
-                                method=True, multi='compute_day', type="float", store=True),
+                                multi='compute_day', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
-                                method=True, multi='compute_day', type="float", store=True),
+                                multi='compute_day', type="float", store=True),
         'assigned_to': fields.many2one('res.users', 'Assigned to', required=False, select=1),
         'working_hours_open': fields.function(_compute_day, string='Working Hours to Open the Issue', \
-                                method=True, multi='compute_day', type="float", store=True),
+                                multi='compute_day', type="float", store=True),
         'working_hours_close': fields.function(_compute_day, string='Working Hours to Close the Issue', \
-                                method=True, multi='compute_day', type="float", store=True),
+                                multi='compute_day', type="float", store=True),
         'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
-        'progress': fields.function(_hours_get, method=True, string='Progress (%)', multi='hours', group_operator="avg", help="Computed as: Time Spent / Total Time.",
+        'progress': fields.function(_hours_get, string='Progress (%)', multi='hours', group_operator="avg", help="Computed as: Time Spent / Total Time.",
             store = {
                 'project.issue': (lambda self, cr, uid, ids, c={}: ids, ['task_id'], 10),
                 'project.task': (_get_issue_task, ['progress'], 10),
diff --git a/addons/project_issue_sheet/i18n/fi.po b/addons/project_issue_sheet/i18n/fi.po
new file mode 100644
index 00000000000..3f49470827f
--- /dev/null
+++ b/addons/project_issue_sheet/i18n/fi.po
@@ -0,0 +1,78 @@
+# Finnish 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-06-28 09:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-29 04:43+0000\n"
+"X-Generator: Launchpad (build 13168)\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 "Analyyttinen rivi"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_project_issue
+msgid "Project Issue"
+msgstr "Projekti tapahtuma"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Tuntilistan rivi"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Timesheet"
+msgstr "Tuntilista"
+
+#. module: project_issue_sheet
+#: field:project.issue,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Analyyttinen tili"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Worklogs"
+msgstr "Työlokit"
+
+#. module: project_issue_sheet
+#: field:account.analytic.line,create_date:0
+msgid "Create Date"
+msgstr "Luontipäivä"
+
+#. module: project_issue_sheet
+#: field:project.issue,timesheet_ids:0
+msgid "Timesheets"
+msgstr "Tuntilistat"
+
+#. 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 ""
+"Lisää tuntilistan tuen tapaustenhallintaan projektinhallintaohjelmistossa"
+
+#. module: project_issue_sheet
+#: field:hr.analytic.timesheet,issue_id:0
+msgid "Issue"
+msgstr "Tapaus"
diff --git a/addons/project_issue_sheet/i18n/ru.po b/addons/project_issue_sheet/i18n/ru.po
new file mode 100644
index 00000000000..8e163157d5f
--- /dev/null
+++ b/addons/project_issue_sheet/i18n/ru.po
@@ -0,0 +1,83 @@
+# Russian 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-06-10 17:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian <ru@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-06-11 04:57+0000\n"
+"X-Generator: Launchpad (build 13168)\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 ""
+"\n"
+"                    Этот модуль добавляет поддержку табелей для управления "
+"проблемами и ошибками в проекте\n"
+"                "
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Позиция аналитики"
+
+#. 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 "Строка табеля"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Timesheet"
+msgstr "Табель"
+
+#. module: project_issue_sheet
+#: field:project.issue,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Счет аналитики"
+
+#. 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 "Дата создания"
+
+#. module: project_issue_sheet
+#: field:project.issue,timesheet_ids:0
+msgid "Timesheets"
+msgstr "Табели"
+
+#. 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/i18n/zh_CN.po b/addons/project_issue_sheet/i18n/zh_CN.po
new file mode 100644
index 00000000000..eda41afa445
--- /dev/null
+++ b/addons/project_issue_sheet/i18n/zh_CN.po
@@ -0,0 +1,80 @@
+# Chinese (Simplified) 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-07-02 03:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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-07-03 04:47+0000\n"
+"X-Generator: Launchpad (build 13168)\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 ""
+"\n"
+"                    此模块把缺陷管理和计工单集成在一起了\n"
+"                "
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "辅助核算明细"
+
+#. 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 "计工单明细"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Timesheet"
+msgstr "计工单"
+
+#. module: project_issue_sheet
+#: field:project.issue,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "辅助核算项目"
+
+#. 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 "创建日期"
+
+#. module: project_issue_sheet
+#: field:project.issue,timesheet_ids:0
+msgid "Timesheets"
+msgstr "计工单"
+
+#. 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_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
new file mode 100644
index 00000000000..65ebffc73c9
--- /dev/null
+++ b/addons/project_long_term/i18n/zh_CN.po
@@ -0,0 +1,599 @@
+# Chinese (Simplified) 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-06-30 06:07+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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-07-01 04:54+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: project_long_term
+#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
+msgid "Long Term Project Management"
+msgstr "长期项目管理"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "Compute Scheduling of Phases"
+msgstr "项目周期计算"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "下一阶段"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr "项目任务"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "阶段"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+msgid "Group By..."
+msgstr "分组..."
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "错误！项目的开始日期必须小于项目的结束日期"
+
+#. 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 "资源分配"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying settings"
+msgstr "显示设置"
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr "日程"
+
+#. 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 ""
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "错误！不能创建循环引用的任务"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+msgid "Resource Allocations"
+msgstr "资源分配"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "不能升级到相同的项目"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:128
+#, python-format
+msgid "Day"
+msgstr "天"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr "任务"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "计算单个项目"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "上一阶段"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr "某个周期的计量单位"
+
+#. 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 " 这个日期是由开始日期和计划日数根据日历计算出来的。"
+
+#. 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 "项目"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#, python-format
+msgid "Error!"
+msgstr "错误！"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_end:0
+msgid "Ending Date"
+msgstr "结束日期"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Planning"
+msgstr "计划"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr "截止日期"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#. 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 "计算阶段日程"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:190
+#, python-format
+msgid " (copy)"
+msgstr " (copy)"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,useability:0
+msgid "Availability"
+msgstr "可用"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "状态"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr "计算（_O）"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "Compute Scheduling of phases for all or specified project"
+msgstr "针对所有或特定的一个项目计算阶段周期"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr "时间段计量单位"
+
+#. 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 "计算项目日程"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr "最早开始时间"
+
+#. 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 "项目资源分配"
+
+#. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task"
+msgstr "计算任务日程"
+
+#. 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 "资源"
+
+#. 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 ""
+"某个或所有项目的阶段日程。会显示一个甘特图。\n"
+"\t           "
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_start:0
+msgid "Starting Date"
+msgstr "开始日期"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "相关任务"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Dates"
+msgstr "日期"
+
+#. module: project_long_term
+#: help:project.resource.allocation,useability:0
+msgid ""
+"Availability of this resource for this project phase in percentage (=50%)"
+msgstr "这个资源在此项目阶段的可用性，用百分数表示"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr "强制项目在此日期之后开始"
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr "项目任务列表"
+
+#. module: project_long_term
+#: field:project.phase,resource_ids:0
+msgid "Project Resources"
+msgstr "项目资源"
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "_Ok"
+msgstr "确定(_O)"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Schedule and Display info"
+msgstr "日程和显示信息"
+
+#. 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 "这个日期根据项目的开始日期或前一个阶段的结束日期结算而来"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "月份"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr "阶段的开始日期必须早于项目的结束日期"
+
+#. 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 ""
+"项目能分成不同的阶段。可以为每个阶段分配资源，定义不同的任务并可以把各个阶段连起来，按日历自动计算计划日期。使用长期计划可以在项目的开始阶段管理人员可用性"
+"、划分每阶段的任务。"
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.resource.allocation,date_start:0
+msgid "Start Date"
+msgstr "开始日期"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Resource Allocation"
+msgstr "资源分配"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr "强制该阶段在此日期前完成"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr "等待中"
+
+#. module: project_long_term
+#: field:project.resource.allocation,name:0
+msgid "unknown"
+msgstr "未知的"
+
+#. module: project_long_term
+#: field:project.resource.allocation,user_id:0
+msgid "User"
+msgstr "用户"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Task Detail"
+msgstr "任务细节"
+
+#. module: project_long_term
+#: help:project.project,resource_calendar_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr "从时间表的工作时间来调整甘特图报表"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr "计算任务计划"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "限制"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr "输入序号用于阶段列表排序"
+
+#. 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 "项目阶段"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "已完成"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "取消(&C)"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "进行中"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "剩余小时数"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,responsible_id:0
+msgid "Responsible"
+msgstr "负责人"
+
+#. 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 "工作的时间"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Current"
+msgstr "当前的"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr "阶段开始"
+
+#. 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 "请输入要排计划的项目"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,total_hours:0
+msgid "Total Hours"
+msgstr "总小时数"
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "Task Scheduling completed successfully."
+msgstr "任务日程排列完毕"
+
+#. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task for specified project."
+msgstr "为某个特定的项目计算日程"
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+msgid "Phase"
+msgstr "阶段"
+
+#. 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 ""
+"新建的阶段状态是草稿\n"
+"开始后的阶段状态是正在进行中\n"
+"如果需要复核则状态为等待中\n"
+"已结束的阶段状态是完成"
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.resource.allocation,date_end:0
+msgid "End Date"
+msgstr "结束日期"
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,resource_id:0
+msgid "Resource"
+msgstr "资源"
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr "名称"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr "任务详情"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Period"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_resource_resource
+msgid "Resource Detail"
+msgstr "资源明细"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "调度"
+
+#. 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 "项目阶段"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr "计算项目阶段"
+
+#. module: project_long_term
+#: field:project.schedule.tasks,msg:0
+msgid "Message"
+msgstr "消息"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr "阶段间不能递归引用"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr "序号"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All Projects"
+msgstr "计算所有项目"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr "成员请假"
+
+#. 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 "任务日程"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "默认按天"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "时长"
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 779c7f6d062..6c5ef7890bf 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -23,6 +23,7 @@ from datetime import datetime
 from tools.translate import _
 from osv import fields, osv
 from resource.faces import task as Task 
+from operator import itemgetter
 
 class project_phase(osv.osv):
     _name = "project.phase"
@@ -119,7 +120,7 @@ class project_phase(osv.osv):
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='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\'.'),
-        'total_hours': fields.function(_compute, method=True, string='Total Hours'),
+        'total_hours': fields.function(_compute, string='Total Hours'),
      }
     _defaults = {
         'responsible_id': lambda obj,cr,uid,context: uid,
@@ -398,7 +399,7 @@ class project_resource_allocation(osv.osv):
             res[allocation.id] = name
         return res
     _columns = {
-        'name': fields.function(get_name, method=True, type='char', size=256),
+        'name': fields.function(get_name, type='char', size=256),
         'resource_id': fields.many2one('resource.resource', 'Resource', required=True),
         'phase_id': fields.many2one('project.phase', 'Project Phase', ondelete='cascade', required=True),
         'project_id': fields.related('phase_id', 'project_id', type='many2one', relation="project.project", string='Project', store=True),
@@ -729,7 +730,7 @@ class project_task(osv.osv):
         if context is None:
             context = {}
         task = self.browse(cr, uid, task_id, context=context)
-        duration = str(task.planned_hours )+ 'H'
+        duration = str(task.planned_hours)+ 'H'
         str_resource = False
         parent = task.parent_ids
         if task.phase_id.resource_ids:
@@ -743,10 +744,12 @@ class project_task(osv.osv):
             effort = \'%s\'
             resource = %s
 '''%(task.id, task.name, duration, str_resource)
-            if parent:
+            if task.child_ids:
+                seq = [[child.planned_hours, child.id] for child in task.child_ids]
+                seq.sort(key=itemgetter(0))
                 s +='''
             start = up.Task_%s.end
-'''%(parent[0].id)
+    '''%(seq[-1][1])
         else:
             s = '''
     def Task_%s():
@@ -754,10 +757,12 @@ class project_task(osv.osv):
         effort = \'%s\'
         resource = %s
 '''%(task.id, task.name, duration, str_resource)
-            if parent:
+            if task.child_ids:
+                seq = [[child.planned_hours, child.id] for child in task.child_ids]
+                seq.sort(key=itemgetter(0))
                 s +='''
         start = up.Task_%s.end
-'''%(parent[0].id)
+'''%(seq[-1][1])
         s += '\n'
         return s
 project_task()
diff --git a/addons/project_mailgate/i18n/fi.po b/addons/project_mailgate/i18n/fi.po
new file mode 100644
index 00000000000..d7b563f2f4b
--- /dev/null
+++ b/addons/project_mailgate/i18n/fi.po
@@ -0,0 +1,100 @@
+# Finnish 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-06-22 10:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "History Information"
+msgstr "Historiatiedot"
+
+#. module: project_mailgate
+#: model:ir.model,name:project_mailgate.model_project_task
+msgid "Task"
+msgstr "Tehtävä"
+
+#. 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 ""
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "Attachments"
+msgstr "Liitteet"
+
+#. module: project_mailgate
+#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
+msgid "Project MailGateWay"
+msgstr "Projektin sähköpostivälittäjä"
+
+#. module: project_mailgate
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Virhe ! Et voi luoda rekursiivisiä tehtäviä."
+
+#. module: project_mailgate
+#: field:project.task,message_ids:0
+msgid "Messages"
+msgstr "Viestit"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:123
+#, python-format
+msgid "Draft"
+msgstr "Luonnos"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "Details"
+msgstr "Yksityiskohdat"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:149
+#, python-format
+msgid "Cancel"
+msgstr "Peruuta"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:143
+#, python-format
+msgid "Done"
+msgstr "Valmis"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:129
+#, python-format
+msgid "Open"
+msgstr "Auki"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:135
+#, python-format
+msgid "Pending"
+msgstr "Odottava"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "History"
+msgstr "Historia"
diff --git a/addons/project_mailgate/i18n/zh_CN.po b/addons/project_mailgate/i18n/zh_CN.po
new file mode 100644
index 00000000000..5146601a653
--- /dev/null
+++ b/addons/project_mailgate/i18n/zh_CN.po
@@ -0,0 +1,104 @@
+# Chinese (Simplified) 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-06-28 16:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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-06-29 04:43+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "History Information"
+msgstr "历史信息"
+
+#. module: project_mailgate
+#: model:ir.model,name:project_mailgate.model_project_task
+msgid "Task"
+msgstr "任务"
+
+#. 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 ""
+"此模块是邮件和任务的接口。\n"
+"允许在特定邮件服务器收到邮件后马上创建任务。\n"
+"还能跟踪进一步的沟通和任务阶段\n"
+"    "
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "Attachments"
+msgstr "附件"
+
+#. module: project_mailgate
+#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
+msgid "Project MailGateWay"
+msgstr "Project MailGateWay"
+
+#. module: project_mailgate
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "错误！不能创建循环引用的任务"
+
+#. module: project_mailgate
+#: field:project.task,message_ids:0
+msgid "Messages"
+msgstr "消息"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:123
+#, python-format
+msgid "Draft"
+msgstr "草稿"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "Details"
+msgstr "详细信息"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:149
+#, python-format
+msgid "Cancel"
+msgstr "取消"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:143
+#, python-format
+msgid "Done"
+msgstr "完成"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:129
+#, python-format
+msgid "Open"
+msgstr "未结"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:135
+#, python-format
+msgid "Pending"
+msgstr "等待中"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "History"
+msgstr "历史记录"
diff --git a/addons/project_mailgate/project_mailgate.py b/addons/project_mailgate/project_mailgate.py
index 64bb8c2dc69..66eaa2e85fa 100644
--- a/addons/project_mailgate/project_mailgate.py
+++ b/addons/project_mailgate/project_mailgate.py
@@ -19,17 +19,19 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import fields, osv
 from tools.translate import _
 import binascii
 
+
 class project_tasks(osv.osv):
     _name = "project.task"
-    _inherit = ['mailgate.thread','project.task']
-    
+    _inherit = ['mailgate.thread', 'project.task']
+
     _columns={
-                'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)], readonly=True),
+                'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model', '=', _name)], readonly=True),
               }
+
     def message_new(self, cr, uid, msg, context=None):
 #        """
 #        Automatically calls when new email message arrives
@@ -42,23 +44,24 @@ class project_tasks(osv.osv):
         subject = msg.get('subject')
         body = msg.get('body')
         msg_from = msg.get('from')
-        priority = msg.get('priority')
+        #TODO map email priority with openerp task priority
+        priority = msg.get('priority') 
 
-        data = {      
+        data = {
             'name': subject,
             'description': body,
-            'planned_hours' : 0.0,
+            'planned_hours': 0.0,
         }
         res = mailgate_obj.get_partner(cr, uid, msg_from)
         if res:
             data.update(res)
-        res = self.create(cr, uid, data)    
-        
+        res = self.create(cr, uid, data)
+
         attachments = msg.get('attachments', [])
         for attachment in attachments or []:
             data_attach = {
                 'name': attachment,
-                'datas':binascii.b2a_base64(str(attachments.get(attachment))),
+                'datas': binascii.b2a_base64(str(attachments.get(attachment))),
                 'datas_fname': attachment,
                 'description': 'Mail attachment',
                 'res_model': self._name,
@@ -66,31 +69,31 @@ class project_tasks(osv.osv):
             }
             self.pool.get('ir.attachment').create(cr, uid, data_attach)
 
-        return res           
-    
-    def message_update(self, cr, uid, id, msg, data={}, default_act='pending'): 
+        return res
+
+    def message_update(self, cr, uid, id, msg, data={}, default_act='pending'):
         mailgate_obj = self.pool.get('email.server.tools')
-        msg_actions, body_data = mailgate_obj.msg_act_get(msg)           
+        msg_actions, body_data = mailgate_obj.msg_act_get(msg)
         data.update({
-            'description': body_data,            
+            'description': body_data,
         })
         act = 'do_'+default_act
         if 'state' in msg_actions:
-            if msg_actions['state'] in ['draft','close','cancel','open','pending']:
+            if msg_actions['state'] in ['draft', 'close', 'cancel', 'open', 'pending']:
                 act = 'do_' + msg_actions['state']
-        
-        for k1,k2 in [('cost','planned_hours')]:
+
+        for k1, k2 in [('cost', 'planned_hours')]:
             try:
                 data[k2] = float(msg_actions[k1])
             except:
                 pass
 
         if 'priority' in msg_actions:
-            if msg_actions['priority'] in ('1','2','3','4','5'):
+            if msg_actions['priority'] in ('1', '2', '3', '4', '5'):
                 data['priority'] = msg_actions['priority']
-        
+
         self.write(cr, uid, [id], data)
-        getattr(self,act)(cr, uid, [id])
+        getattr(self, act)(cr, uid, [id])
         return True
 
     def message_followers(self, cr, uid, ids, context=None):
@@ -108,7 +111,7 @@ class project_tasks(osv.osv):
 
     def msg_send(self, cr, uid, id, *args, **argv):
         return True
-    
+
     def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
         mailgate_pool = self.pool.get('mailgate.thread')
         return mailgate_pool.history(cr, uid, cases, keyword, history=history,\
@@ -116,37 +119,37 @@ class project_tasks(osv.osv):
                                        details=details, email_from=email_from,\
                                        message_id=message_id, attach=attach, \
                                        context=context)
-        
-    def do_draft(self, cr, uid, ids, *args, **kwargs):
-        res = super(project_tasks, self).do_draft(cr, uid, ids, *args, **kwargs)
-        tasks = self.browse(cr, uid, ids)
-        self._history(cr, uid, tasks, _('Draft'))
+
+    def do_draft(self, cr, uid, ids, context=None):
+        res = super(project_tasks, self).do_draft(cr, uid, ids, context)
+        tasks = self.browse(cr, uid, ids, context=context)
+        self._history(cr, uid, tasks, _('Draft'), context=context)
         return res
-    
-    def do_open(self, cr, uid, ids, *args, **kwargs):
-        res = super(project_tasks, self).do_open(cr, uid, ids, *args, **kwargs)
-        tasks = self.browse(cr, uid, ids)
-        self._history(cr, uid, tasks, _('Open'))
+
+    def do_open(self, cr, uid, ids, context=None):
+        res = super(project_tasks, self).do_open(cr, uid, ids, context)
+        tasks = self.browse(cr, uid, ids, context=context)
+        self._history(cr, uid, tasks, _('Open'), context=context)
         return res
-    
-    def do_pending(self, cr, uid, ids, *args, **kwargs):
-        res = super(project_tasks, self).do_pending(cr, uid, ids, *args, **kwargs)
-        tasks = self.browse(cr, uid, ids)
-        self._history(cr, uid, tasks, _('Pending'))
+
+    def do_pending(self, cr, uid, ids, context=None):
+        res = super(project_tasks, self).do_pending(cr, uid, ids, context)
+        tasks = self.browse(cr, uid, ids, context=context)
+        self._history(cr, uid, tasks, _('Pending'), context=context)
         return res
-    
-    def do_close(self, cr, uid, ids, *args, **kwargs):
-        res = super(project_tasks, self).do_close(cr, uid, ids, *args, **kwargs)
-        tasks = self.browse(cr, uid, ids)
+
+    def do_close(self, cr, uid, ids, context=None):
+        res = super(project_tasks, self).do_close(cr, uid, ids, context)
+        tasks = self.browse(cr, uid, ids, context=context)
         for task in tasks:
             if task.state == 'done':
-                self._history(cr, uid, tasks, _('Done'))
+                self._history(cr, uid, tasks, _('Done'), context=context)
         return res
-    
-    def do_cancel(self, cr, uid, ids, *args, **kwargs):
-        res = super(project_tasks, self).do_cancel(cr, uid, ids, *args, **kwargs)
-        tasks = self.browse(cr, uid, ids)
-        self._history(cr, uid, tasks, _('Cancel'))
+
+    def do_cancel(self, cr, uid, ids, context=None):
+        res = super(project_tasks, self).do_cancel(cr, uid, ids, context=context)
+        tasks = self.browse(cr, uid, ids, context=context)
+        self._history(cr, uid, tasks, _('Cancel'), context=context)
         return res
 
 project_tasks()
diff --git a/addons/project_messages/i18n/fi.po b/addons/project_messages/i18n/fi.po
new file mode 100644
index 00000000000..b527eee221a
--- /dev/null
+++ b/addons/project_messages/i18n/fi.po
@@ -0,0 +1,138 @@
+# Finnish 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-06-09 05:56+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: project_messages
+#: field:project.messages,to_id:0
+msgid "To"
+msgstr "Vastaanottaja"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_messages
+msgid "project.messages"
+msgstr ""
+
+#. module: project_messages
+#: field:project.messages,from_id:0
+msgid "From"
+msgstr "Lähettäjä"
+
+#. 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 ""
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Group By..."
+msgstr "Ryhmittely.."
+
+#. module: project_messages
+#: field:project.messages,create_date:0
+msgid "Creation Date"
+msgstr "Luontipäivämäärä"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Today"
+msgstr "Tänään"
+
+#. module: project_messages
+#: help:project.messages,to_id:0
+msgid "Keep this empty to broadcast the message."
+msgstr "Jätä tämä tyhjäksi niin viesti jaetaan kaikille"
+
+#. 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 "Viestit"
+
+#. 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 "Projekti"
+
+#. 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 ""
+"Projektin sisäinen viestintäjärjestelmä mahdollistaa tehokkaan ja "
+"seurattavan kommunikaation projektiryhmän jäsenten välillä. Viestit "
+"tallennetaan järjestelmään ja niitä voidaan käyttää "
+"jälkikäiteisarvioinneissa."
+
+#. 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 ""
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message To"
+msgstr "Viestin vastaanottaja"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Virhe! Et voi määritellä eskalointia samalle projektille!"
+
+#. module: project_messages
+#: view:project.messages:0
+#: field:project.messages,message:0
+#: view:project.project:0
+msgid "Message"
+msgstr "Viesti"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message From"
+msgstr "Viestin lähettäjä"
+
+#. 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 "Projektin viestit"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "Virhe: projektin alkupäivä tulee olla aikaisempi kuin loppupäivä."
+
+#. module: project_messages
+#: model:ir.module.module,shortdesc:project_messages.module_meta_information
+msgid "In-Project Messaging System"
+msgstr "Projektin sisäinen viestintäjärjestelmä"
diff --git a/addons/project_messages/i18n/zh_CN.po b/addons/project_messages/i18n/zh_CN.po
new file mode 100644
index 00000000000..51983dae2b3
--- /dev/null
+++ b/addons/project_messages/i18n/zh_CN.po
@@ -0,0 +1,138 @@
+# Chinese (Simplified) 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-07-02 15:15+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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-07-03 04:47+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: project_messages
+#: field:project.messages,to_id:0
+msgid "To"
+msgstr "收件人"
+
+#. 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 "发件人"
+
+#. 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 "通信消息管理"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Group By..."
+msgstr "分组..."
+
+#. module: project_messages
+#: field:project.messages,create_date:0
+msgid "Creation Date"
+msgstr "创建日期"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Today"
+msgstr "今天"
+
+#. 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 "消息"
+
+#. 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 "项目"
+
+#. 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 "一个项目内的消息系统，以便项目成员间内部高效可控地沟通。消息存储在系统中可以做历史记录分析。"
+
+#. 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"
+"    此模块允许在项目内部发送消息。\n"
+"用户可以给另一个用户发消息。也可以对所有成员广播消息。\n"
+"    "
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message To"
+msgstr "收件人"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "不能升级到相同的项目"
+
+#. module: project_messages
+#: view:project.messages:0
+#: field:project.messages,message:0
+#: view:project.project:0
+msgid "Message"
+msgstr "消息"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message From"
+msgstr "发件人"
+
+#. 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 "项目消息"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "错误！项目的开始日期必须小于项目的结束日期"
+
+#. module: project_messages
+#: model:ir.module.module,shortdesc:project_messages.module_meta_information
+msgid "In-Project Messaging System"
+msgstr "项目内部消息系统"
diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index 40e383ab8c9..027403b84f3 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -10,13 +10,13 @@
                	<xpath expr="//page[@string='Tasks Stages']" position="after">
                    	<page string="Messages" groups="base.group_extended">
                    		<field name="message_ids" nolabel="1" colspan="4">
-                   			<tree editable="1" string="Messages">
-		                     	<field name="message" attrs="{'readonly':[('from_id', '!=', uid)]}"/>
+                   			<tree editable="bottom" string="Messages">
+		                     	<field name="message"/>
 		                     	<field name="from_id"/>
-		                     	<field name="to_id" attrs="{'readonly':[('from_id', '!=', uid)]}"/>
+		                     	<field name="to_id"/>
                    			</tree>
                    			<form>
-                   				<group attrs="{'readonly':[('from_id', '!=', uid)]}">
+                   				<group>
 	                   				<field name="from_id"/>
 			                        <field name="to_id"/>
 			                        <newline/>
@@ -36,7 +36,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Messages">
-                	<group attrs="{'readonly':[('from_id', '!=', uid)]}">
+                	<group>
                         <field name="project_id" select="1" domain="[('user_id','=',uid)]"/>
                         <newline/>
                         <field name="from_id" select="1"/>
diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py
index 09d2c48fa08..ed723dda1f6 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -21,29 +21,30 @@
 
 
 {
-    'name': 'Procurement and Project Management integration',
+    'name': 'Automatic task creation from procurement lines',
     'version': '1.0',
     'category': 'Project Management',
     'description': """
-This module creates a link between procurement orders containing "service" lines and project management tasks.
-==============================================================================================================
+Automatically creates project tasks from procurement lines
+==========================================================
 
-When installed, this module will automatically create a new task
-for each procurement order line, when the corresponding product
+This module will automatically create a new task for each procurement
+order line (e.g. for sale order lines), if the corresponding product
 meets the following characteristics:
 
   * Type = Service
   * Procurement method (Order fulfillment) = MTO (make to order)
   * Supply/Procurement method = Produce
 
-The new task is created outside of any existing project, but
-can be added to a project manually.
+If on top of that a projet is specified on the product form (in the Procurement
+tab), then the new task will be created in that specific project.
+Otherwise, the new task will not belong to any project, and may be added to a
+project manually later.
 
 When the project task is completed or cancelled, the workflow of the corresponding
-procurement line is updated accordingly.
-
-This module is useful to be able to invoice services based on tasks
-automatically created via sale orders.
+procurement line is updated accordingly. For example if this procurement corresponds
+to a sale order line, the sale order line will be considered delivered when the
+task is completed.
 
 """,
     'author': 'OpenERP SA',
diff --git a/addons/project_mrp/i18n/fi.po b/addons/project_mrp/i18n/fi.po
new file mode 100644
index 00000000000..4fda4ed837b
--- /dev/null
+++ b/addons/project_mrp/i18n/fi.po
@@ -0,0 +1,133 @@
+# Finnish 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-06-22 09:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_procuretasktask0
+msgid "For each product, on type service and on order"
+msgstr "Jokaiselle tuotteelle, pavelutyyppinen joka on tilattu."
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_procuretask0
+msgid "Procurement Task"
+msgstr "Hankintatehtävä"
+
+#. module: project_mrp
+#: model:ir.module.module,shortdesc:project_mrp.module_meta_information
+msgid "Procurement and Project Management integration"
+msgstr "Hankinnan ja projektinhallinnan integraatio"
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_createtask0
+msgid "Product type is service, then its creates the task."
+msgstr "Tuotteen tyyppi on palvelu, luodaan tehtävä."
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_procuretask0
+msgid "if product type is 'service' then it creates the task."
+msgstr "jos tuotteen tyyppi on 'palvelu' niin luo tehtävän."
+
+#. module: project_mrp
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Virhe ! Et voi luoda rekursiivisiä tehtäviä."
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
+msgstr "Tuote"
+
+#. module: project_mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Virhe: Väärä EAN-koodi"
+
+#. module: project_mrp
+#: field:product.product,project_id:0
+msgid "Project"
+msgstr "Projekti"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_procurement_order
+#: field:project.task,procurement_id:0
+msgid "Procurement"
+msgstr "Hankinta"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_project_task
+#: model:process.node,name:project_mrp.process_node_mrptask0
+#: model:process.node,name:project_mrp.process_node_procuretasktask0
+#: field:procurement.order,task_id:0
+msgid "Task"
+msgstr "Tehtävä"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_mrptask0
+msgid "A task is created to provide the service."
+msgstr "Tehtävä on luotu tuottamaan palvelu"
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_ordertask0
+msgid "Order Task"
+msgstr "Tilaustehtävä"
+
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sale Order Task"
+msgstr "Myyntitilaustehtävä"
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_createtask0
+msgid "Create Task"
+msgstr "Luo tehtävä"
+
+#. module: project_mrp
+#: model:ir.module.module,description:project_mrp.module_meta_information
+msgid ""
+"\n"
+"This module creates a link between procurement orders\n"
+"containing \"service\" lines and project management tasks.\n"
+"\n"
+"When installed, this module will automatically create a new task\n"
+"for each procurement order line, when the corresponding product\n"
+"meets the following characteristics:\n"
+"  * Type = Service\n"
+"  * Procurement method (Order fulfillment) = MTO (make to order)\n"
+"  * Supply/Procurement method = Produce\n"
+"\n"
+"The new task is created outside of any existing project, but\n"
+"can be added to a project manually.\n"
+"\n"
+"When the project task is completed or cancelled, the workflow of the "
+"corresponding\n"
+"procurement line is updated accordingly.\n"
+"\n"
+"This module is useful to be able to invoice services based on tasks\n"
+"automatically created via sale orders.\n"
+"\n"
+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 "Jos hankintametodi on tee tilaukseen ja toimitusmetodi on tuota"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sale order"
+msgstr "tapauksessa jossa myyt palveluja myyntitilauksella"
diff --git a/addons/project_planning/i18n/fi.po b/addons/project_planning/i18n/fi.po
new file mode 100644
index 00000000000..bda70796e5e
--- /dev/null
+++ b/addons/project_planning/i18n/fi.po
@@ -0,0 +1,597 @@
+# Finnish 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-06-27 07:31+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: project_planning
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr "Virhe! Valuutan tulee olla sama kun valitun yrityksen valutta."
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,tasks:0
+#: help:report_account_analytic.planning.user,tasks:0
+msgid ""
+"This value is given by the sum of work remaining to do on the task for this "
+"planning, expressed in days."
+msgstr ""
+"Tämä arvo annetaan jäljelläolevan työn määränä tehtävän suorittamiseksi, "
+"määriteltynä päivinä."
+
+#. 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 "Suunnittelutilastot"
+
+#. 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 "Suunnittelulinja"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Unallocated Time"
+msgstr "Allokoimaton aika yhteensä"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,name:0
+msgid "Planning Name"
+msgstr "Suunnitelman nimi"
+
+#. module: project_planning
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Virhe ! Et voi luoda rekursiivisiä tehtäviä."
+
+#. module: project_planning
+#: view:board.board:0
+msgid "My Project's planning"
+msgstr "Omien projetien suunnittelu"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,timesheet:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,sum_amount_real:0
+#: field:report_account_analytic.planning.user,timesheet:0
+msgid "Timesheet"
+msgstr "Tuntilista"
+
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
+msgid "Planning Management Module"
+msgstr "Suunnittelun hallintamoduuli"
+
+#. module: project_planning
+#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
+msgid ""
+"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."
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Total planned tasks"
+msgstr "Suunnitellut tehtävät yhteensä"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,account_id:0
+msgid "Account"
+msgstr "Tili"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_project_task
+msgid "Task"
+msgstr "Tehtävä"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+#: view:report_account_analytic.planning.line:0
+msgid "Notes"
+msgstr "Huomautukset"
+
+#. 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 "Suunnitelmat"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Project"
+msgstr "Projekti"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Start Task"
+msgstr "Aloita tehtävä"
+
+#. module: project_planning
+#: selection:report_account_analytic.planning,state:0
+msgid "Cancelled"
+msgstr "Peruttu"
+
+#. 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 "Suunniteltu yhteensä (päiviä)"
+
+#. module: project_planning
+#: constraint:report_account_analytic.planning:0
+msgid ""
+"Invalid planning ! Planning dates can't overlap for the same responsible. "
+msgstr ""
+"Virheellinen suunnitelmat ! Suunnitellut päivät eivät voi mennä päällekkäin "
+"samalla vastuuhenkilöllä. "
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_account:0
+msgid "Planning By Account"
+msgstr "Suunnitelmat tileittäin"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Current Plannings"
+msgstr "Nykyiset suunnitelmat"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analyyttinen tili"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reset to Draft"
+msgstr "Palauta luonnokseksi"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Extra Info"
+msgstr "Lisätiedot"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "To :"
+msgstr "Vastanottaja :"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,timesheet:0
+#: help:report_account_analytic.planning.user,timesheet:0
+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 ""
+"Tämä arvo annetaan summana tuntilistoille merkityistä tunniesta alkupäivän "
+"ja loppupäivän väliseltä ajalta"
+
+#. module: project_planning
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Virhe! Et voi luoda sisäkkäisiä analyyttisiä tilejä."
+
+#. 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 "Ajan allokointi ilman tehtäviä"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+msgid "Planning Lines"
+msgstr "Suunnitelmarivit"
+
+#. module: project_planning
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Virhe! Et voi luoda sisäkkäisiä yrityksiä."
+
+#. 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 "Analyyttinen tili"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to FALSE, expressed in days."
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Miscelleanous"
+msgstr "Muut"
+
+#. module: project_planning
+#: help:res.company,planning_time_mode_id:0
+msgid "This will set the unit of measure used in plannings."
+msgstr "Asettaa mittayksikön jota käytetään suunnitelmissa."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "HR Planning"
+msgstr "HR suunnittelu"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,tasks:0
+#: field:report_account_analytic.planning.user,tasks:0
+msgid "Remaining Tasks"
+msgstr "Jäljelläolevat tehtävät"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: field:project.task,planning_line_id:0
+#: view:report_account_analytic.planning:0
+#: field:report_account_analytic.planning.account,planning_id:0
+#: field:report_account_analytic.planning.line,planning_id:0
+#: field:report_account_analytic.planning.stat,planning_id:0
+#: field:report_account_analytic.planning.user,planning_id:0
+msgid "Planning"
+msgstr "Suunnittelu"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_planned:0
+msgid "Total Planned"
+msgstr "Suunniteltu yhteensä"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Time Encoding"
+msgstr "Ajan syöttö"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,free:0
+msgid "Unallocated Time"
+msgstr "Määrittelemätän aika"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation without task(s) linked, "
+"expressed in days."
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Delegate"
+msgstr "Delegoi"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,free:0
+msgid ""
+"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
+"without Tasks + Holiday Leaves)"
+msgstr ""
+
+#. module: project_planning
+#: help:report_account_analytic.planning,business_days:0
+msgid ""
+"Set here the number of working days within this planning for one person full "
+"time"
+msgstr ""
+"Aseta tähän työpäivien määrä suunnitelmassa yhden täysaikaisen henkilön "
+"osalta."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "["
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "From :"
+msgstr "Lähettäjä :"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_user_ids:0
+msgid "Planning By User"
+msgstr "Suunnitelu käyttäjittäin"
+
+#. 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 "Tehtävät"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By Account (in Days)"
+msgstr "Suunnittelu tileittäin (päiviä)"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Time without tasks"
+msgstr "Aika ilman tehtäiä"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,date_from:0
+msgid "Start Date"
+msgstr "Aloituspvm"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_free:0
+msgid "Total Free"
+msgstr "Yhteensä vapaana"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to TRUE expressed in days."
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning,stat_ids:0
+msgid "Planning analysis"
+msgstr "Suunnitteluanalyysi"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount_unit:0
+msgid "Qty UoM"
+msgstr "Määrän mittayksikkö"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,note:0
+msgid "Note"
+msgstr "Huomautus"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Draft"
+msgstr "Luonnos"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
+#: view:report_account_analytic.planning:0
+msgid "Planning by Account"
+msgstr "Suunnittelu tileittäin"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Pending"
+msgstr "Odottava"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,sum_amount:0
+msgid "Planned Days"
+msgstr "Suunnitellut päivät"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,state:0
+msgid "Status"
+msgstr "Tila"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,holiday:0
+msgid ""
+"This value is given by the total of validated leaves into the 'Date From' "
+"and 'Date To' of the planning."
+msgstr ""
+"Arvo annetaan hyväksyttyjen lomapäivien määränä alkupäivän ja loppupäivän "
+"välissä suunnitelmassa."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,user_id:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,user_id:0
+#: field:report_account_analytic.planning.user,user_id:0
+msgid "User"
+msgstr "Käyttäjä"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Remaining Tasks"
+msgstr "Jäljelläolevat tehtävät yhteensä"
+
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
+msgid ""
+"\n"
+"This module helps you to manage your plannings.\n"
+"\n"
+"This module is based on the analytic accounting and is totally integrated "
+"with\n"
+"* the timesheets encoding\n"
+"* the holidays management\n"
+"* the project management\n"
+"\n"
+"So that, each department manager can know if someone in his team has still "
+"unallocated time for a given planning (taking in consideration the validated "
+"leaves) or if he still needs to encode tasks.\n"
+"\n"
+"At the end of the month, the planning manager can also check if the encoded "
+"timesheets are respecting the planned time on each analytic account.\n"
+msgstr ""
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_res_company
+msgid "Companies"
+msgstr "Yritykset"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount_in_base_uom:0
+msgid "Quantity in base uom"
+msgstr "Määrä perusmittayksikössä"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,plan_tasks:0
+msgid "Time Planned on Tasks"
+msgstr "Suunniteltu aika tehtäville"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount:0
+msgid "Quantity"
+msgstr "Määrä"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,code:0
+msgid "Code"
+msgstr "Koodi"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: field:report_account_analytic.planning,line_ids:0
+msgid "Planning lines"
+msgstr "Suunnittelurivit"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Done"
+msgstr "Valmis"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Cancel"
+msgstr "Peruuta"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By User (in Days)"
+msgstr "Suunnittelu käyttäjittäin (päiviä)"
+
+#. module: project_planning
+#: view:report_account_analytic.planning.stat:0
+msgid "Planning statistics"
+msgstr "Suunnittelutilastot"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Open"
+msgstr "Avaa"
+
+#. 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 "Sunnittelu käyttäjittäin"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Information"
+msgstr "Tiedot"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,business_days:0
+msgid "Business Days"
+msgstr "Työpäiviä"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reactivate"
+msgstr "Aktivoi uudelleen"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,user_id:0
+msgid "Responsible"
+msgstr "Vastuuhenkilö"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
+msgid "Planning stat"
+msgstr "Suunnittelun tila"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,plan_tasks:0
+msgid "Time Allocation of Tasks"
+msgstr "Ajan allokointi tehtäville"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by user"
+msgstr "Käyttäjän yhteenveto"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Time Allocation without Tasks"
+msgstr "Kokonais ajan allokointi ilman tehtäviä"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,holiday:0
+msgid "Leaves"
+msgstr "Lomat"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Time Allocation of Tasks"
+msgstr "Ajan kokonais allokaatio tehtäville"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,date_to:0
+msgid "End Date"
+msgstr "Loppupvm"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Remaining tasks"
+msgstr "Jäljelläolevat tehtävät"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by project"
+msgstr "Yhteenveto projekteittain"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Responsible :"
+msgstr "Vastuuhenkilö :"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "]"
+msgstr ""
+
+#. module: project_planning
+#: field:res.company,planning_time_mode_id:0
+msgid "Planning Time Unit"
+msgstr "Suunnittelun mittayksikkö"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,task_ids:0
+msgid "Planning Tasks"
+msgstr "Suunnittelutehtävät"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,manager_id:0
+msgid "Manager"
+msgstr "Päällikkö"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with task(s) linked, "
+"expressed in days."
+msgstr ""
+"Arvo määritellään linkitettyjen tehtävien ajanvarauksen summana, "
+"määritettynä päivinä."
diff --git a/addons/project_planning/i18n/gl.po b/addons/project_planning/i18n/gl.po
new file mode 100644
index 00000000000..a8cc0e0d3d3
--- /dev/null
+++ b/addons/project_planning/i18n/gl.po
@@ -0,0 +1,619 @@
+# Galician 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-06-08 15:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@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-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: project_planning
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr "Erro! A divisa ten que ser a mesma cá da compañía seleccionada"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,tasks:0
+#: help:report_account_analytic.planning.user,tasks:0
+msgid ""
+"This value is given by the sum of work remaining to do on the task for this "
+"planning, expressed in days."
+msgstr ""
+"Este valor ven dado pola suma de traballo que queda por facer na tarefa "
+"desta planificación, expresado en días."
+
+#. 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 "Estatísticas de planificación"
+
+#. 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 "Liña de planificación"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Unallocated Time"
+msgstr "Tempo non asignado total"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,name:0
+msgid "Planning Name"
+msgstr "Nome da planificación"
+
+#. module: project_planning
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Erro! Non pode crear tarefas recorrentes."
+
+#. module: project_planning
+#: view:board.board:0
+msgid "My Project's planning"
+msgstr "As miñas planificacións de proxectos"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,timesheet:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,sum_amount_real:0
+#: field:report_account_analytic.planning.user,timesheet:0
+msgid "Timesheet"
+msgstr "Parte de tempos"
+
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
+msgid "Planning Management Module"
+msgstr "Módulo para a xestión da planificación"
+
+#. module: project_planning
+#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
+msgid ""
+"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."
+msgstr ""
+"Co seu sistema global para planificar tódolos recursos dunha compañía "
+"(persoas e materiais), OpenERP permítelle codificar e calcular "
+"automaticamente a planificación das tarefas e fases, e controlar a "
+"asignación e dispoñibilidade de recursos."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Total planned tasks"
+msgstr "Total de tarefas planificadas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,account_id:0
+msgid "Account"
+msgstr "Conta"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_project_task
+msgid "Task"
+msgstr "Tarefa"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+#: view:report_account_analytic.planning.line:0
+msgid "Notes"
+msgstr "Notas"
+
+#. 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 "Planificacións"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Project"
+msgstr "Proxecto"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Start Task"
+msgstr "Iniciar tarefa"
+
+#. module: project_planning
+#: selection:report_account_analytic.planning,state:0
+msgid "Cancelled"
+msgstr "Anulado"
+
+#. 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 "Planificación total (en días)"
+
+#. module: project_planning
+#: constraint:report_account_analytic.planning:0
+msgid ""
+"Invalid planning ! Planning dates can't overlap for the same responsible. "
+msgstr ""
+"Planificación non válida! As datas da planificación non se poden superpoñer "
+"para o mesmo responsable. "
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_account:0
+msgid "Planning By Account"
+msgstr "Planificación por conta"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Current Plannings"
+msgstr "Planificacións actuais"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Conta analítica"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reset to Draft"
+msgstr "Cambiar a modo Borrador"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Extra Info"
+msgstr "Información adicional"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "To :"
+msgstr "A:"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,timesheet:0
+#: help:report_account_analytic.planning.user,timesheet:0
+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 ""
+"Este valor ven dado pola suma de tódolos traballos codificados na(s) "
+"folla(s) de servizos entre a 'Data desde' e a 'Data ata' da planificación."
+
+#. module: project_planning
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Erro! Non pode crear contas analíticas recorrentes."
+
+#. 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 "Tempo de asignación sen tarefas"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+msgid "Planning Lines"
+msgstr "Liñas planificadas"
+
+#. module: project_planning
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erro! Non pode crear compañías recorrentes."
+
+#. 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 "Conta analítica"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to FALSE, expressed in days."
+msgstr ""
+"Este valor ven dado pola suma da asignación de tempo coa opción 'Asignado en "
+"tarefas' desmarcada, expresado en días."
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Miscelleanous"
+msgstr "Varios"
+
+#. module: project_planning
+#: help:res.company,planning_time_mode_id:0
+msgid "This will set the unit of measure used in plannings."
+msgstr "Isto establecerá a unidade de medida utilizada nas planificacións."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "HR Planning"
+msgstr "Planificación RRHH"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,tasks:0
+#: field:report_account_analytic.planning.user,tasks:0
+msgid "Remaining Tasks"
+msgstr "Tarefas pendentes"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: field:project.task,planning_line_id:0
+#: view:report_account_analytic.planning:0
+#: field:report_account_analytic.planning.account,planning_id:0
+#: field:report_account_analytic.planning.line,planning_id:0
+#: field:report_account_analytic.planning.stat,planning_id:0
+#: field:report_account_analytic.planning.user,planning_id:0
+msgid "Planning"
+msgstr "Planificación"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_planned:0
+msgid "Total Planned"
+msgstr "Total planificado"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Time Encoding"
+msgstr "Codificación de tempo"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,free:0
+msgid "Unallocated Time"
+msgstr "Tempo non asignado"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation without task(s) linked, "
+"expressed in days."
+msgstr ""
+"Este valor ven dado pola suma da asignación de tempo sen tarefa(s) "
+"vinculada(s), expresado en días."
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Delegate"
+msgstr "Delegar"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,free:0
+msgid ""
+"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
+"without Tasks + Holiday Leaves)"
+msgstr ""
+"Calculado como días laborables - (Tempo de asignación das tarefas + Tempo de "
+"asignación sen tarefas + Ausencias de vacacións)"
+
+#. module: project_planning
+#: help:report_account_analytic.planning,business_days:0
+msgid ""
+"Set here the number of working days within this planning for one person full "
+"time"
+msgstr ""
+"Indique aquí o número de días de traballo dentro desta planificación para "
+"unha persoa a tempo completo."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "["
+msgstr "["
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "From :"
+msgstr "Desde:"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_user_ids:0
+msgid "Planning By User"
+msgstr "Planificación por usuario"
+
+#. 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 "Tarefas"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By Account (in Days)"
+msgstr "Planificación por conta (en días)"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Time without tasks"
+msgstr "Tempo sen tarefas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,date_from:0
+msgid "Start Date"
+msgstr "Data de comezo"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_free:0
+msgid "Total Free"
+msgstr "Total libre"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to TRUE expressed in days."
+msgstr ""
+"Este valor ven dado pola suma da asignación de tempo coa opción \"Asignado "
+"en tarefas\" marcada expresado en días."
+
+#. module: project_planning
+#: field:report_account_analytic.planning,stat_ids:0
+msgid "Planning analysis"
+msgstr "Análise planificación"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount_unit:0
+msgid "Qty UoM"
+msgstr "Ctde UdM"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Draft"
+msgstr "Proxecto"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
+#: view:report_account_analytic.planning:0
+msgid "Planning by Account"
+msgstr "Planificación por conta"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Pending"
+msgstr "Pendente"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,sum_amount:0
+msgid "Planned Days"
+msgstr "Días planificados"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,holiday:0
+msgid ""
+"This value is given by the total of validated leaves into the 'Date From' "
+"and 'Date To' of the planning."
+msgstr ""
+"Este valor ven dado polo total das ausencias validadas entre a 'Data desde' "
+"e a 'Data ata' da planificación."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,user_id:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,user_id:0
+#: field:report_account_analytic.planning.user,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Remaining Tasks"
+msgstr "Total de tarefas pendentes"
+
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
+msgid ""
+"\n"
+"This module helps you to manage your plannings.\n"
+"\n"
+"This module is based on the analytic accounting and is totally integrated "
+"with\n"
+"* the timesheets encoding\n"
+"* the holidays management\n"
+"* the project management\n"
+"\n"
+"So that, each department manager can know if someone in his team has still "
+"unallocated time for a given planning (taking in consideration the validated "
+"leaves) or if he still needs to encode tasks.\n"
+"\n"
+"At the end of the month, the planning manager can also check if the encoded "
+"timesheets are respecting the planned time on each analytic account.\n"
+msgstr ""
+"\n"
+"Este módulo permítelle xestionar as súas planificacións. Este módulo basease "
+"na contabilidade analítica e está totalmente integrado * coa codificación de "
+"follas de servizos* coa xestión das vacacións/festas* coa xestión de "
+"proxectos. Deste xeito, cada responsable de departamento pode saber se "
+"alguén no seu equipo aínda ten tempo non asignado para unha certa "
+"planificación (tendo en conta as vacacións validadas) ou se aínda o necesita "
+"para codificar tarefas. A fin de mes, o responsable de planificación tamén "
+"pode comprobar se as follas de servizos codificadas están a respectar o "
+"tempo planificado en cada conta analítica.\n"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount_in_base_uom:0
+msgid "Quantity in base uom"
+msgstr "Cantidade na UdM base"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,plan_tasks:0
+msgid "Time Planned on Tasks"
+msgstr "Tempo planificado en tarefas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount:0
+msgid "Quantity"
+msgstr "Cantidade"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: field:report_account_analytic.planning,line_ids:0
+msgid "Planning lines"
+msgstr "Liñas de planificación"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Done"
+msgstr "Feito"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Cancel"
+msgstr "Anular"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By User (in Days)"
+msgstr "Planificación polo usuario (en días)"
+
+#. module: project_planning
+#: view:report_account_analytic.planning.stat:0
+msgid "Planning statistics"
+msgstr "Estatísticas de planificación"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. 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 "Planificación polo usuario"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Information"
+msgstr "Información"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,business_days:0
+msgid "Business Days"
+msgstr "Días laborables"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reactivate"
+msgstr "Reactivar"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
+msgid "Planning stat"
+msgstr "Estat. planificación"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,plan_tasks:0
+msgid "Time Allocation of Tasks"
+msgstr "Tempo de asignación de tarefas"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by user"
+msgstr "Resumo por usuario"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Time Allocation without Tasks"
+msgstr "Tempo total de asignación sen tarefas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,holiday:0
+msgid "Leaves"
+msgstr "Permisos"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Time Allocation of Tasks"
+msgstr "Tempo total de asignación de tarefas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,date_to:0
+msgid "End Date"
+msgstr "Data de remate"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Remaining tasks"
+msgstr "Tarefas pendentes"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by project"
+msgstr "Resumo por proxecto"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Responsible :"
+msgstr "Responsable:"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "]"
+msgstr "]"
+
+#. module: project_planning
+#: field:res.company,planning_time_mode_id:0
+msgid "Planning Time Unit"
+msgstr "Unidade de tempo de planificación"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,task_ids:0
+msgid "Planning Tasks"
+msgstr "Planificación de tarefas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,manager_id:0
+msgid "Manager"
+msgstr "Xestor"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with task(s) linked, "
+"expressed in days."
+msgstr ""
+"Este valor ven dado pola suma da asignación de tempo coa(s) tarefa(s) "
+"vinculada(s), expresado en días."
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index 46cc225153e..701a9a12cd6 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -128,8 +128,8 @@ class report_account_analytic_planning(osv.osv):
         'business_days': fields.integer('Business Days', required=True, states={'done':[('readonly', True)]}, help='Set here the number of working days within this planning for one person full time'),
         'planning_user_ids': one2many_mod3('report_account_analytic.planning.user', 'planning_id', 'Planning By User'),
         'planning_account': fields.one2many('report_account_analytic.planning.account', 'planning_id', 'Planning By Account'),
-        'total_planned': fields.function(_get_total_planned, method=True, string='Total Planned'),
-        'total_free': fields.function(_get_total_free, method=True, string='Total Free'),
+        'total_planned': fields.function(_get_total_planned, string='Total Planned'),
+        'total_free': fields.function(_get_total_free, string='Total Free'),
     }
     _defaults = {
         'date_from': lambda *a: time.strftime('%Y-%m-01'),
@@ -202,7 +202,7 @@ class report_account_analytic_planning_line(osv.osv):
         'amount': fields.float('Quantity', required=True),
         'amount_unit': fields.many2one('product.uom', 'Qty UoM', required=True),
         'note': fields.text('Note', size=64),
-        'amount_in_base_uom': fields.function(_amount_base_uom, method=True, string='Quantity in base uom', store=True),
+        'amount_in_base_uom': fields.function(_amount_base_uom, string='Quantity in base uom', store=True),
         'task_ids': fields.one2many('project.task', 'planning_line_id', 'Planning Tasks'),
     }
     _order = 'user_id, account_id'
@@ -301,13 +301,13 @@ class report_account_analytic_planning_user(osv.osv):
     _columns = {
         'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
         'user_id': fields.many2one('res.users', 'User', readonly=True),
-        'tasks': fields.function(_get_tasks, method=True, string='Remaining Tasks', help='This value is given by the sum of work remaining to do on the task for this planning, expressed in days.'),
+        'tasks': fields.function(_get_tasks, string='Remaining Tasks', help='This value is given by the sum of work remaining to do on the task for this planning, expressed in days.'),
         'plan_tasks': fields.float('Time Planned on Tasks', readonly=True, help='This value is given by the sum of time allocation with task(s) linked, expressed in days.'),
-        'free': fields.function(_get_free, method=True, string='Unallocated Time', readonly=True, help='Computed as \
+        'free': fields.function(_get_free, string='Unallocated Time', readonly=True, help='Computed as \
 Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holiday Leaves)'),
         'plan_open': fields.float('Time Allocation without Tasks', readonly=True,help='This value is given by the sum of time allocation without task(s) linked, expressed in days.'),
         'holiday': fields.float('Leaves',help='This value is given by the total of validated leaves into the \'Date From\' and \'Date To\' of the planning.'),
-        'timesheet': fields.function(_get_timesheets, method=True, string='Timesheet', help='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.'),
+        'timesheet': fields.function(_get_timesheets, string='Timesheet', help='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.'),
     }
 
     def init(self, cr):
@@ -435,10 +435,10 @@ class report_account_analytic_planning_account(osv.osv):
     _columns = {
         'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
         'account_id': fields.many2one('account.analytic.account', 'Analytic account', readonly=True),
-        'tasks': fields.function(_get_tasks, method=True, string='Remaining Tasks', help='This value is given by the sum of work remaining to do on the task for this planning, expressed in days.'),
+        'tasks': fields.function(_get_tasks, string='Remaining Tasks', help='This value is given by the sum of work remaining to do on the task for this planning, expressed in days.'),
         'plan_tasks': fields.float('Time Allocation of Tasks', readonly=True, help='This value is given by the sum of time allocation with the checkbox \'Assigned in Taks\' set to TRUE expressed in days.'),
         'plan_open': fields.float('Time Allocation without Tasks', readonly=True, help='This value is given by the sum of time allocation with the checkbox \'Assigned in Taks\' set to FALSE, expressed in days.'),
-        'timesheet': fields.function(_get_timesheets, method=True, string='Timesheet', help='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.'),
+        'timesheet': fields.function(_get_timesheets, string='Timesheet', help='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.'),
     }
 
     def init(self, cr):
@@ -546,8 +546,8 @@ WHERE user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.i
         'manager_id': fields.many2one('res.users', 'Manager'),
         'account_id': fields.many2one('account.analytic.account', 'Account'),
         'sum_amount': fields.float('Planned Days', required=True),
-        'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'),
-        'sum_amount_tasks': fields.function(_sum_amount_tasks, method=True, string='Tasks'),
+        'sum_amount_real': fields.function(_sum_amount_real, string='Timesheet'),
+        'sum_amount_tasks': fields.function(_sum_amount_tasks, string='Tasks'),
     }
 
     def init(self, cr):
diff --git a/addons/project_retro_planning/i18n/fi.po b/addons/project_retro_planning/i18n/fi.po
new file mode 100644
index 00000000000..b62a8edb284
--- /dev/null
+++ b/addons/project_retro_planning/i18n/fi.po
@@ -0,0 +1,47 @@
+# Finnish 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-06-09 10:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: project_retro_planning
+#: model:ir.model,name:project_retro_planning.model_project_project
+msgid "Project"
+msgstr "Projekti"
+
+#. module: project_retro_planning
+#: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
+msgid "Project Retro planning"
+msgstr "Projektien 'retro' suunnittelu"
+
+#. module: project_retro_planning
+#: model:ir.module.module,description:project_retro_planning.module_meta_information
+msgid ""
+"\n"
+"        - If end date of project is changed\n"
+"          then the deadline date and start date for all the tasks will "
+"change accordingly  "
+msgstr ""
+
+#. module: project_retro_planning
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "Virhe: projektin alkupäivä tulee olla aikaisempi kuin loppupäivä."
+
+#. module: project_retro_planning
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Virhe! Et voi asettaa eskalointia samalle projektille!"
diff --git a/addons/project_scrum/i18n/ar.po b/addons/project_scrum/i18n/ar.po
index 977f55e718a..acfd53b6b55 100644
--- a/addons/project_scrum/i18n/ar.po
+++ b/addons/project_scrum/i18n/ar.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-08 16:00+0000\n"
-"Last-Translator: Genie-soft <rawan@genie-soft.com>\n"
+"PO-Revision-Date: 2011-06-18 11:28+0000\n"
+"Last-Translator: kifcaliph <kifcaliph@hotmail.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-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-19 04:36+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -29,12 +29,12 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.meeting,name:0
 msgid "Meeting Name"
-msgstr ""
+msgstr "اسم الإجتماع"
 
 #. module: project_scrum
 #: model:process.transition,note:project_scrum.process_transition_backlogtask0
 msgid "From backlog create task."
-msgstr ""
+msgstr "إنشاء مهمة من السجل التراكمي."
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -94,17 +94,17 @@ msgstr ""
 #. module: project_scrum
 #: model:process.node,note:project_scrum.process_node_productbacklog0
 msgid "Create task from backlogs"
-msgstr ""
+msgstr "إنشاء مهمة من السجل التراكمي."
 
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
-msgstr ""
+msgstr "إدارة التطوير بطريقة الـ سكرم (Scrum) أو الـ آجيل (Agile)"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "مستوي التقدم"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,user_id:0
@@ -128,12 +128,12 @@ msgstr ""
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
+msgstr "هل تقديراتك دقيقة لسجل العدوات السريعة؟"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Retrospective"
-msgstr ""
+msgstr "أثر رجعي"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -148,7 +148,7 @@ msgstr ""
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.dblc_proj
 msgid "View project's backlog"
-msgstr ""
+msgstr "عرض السجل التراكمي للمشروع"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -248,7 +248,7 @@ msgstr ""
 #: field:project.task,product_backlog_id:0
 #, python-format
 msgid "Product Backlog"
-msgstr ""
+msgstr "سجل تراكمي للمنتج"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_project
diff --git a/addons/project_scrum/i18n/sv.po b/addons/project_scrum/i18n/sv.po
index a4d8c3fb361..cba4c5bd8d9 100644
--- a/addons/project_scrum/i18n/sv.po
+++ b/addons/project_scrum/i18n/sv.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-12-16 03:09+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-06-03 14:17+0000\n"
+"Last-Translator: Jan-Eric Lindh <jelindh@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-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-04 04:53+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -206,7 +206,7 @@ msgstr "Ok"
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Spent hours"
-msgstr ""
+msgstr "Förbrukade timmar"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,help:project_scrum.action_meeting_form
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index 67f8d1d8eb7..334a415982d 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -106,9 +106,9 @@ class project_scrum_sprint(osv.osv):
         'review': fields.text('Sprint Review'),
         'retrospective': fields.text('Sprint Retrospective'),
         'backlog_ids': fields.one2many('project.scrum.product.backlog', 'sprint_id', 'Sprint Backlog'),
-        'progress': fields.function(_compute, group_operator="avg", type='float', multi="progress", method=True, string='Progress (0-100)', help="Computed as: Time Spent / Total Time."),
-        'effective_hours': fields.function(_compute, multi="effective_hours", method=True, string='Effective hours', help="Computed using the sum of the task work done."),
-        'expected_hours': fields.function(_compute, multi="expected_hours", method=True, string='Planned Hours', help='Estimated time to do the task.'),
+        'progress': fields.function(_compute, group_operator="avg", type='float', multi="progress", string='Progress (0-100)', help="Computed as: Time Spent / Total Time."),
+        'effective_hours': fields.function(_compute, multi="effective_hours", string='Effective hours', help="Computed using the sum of the task work done."),
+        'expected_hours': fields.function(_compute, multi="expected_hours", string='Planned Hours', help='Estimated time to do the task.'),
         'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('cancel','Cancelled'),('done','Done')], 'State', required=True),
     }
     _defaults = {
@@ -230,11 +230,11 @@ class project_scrum_product_backlog(osv.osv):
         'sequence' : fields.integer('Sequence', help="Gives the sequence order when displaying a list of product backlog."),
         'tasks_id': fields.one2many('project.task', 'product_backlog_id', 'Tasks Details'),
         'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('done','Done'),('cancel','Cancelled')], 'State', required=True),
-        'progress': fields.function(_compute, multi="progress", group_operator="avg", type='float', method=True, string='Progress', help="Computed as: Time Spent / Total Time."),
-        'effective_hours': fields.function(_compute, multi="effective_hours", method=True, string='Spent Hours', help="Computed using the sum of the time spent on every related tasks", store=True),
+        'progress': fields.function(_compute, multi="progress", group_operator="avg", type='float', string='Progress', help="Computed as: Time Spent / Total Time."),
+        'effective_hours': fields.function(_compute, multi="effective_hours", string='Spent Hours', help="Computed using the sum of the time spent on every related tasks", store=True),
         'expected_hours': fields.float('Planned Hours', help='Estimated total time to do the Backlog'),
         'create_date': fields.datetime("Creation Date", readonly=True),
-        'task_hours': fields.function(_compute, multi="task_hours", method=True, string='Task Hours', help='Estimated time of the total hours of the tasks')
+        'task_hours': fields.function(_compute, multi="task_hours", string='Task Hours', help='Estimated time of the total hours of the tasks')
     }
     _defaults = {
         'state': 'draft',
@@ -317,12 +317,11 @@ class project_scrum_meeting(osv.osv):
         return True
 
     def email_send(self, cr, uid, ids, email, context=None):
-        email_from = tools.config.get('email_from', False)
         meeting_id = self.browse(cr, uid, ids, context=context)[0]
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        user_email = email_from or user.address_id.email  or email_from
+        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_______________________%s\n*Task for Today:\n_______________________ %s\n\n*Blocks encountered:\n_______________________ %s') %(meeting_id.question_yesterday,meeting_id.question_today, meeting_id.question_blocks or _('No Blocks'))
+        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 = tools.email_send(user_email , [email], sub_name, body, reply_to=None, openobject_id=str(meeting_id.id))
diff --git a/addons/project_timesheet/report/task_report.py b/addons/project_timesheet/report/task_report.py
index 623d4e4a5cd..3c223ab6b07 100644
--- a/addons/project_timesheet/report/task_report.py
+++ b/addons/project_timesheet/report/task_report.py
@@ -62,8 +62,8 @@ class report_timesheet_task_user(osv.osv):
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
                                   ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
         'user_id': fields.many2one('res.users', 'User',readonly=True),
-        'timesheet_hrs': fields.function(get_hrs_timesheet, method=True, string="Timesheet Hours"),
-        'task_hrs': fields.function(_get_task_hours, method=True, string="Task Hours"),
+        'timesheet_hrs': fields.function(get_hrs_timesheet, string="Timesheet Hours"),
+        'task_hrs': fields.function(_get_task_hours, string="Task Hours"),
     }
 
     def init(self, cr):
diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py
index 48d006f2c15..86cce749a21 100644
--- a/addons/purchase/partner.py
+++ b/addons/purchase/partner.py
@@ -31,7 +31,6 @@ class res_partner(osv.osv):
           relation='product.pricelist', 
           domain=[('type','=','purchase')],
           string="Purchase Pricelist", 
-          method=True,
           view_load=True,
           help="This pricelist will be used, instead of the default one, for purchases from the current partner"),
     }
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 01f5c9faf11..6ec558acc97 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -185,29 +185,29 @@ class purchase_order(osv.osv):
         'invoice_ids': fields.many2many('account.invoice', 'purchase_invoice_rel', 'purchase_id', 'invoice_id', 'Invoices', help="Invoices generated for a purchase order"),
         'picking_ids': fields.one2many('stock.picking', 'purchase_id', 'Picking List', readonly=True, help="This is the list of picking list that have been generated for this purchase"),
         'shipped':fields.boolean('Received', readonly=True, select=True, help="It indicates that a picking has been done"),
-        'shipped_rate': fields.function(_shipped_rate, method=True, string='Received', type='float'),
-        'invoiced': fields.function(_invoiced, method=True, string='Invoiced & Paid', type='boolean', help="It indicates that an invoice has been paid"),
-        'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
-        'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Reception')], 'Invoicing Control', required=True,
+        'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'),
+        'invoiced': fields.function(_invoiced, string='Invoiced & Paid', type='boolean', help="It indicates that an invoice has been paid"),
+        'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
+        'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Picking')], 'Invoicing Control', required=True,
             help="From Order: a draft invoice will be pre-generated based on the purchase order. The accountant " \
                 "will just have to validate this invoice for control.\n" \
                 "From Picking: a draft invoice will be pre-generated based on validated receptions.\n" \
                 "Manual: allows you to generate suppliers invoices by chosing in the uninvoiced lines of all manual purchase orders."
         ),
-        'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, method=True, string='Expected Date', type='date', select=True, help="This is computed as the minimum scheduled date of all purchase order lines' products.",
+        'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, string='Expected Date', type='date', select=True, help="This is computed as the minimum scheduled date of all purchase order lines' products.",
             store = {
                 'purchase.order.line': (_get_order, ['date_planned'], 10),
             }
         ),
-        'amount_untaxed': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Untaxed Amount',
+        'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Purchase Price'), string='Untaxed Amount',
             store={
                 'purchase.order.line': (_get_order, None, 10),
             }, multi="sums", help="The amount without tax"),
-        'amount_tax': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Taxes',
+        'amount_tax': fields.function(_amount_all, digits_compute= dp.get_precision('Purchase Price'), string='Taxes',
             store={
                 'purchase.order.line': (_get_order, None, 10),
             }, multi="sums", help="The tax amount"),
-        'amount_total': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Total',
+        'amount_total': fields.function(_amount_all, digits_compute= dp.get_precision('Purchase Price'), string='Total',
             store={
                 'purchase.order.line': (_get_order, None, 10),
             }, multi="sums",help="The total amount"),
@@ -622,7 +622,7 @@ class purchase_order_line(osv.osv):
         'move_ids': fields.one2many('stock.move', 'purchase_line_id', 'Reservation', readonly=True, ondelete='set null'),
         'move_dest_id': fields.many2one('stock.move', 'Reservation Destination', ondelete='set null'),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Purchase Price')),
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Purchase Price')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Purchase Price')),
         'notes': fields.text('Notes'),
         'order_id': fields.many2one('purchase.order', 'Order Reference', select=True, required=True, ondelete='cascade'),
         'account_analytic_id':fields.many2one('account.analytic.account', 'Analytic Account',),
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index fc990ecefee..73b369f1793 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -214,9 +214,9 @@
                             <separator string="Purchase Control" colspan="4"/>
                             <field name="validator"/>
                             <field name="date_approve"/>
-                        	<separator string="Invoices" colspan="4"/>
-                        	<newline/>
-                        	<field name="invoice_ids" groups="base.group_extended" nolabel="1" colspan="4" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
+                            <separator string="Invoices" colspan="4"/>
+                            <newline/>
+                            <field name="invoice_ids" groups="base.group_extended" nolabel="1" colspan="4" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="notes" nolabel="1"/>
@@ -316,8 +316,8 @@
                 <form string="Purchase Order Line">
                     <notebook colspan="4">
                         <page string="Order Line">
-                            <field name="product_id" colspan="4" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/>
-                            <field name="product_qty" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/>
+                            <field name="product_id" colspan="4" context="{'partner_id':parent.partner_id, 'quantity':product_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'warehouse':parent.warehouse_id}" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/>
+                            <field name="product_qty" context="{'partner_id':parent.partner_id, 'quantity':product_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'warehouse':parent.warehouse_id}" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/>
                             <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/>
                             <field colspan="4" name="name"/>
                             <field name="date_planned" widget="date"/>
diff --git a/addons/purchase/wizard/purchase_installer.py b/addons/purchase/wizard/purchase_installer.py
index bf106adc3ac..be99a41a3cc 100644
--- a/addons/purchase/wizard/purchase_installer.py
+++ b/addons/purchase/wizard/purchase_installer.py
@@ -21,8 +21,7 @@
 from osv import fields, osv
 
 class purchase_installer(osv.osv_memory):
-    _name = 'purchase.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         'purchase_requisition':fields.boolean('Purchase Requisition',help="Manages your Purchase Requisition and allows you to easily keep track and manage all your purchase orders."),
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index 93dadad007f..bc3ca11aa7b 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -3,50 +3,19 @@
     <data>
         <record id="view_purchase_install_module_form" model="ir.ui.view">
             <field name="name">Purchases Application Configuration</field>
-            <field name="model">purchase.installer</field>
+            <field name="model">base.setup.installer</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_installer"/>
+            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
             <field name="arch" type="xml">
               <data>
-              <form position="attributes">
-                <attribute name="string">Purchases Application Configuration</attribute>
-              </form>
-              <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='string'></attribute>
-                  </xpath>
-              <separator string="title" position="attributes">
-                <attribute name="string"
-                           >Configure Your Purchases Management Application</attribute>
-              </separator>
-              <xpath expr="//label[@string='description']"
-                     position="attributes">
-                <attribute name="string">Extend your Purchases Management Application with additional functionalities.</attribute>
-              </xpath>
-              <xpath expr="//button[@string='Install Modules']" position="attributes">
-                   <attribute name="string">Configure</attribute>
-               </xpath>
-                <group colspan="8">
-                  <field name="purchase_requisition"/>
-                  <field name="purchase_analytic_plans"/>
-                </group>
+          <xpath expr="//group[@name='purchase']" position="replace">
+            <newline/>
+            <separator  string="Purchase Management Features" colspan="4" />
+            <field name="purchase_requisition" />
+            <field name="purchase_analytic_plans" />
+          </xpath>
               </data>
             </field>
         </record>
-
-        <record id="action_purchase_install_module" model="ir.actions.act_window">
-            <field name="name">Purchases Application Configuration</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.installer</field>
-            <field name="view_id" ref="view_purchase_install_module_form"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-    <record id="purchase_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_purchase_install_module"/>
-      <field name="sequence">3</field>
-      <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
-    </record>
     </data>
 </openerp>
diff --git a/addons/purchase/wizard/purchase_order_group.py b/addons/purchase/wizard/purchase_order_group.py
index e6383f0dd5d..427c9c165fc 100644
--- a/addons/purchase/wizard/purchase_order_group.py
+++ b/addons/purchase/wizard/purchase_order_group.py
@@ -77,7 +77,7 @@ class purchase_order_group(osv.osv_memory):
 
         return {
             'domain': "[('id','in', [" + ','.join(map(str, allorders.keys())) + "])]",
-            'name': 'Purchase Orders',
+            'name': _('Purchase Orders'),
             'view_type': 'form',
             'view_mode': 'tree,form',
             'res_model': 'purchase.order',
diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
index 7bd9c3c33c0..912325e2ca5 100644
--- a/addons/purchase/wizard/purchase_order_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -26,7 +26,8 @@ Lines will only be merged if: &#10;
             </field>
         </record>
 
-        <act_window name="Merge Purchase orders"            
+        <act_window name="Merge Purchase orders"
+            context="{'search_default_draft': 1, 'search_default_approved': False}"
             res_model="purchase.order.group"
             src_model="purchase.order"
             view_mode="form"
diff --git a/addons/purchase_analytic_plans/i18n/fi.po b/addons/purchase_analytic_plans/i18n/fi.po
new file mode 100644
index 00000000000..9e99d25b5cc
--- /dev/null
+++ b/addons/purchase_analytic_plans/i18n/fi.po
@@ -0,0 +1,54 @@
+# Finnish 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:58+0000\n"
+"PO-Revision-Date: 2011-06-09 05:54+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-10 04:36+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: purchase_analytic_plans
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr "Ostotilauksen rivi"
+
+#. module: purchase_analytic_plans
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "Tilauksen viite tulee olla yksilöllinen!"
+
+#. module: purchase_analytic_plans
+#: field:purchase.order.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr "Analyyttinen jakelu"
+
+#. module: purchase_analytic_plans
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order
+msgid "Purchase Order"
+msgstr "Ostotilaus"
+
+#. module: purchase_analytic_plans
+#: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
+msgid "Purchase Analytic Distribution Management"
+msgstr "Analyyttisen hankinnan jakelun hallinta"
+
+#. module: purchase_analytic_plans
+#: model:ir.module.module,description:purchase_analytic_plans.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage analytic distribution and purchase orders.\n"
+"    "
+msgstr ""
+"\n"
+"    Perusmoduuli analyyttisen jakelun ja ostotilausten hallintaan\n"
+"    "
diff --git a/addons/purchase_analytic_plans/i18n/tr.po b/addons/purchase_analytic_plans/i18n/tr.po
index 3d970102c4a..c7b86928048 100644
--- a/addons/purchase_analytic_plans/i18n/tr.po
+++ b/addons/purchase_analytic_plans/i18n/tr.po
@@ -7,39 +7,39 @@ 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:11+0000\n"
-"Last-Translator: SerdarGULER <guler_serdar@yahoo.com>\n"
+"PO-Revision-Date: 2011-06-09 18:23+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-10 04:36+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
 msgid "Purchase Order Line"
-msgstr ""
+msgstr "Satınalma Sipariş Kalemi"
 
 #. module: purchase_analytic_plans
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Sipariş Referansı eşsiz olmalı !"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr "Analitic Dağılım"
+msgstr "Analitik Dağılım"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order
 msgid "Purchase Order"
-msgstr ""
+msgstr "Satınalma Siparişi"
 
 #. module: purchase_analytic_plans
 #: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
 msgid "Purchase Analytic Distribution Management"
-msgstr "Analitic Dağılım Yönetimini Satın Al"
+msgstr "Satınalma Analitik Dağılımı Yönetimi"
 
 #. module: purchase_analytic_plans
 #: model:ir.module.module,description:purchase_analytic_plans.module_meta_information
@@ -48,6 +48,9 @@ msgid ""
 "    The base module to manage analytic distribution and purchase orders.\n"
 "    "
 msgstr ""
+"\n"
+"    Analitik dağılım ve satınalma siparişlerini yönetmek için temel modül.\n"
+"    "
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/purchase_double_validation/i18n/fi.po b/addons/purchase_double_validation/i18n/fi.po
new file mode 100644
index 00000000000..645ea26abf4
--- /dev/null
+++ b/addons/purchase_double_validation/i18n/fi.po
@@ -0,0 +1,83 @@
+# Finnish 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-06-28 09:16+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-29 04:43+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Purchase Application Configuration"
+msgstr "Hankintaohjelmiston konfiguraatio"
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Konfiguraation eteneminen"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Define minimum amount after which puchase is needed to be validated."
+msgstr "Määrittele minimiarvo jota suuremmat hankinnat pitää tarkistaa"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "title"
+msgstr "otsikko"
+
+#. module: purchase_double_validation
+#: model:ir.module.module,shortdesc:purchase_double_validation.module_meta_information
+msgid "purchase_double_validation"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,config_logo:0
+msgid "Image"
+msgstr "Kuva"
+
+#. 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 ""
+
+#. 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 "Konfiguroi hankintojen rajamäärä"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: purchase_double_validation
+#: help:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum amount after which validation of purchase is required."
+msgstr "Maksimimäärä jota suurempien hankintojen osalta tarkistus vaaditaan."
+
+#. module: purchase_double_validation
+#: model:ir.model,name:purchase_double_validation.model_purchase_double_validation_installer
+msgid "purchase.double.validation.installer"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum Purchase Amount"
+msgstr "Maksimi hankintamäärä"
diff --git a/addons/purchase_double_validation/i18n/tr.po b/addons/purchase_double_validation/i18n/tr.po
new file mode 100644
index 00000000000..7b6e2f860c0
--- /dev/null
+++ b/addons/purchase_double_validation/i18n/tr.po
@@ -0,0 +1,88 @@
+# Turkish 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-06-09 18:32+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"Language-Team: Turkish <tr@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-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Purchase Application Configuration"
+msgstr "Satınalma Uygulaması Yapılandırması"
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Yapılandırma Gelişimi"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Define minimum amount after which puchase is needed to be validated."
+msgstr "Onaylanması gereken en az satınalma miktarını tanımla."
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "title"
+msgstr "unvan"
+
+#. module: purchase_double_validation
+#: model:ir.module.module,shortdesc:purchase_double_validation.module_meta_information
+msgid "purchase_double_validation"
+msgstr "satınalma_çifte_onaylama"
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,config_logo:0
+msgid "Image"
+msgstr "Resim"
+
+#. 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"
+"\t[sekme]Bu modül, yapılandırma sihirbazınca ayarlanan enaz miktarın "
+"aşıldığı satınalmanın onaylanması için satınalma işakışının değiştirilmesini "
+"sağlar\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 "Satınalmalar için Sınır Miktarlarını Yapılandır"
+
+#. 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 "Onaylanan satınalma için gerekli ençok miktar."
+
+#. module: purchase_double_validation
+#: model:ir.model,name:purchase_double_validation.model_purchase_double_validation_installer
+msgid "purchase.double.validation.installer"
+msgstr "satınalma.çifte.onaylama.kurucu"
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum Purchase Amount"
+msgstr "Ençok Satınalma Miktarı"
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index c3369f68554..3ec44c4194b 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -41,10 +41,17 @@
             <field name="target">new</field>
         </record>
 
+        <record id="category_purchase_configuration" model="ir.actions.todo.category">
+            <field name="name">Purchase Management</field>
+            <field name="sequence">5</field>
+        </record>
+        
         <!-- register configuration wizard -->
         <record id="config_wizard_step_purchase_limit_amount" model="ir.actions.todo">
             <field name="action_id" ref="action_config_purchase_limit_amount"/>
-            <field name="restart">onskip</field>
+            <field name="category_id" ref="category_purchase_configuration"/>
+            <field name="type">normal</field>
+            <field name="state">skip</field>
         </record>
         
     </data>
diff --git a/addons/purchase_requisition/i18n/fi.po b/addons/purchase_requisition/i18n/fi.po
new file mode 100644
index 00000000000..c2b9043f1da
--- /dev/null
+++ b/addons/purchase_requisition/i18n/fi.po
@@ -0,0 +1,418 @@
+# Finnish 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-06-20 09:53+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-21 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "In Progress"
+msgstr "Käynnissä"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
+#, python-format
+msgid "No Product in Tender"
+msgstr "Ei tarjottua tuotetta"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm"
+msgstr "Vahvista"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Vastuuhenkilö"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Ryhmittely.."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "State"
+msgstr "Tila"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Draft"
+msgstr "Luonnos"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Supplier"
+msgstr "Toimittaja"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Pyynnön tyyppi"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Tuotteen yksityiskohdat"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Pyynnön päivä"
+
+#. 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 "Ostotilaus pyyntö"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Ostotilauspyynnön rivi"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Tuote"
+
+#. module: purchase_requisition
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "Tilauksen viite tulee olla yksilöllinen!"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Kuvaus"
+
+#. 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 ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Type"
+msgstr "Tyyppi"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Yritys"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Request a Quotation"
+msgstr "Pyydä tarjousta"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Multiple Requisitions"
+msgstr "Useita pyyntöjä"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr "Toimittajan vahvistama"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr "Palauta luonnokseksi"
+
+#. 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 ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_address_id:0
+msgid "Address"
+msgstr "Osoite"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Tilauksen viite"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Alkupäivä"
+
+#. 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 ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Määrä"
+
+#. 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 "Hankintapyynnöt"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Loppupvm"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Pyynnön viite"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Ostettavat tuotteet"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Pyynnön takaraja (päivä)"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Search Purchase Requisition"
+msgstr "Hae ostotilausehdotusta"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Notes"
+msgstr "Huomautukset"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Tilauspäivämäärä"
+
+#. 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 ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel Purchase Order"
+msgstr "Peru ostotilaus"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Ostotilaus"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
+#, python-format
+msgid "Error!"
+msgstr "Virhe!"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product UoM"
+msgstr "Tuotteen mittayksikkö"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Products"
+msgstr "Tuotteet"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Order Date"
+msgstr "Tilauksen päivämäärä"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Peruttu"
+
+#. 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 "Ostotilauspyynnön kumppani"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "]"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Tarjouspyynnön yksityiskohdat"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Osta pyynnöille"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Ostotilaukset"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition,origin:0
+msgid "Origin"
+msgstr "Lähde"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Viite"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Hankinta"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Varasto"
+
+#. module: purchase_requisition
+#: field:procurement.order,requisition_id:0
+msgid "Latest Requisition"
+msgstr "Viimeisin pyyntö"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr "Tarjoukset"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Määrä"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Ostotilauspyyntö (poissulkeva)"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Luo tarjous"
+
+#. module: purchase_requisition
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Virhe: Väärä EAN-koodi"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Done"
+msgstr "Valmis"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Vahvista ostotilaus"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel"
+msgstr "Peruuta"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Partner"
+msgstr "Kumppani"
+
+#. module: purchase_requisition
+#: model:ir.module.module,shortdesc:purchase_requisition.module_meta_information
+msgid "Purchase - Purchase Requisition"
+msgstr "Osto - hankintapyyntö"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned"
+msgstr "Liittämätön"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Pyyntö"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
+msgstr "Ostotilaukset"
+
+#. 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 ""
diff --git a/addons/purchase_requisition/i18n/tr.po b/addons/purchase_requisition/i18n/tr.po
new file mode 100644
index 00000000000..4317b09d26a
--- /dev/null
+++ b/addons/purchase_requisition/i18n/tr.po
@@ -0,0 +1,436 @@
+# Turkish 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-06-09 18:58+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"Language-Team: Turkish <tr@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-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "In Progress"
+msgstr "Sürüyor"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
+#, python-format
+msgid "No Product in Tender"
+msgstr "İhalede Ürün yok"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm"
+msgstr "Onayla"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Sorumlu"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Gruplandır..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "State"
+msgstr "Durum"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Draft"
+msgstr "Taslak"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Supplier"
+msgstr "Tedarikçi"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "İstek Türü"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Ürün Ayrıntısı"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "İstek Tarihi"
+
+#. 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 "Satınalma İsteği"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Satınalma İsteği Kalemi"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Ürün"
+
+#. module: purchase_requisition
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "Sipariş Referansı eşsiz olmalı !"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Açıklama"
+
+#. 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 ""
+"İsteklerin doğrudan istekler ve tekliflerden oluşması yerine isteklerin "
+"satınalma istekleri oluşturması için burayı işaretleyin."
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Type"
+msgstr "Tür"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Request a Quotation"
+msgstr "Teklif İste"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Multiple Requisitions"
+msgstr "Çoklu İstek"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr "Tedarikçi tarafından onaylandı"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr "Taslağa Geri Dönüştür"
+
+#. 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"
+"    Bu modül Satınalma İsteğinizi yönetmenizi sağlar.\n"
+"    Bir satınalma siparişi oluşturulduğunda, ilişkili istekleri saklama "
+"fırsatınız olur.\n"
+"    Bu yeni nesne tüm satınalma siparişlerinizi kolayca izlemenizi ve "
+"sıralandırmanızı sağlar ve yeniden gruplandırır.\n"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_address_id:0
+msgid "Address"
+msgstr "Adres"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Sipariş Referansı"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Başlangıç Tarihi"
+
+#. 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 ""
+"Bir satınalma isteği, teklif isteğinden önce gelen adımdır. Bir satınalma "
+"isteğinde (ya da satınalma ihalesinde), satınalmayı istediğiniz ürünleri "
+"kaydedebilir ve tedarikçilere RfQs (Satınalma İstekleri) oluşturulmasını "
+"tetikleyebilirsiniz."
+
+#. module: purchase_requisition
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Miktar"
+
+#. 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 "Satınalma İstekleri"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Bitiş Tarihi"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "İstek Referansı"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Satınalınacak Ürün"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "İstek Bitiş Tarihi"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Search Purchase Requisition"
+msgstr "Satınalma İsteği Ara"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Notes"
+msgstr "Notlar"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Sipariş edilen Tarih"
+
+#. 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 ""
+"Satınalma İsteği (özel): Bir satınalma siparişin onaylanmasıyla kalan "
+"siparişleri iptal eder.\n"
+"Satınalma İsteği (çoklu): Çoklu satınalma siparişlerine izin verir. Bir "
+"satınalma siparişin onaylanmasıyla kalan siparişleri iptal etmez."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel Purchase Order"
+msgstr "Satınalma Siparişi İptali"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Satınalma Siparişi"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
+#, python-format
+msgid "Error!"
+msgstr "Hata!"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product UoM"
+msgstr "Ürün Ölçü Birimi"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Products"
+msgstr "Ürünler"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Order Date"
+msgstr "Sipariş Tarihi"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Vazgeçildi"
+
+#. 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 "Satınalma İsteği Paydaşı"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "]"
+msgstr "]"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Teklif Ayrıntısı"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Satınalma için İstek"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Satınlma Siparişleri"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition,origin:0
+msgid "Origin"
+msgstr "Köken"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Referans"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Tedarik"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Depo"
+
+#. module: purchase_requisition
+#: field:procurement.order,requisition_id:0
+msgid "Latest Requisition"
+msgstr "Enson İstek"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr "Teklifler"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Mik"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Satınlma İsteği (özel)"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Teklif Oluşturma"
+
+#. module: purchase_requisition
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Hata: Geçersiz ean kodu"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Done"
+msgstr "Bitti"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "_Cancel"
+msgstr "_Vazgeç"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Satınalma Siparişi Onayla"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel"
+msgstr "Vazgeç"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Partner"
+msgstr "Paydaş"
+
+#. module: purchase_requisition
+#: model:ir.module.module,shortdesc:purchase_requisition.module_meta_information
+msgid "Purchase - Purchase Requisition"
+msgstr "Satınalma - Satınalma İsteği"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned"
+msgstr "Atanmamış"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "İstek"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
+msgstr "Satınalma Siparişleri"
+
+#. 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 ""
+"Bu paydaş için zaten bir %s siparişiniz var, yeni bir teklif oluşturmak için "
+"bu siparişi iptal edin."
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index c68c6dbbb89..f9813874c12 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -50,7 +50,7 @@
                                 <field name="product_qty"/>
                                 <field name="product_uom_id"/>
                             </tree>
-                            <form string="Products" editable="bottom">
+                            <form string="Products">
                                 <field name="product_id" />
                                 <field name="product_qty"/>
                                 <field name="product_uom_id" />
diff --git a/addons/report_designer/i18n/fi.po b/addons/report_designer/i18n/fi.po
new file mode 100644
index 00000000000..cdf6c3a0a71
--- /dev/null
+++ b/addons/report_designer/i18n/fi.po
@@ -0,0 +1,100 @@
+# Finnish 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-06-14 09:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-15 04:40+0000\n"
+"X-Generator: Launchpad (build 13168)\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 "Raporttityökalujen konfiguraatio"
+
+#. module: report_designer
+#: field:report_designer.installer,base_report_creator:0
+msgid "Query Builder"
+msgstr "Kyselyn rakentaja"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "Configure"
+msgstr "Konfiguroi"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "title"
+msgstr "otsikko"
+
+#. module: report_designer
+#: model:ir.model,name:report_designer.model_report_designer_installer
+msgid "report_designer.installer"
+msgstr ""
+
+#. module: report_designer
+#: field:report_designer.installer,config_logo:0
+msgid "Image"
+msgstr "Kuva"
+
+#. module: report_designer
+#: field:report_designer.installer,base_report_designer:0
+msgid "OpenOffice Report Designer"
+msgstr "OpenOffice raporttisuunnittelija"
+
+#. module: report_designer
+#: model:ir.module.module,shortdesc:report_designer.module_meta_information
+msgid "Reporting Tools"
+msgstr "Raportointityökalut"
+
+#. 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:in sisäänrakennettuja raportointimahdollisuuksia voidaan edelleen "
+"parantaa käyttämällä seuraavia ohjelmia"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "Configure Reporting Tools"
+msgstr "Konfiguroi raportointyökalut"
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: report_designer
+#: model:ir.module.module,description:report_designer.module_meta_information
+msgid ""
+"Installer for reporting tools selection\n"
+"    "
+msgstr ""
+
+#. module: report_designer
+#: field:report_designer.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Konfiguraation eteneminen"
diff --git a/addons/report_designer/i18n/tr.po b/addons/report_designer/i18n/tr.po
new file mode 100644
index 00000000000..6c9cbdf5925
--- /dev/null
+++ b/addons/report_designer/i18n/tr.po
@@ -0,0 +1,107 @@
+# Turkish 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-06-09 19:02+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"Language-Team: Turkish <tr@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-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\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 "Raporlama Araçları Yapılandırması"
+
+#. module: report_designer
+#: field:report_designer.installer,base_report_creator:0
+msgid "Query Builder"
+msgstr "Sorgu Oluşturucu"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "Configure"
+msgstr "Yapılandır"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "title"
+msgstr "unvan"
+
+#. module: report_designer
+#: model:ir.model,name:report_designer.model_report_designer_installer
+msgid "report_designer.installer"
+msgstr "rapor_tasarımcı.kurulum"
+
+#. module: report_designer
+#: field:report_designer.installer,config_logo:0
+msgid "Image"
+msgstr "Resim"
+
+#. module: report_designer
+#: field:report_designer.installer,base_report_designer:0
+msgid "OpenOffice Report Designer"
+msgstr "OpenOffice Rapor Tasarımcısı"
+
+#. module: report_designer
+#: model:ir.module.module,shortdesc:report_designer.module_meta_information
+msgid "Reporting Tools"
+msgstr "Rapormala Araçları"
+
+#. 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'nin içindeki raporlama becerileri aşağıdaki uygulamalarla "
+"geliştirilebilir"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "Configure Reporting Tools"
+msgstr "Raporlama Araçlarını Yapılandır"
+
+#. 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 ""
+"Birçok nesne üstünde istatistiksel raporlar oluşturmanıza olanak sağlar. Son "
+"kullanıcı için yapılmış bir SQL sorgu üretici ve tarayıcısıdır."
+
+#. 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 ""
+"OpenOffice ile düzenleyebileceğiniz .SXW raporlarını sisteme yüklemek için "
+"bir sihirbaz ekler. OpenOffice içinden şablonları indirip düzenleyip tekrar "
+"sisteme yükleyebilirsiniz."
+
+#. module: report_designer
+#: model:ir.module.module,description:report_designer.module_meta_information
+msgid ""
+"Installer for reporting tools selection\n"
+"    "
+msgstr ""
+"Raporlama araçları seçimi için yükleyici\n"
+"    "
+
+#. module: report_designer
+#: field:report_designer.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Yapılandırma Gelişimi"
diff --git a/addons/report_designer/installer.py b/addons/report_designer/installer.py
index f849392d328..e4bbc4ffa93 100644
--- a/addons/report_designer/installer.py
+++ b/addons/report_designer/installer.py
@@ -21,8 +21,7 @@
 from osv import fields, osv
 
 class report_designer_installer(osv.osv_memory):
-    _name = 'report_designer.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         # Reporting
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index 2f838c0b74c..d8d1798578e 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -2,51 +2,19 @@
   <data>
     <record id="view_report_designer_installer" model="ir.ui.view">
       <field name="name">report_designer.installer.view</field>
-      <field name="model">report_designer.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes">
-            <attribute name="string">Reporting Tools Configuration</attribute>
-          </form>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                  <attribute name='string'></attribute>
+          <xpath expr="//group[@name='report_designer']" position="replace">
+            <newline/>
+            <separator  string="Advanced Reporting Features" colspan="4" />
+            <field name="base_report_designer" />
+            <field name="base_report_creator" />
           </xpath>
-          <separator string="title" position="attributes">
-            <attribute name="string"
-                       >Configure Reporting Tools</attribute>
-          </separator>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string"
-                       >OpenERP's built-in reporting abilities can be improved even further with some of the following applications</attribute>
-          </xpath>
-          <xpath expr="//button[@string='Install Modules']" position="attributes">
-                   <attribute name="string">Configure</attribute>
-          </xpath>
-          <group colspan="8">
-            <field name="base_report_designer"/>
-            <field name="base_report_creator"/>
-          </group>
         </data>
       </field>
     </record>
-
-    <record id="action_report_designer_installer" model="ir.actions.act_window">
-      <field name="name">Reporting Tools Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">report_designer.installer</field>
-      <field name="view_id" ref="view_report_designer_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="report_designer_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_report_designer_installer"/>
-      <field name="restart">always</field>
-      <field name="sequence">3</field>
-    </record>
   </data>
 </openerp>
diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/ir_report.py
index 8f89fb51698..e6f4a81f9e7 100644
--- a/addons/report_webkit/ir_report.py
+++ b/addons/report_webkit/ir_report.py
@@ -125,7 +125,6 @@ class ReportXML(osv.osv):
                                             relation='ir.header_webkit',
                                             string='WebKit Header',
                                             help="The header linked to the report",
-                                            method=True,
                                             view_load=True,
                                             required=True
                                         ),
diff --git a/addons/report_webkit_sample/i18n/de.po b/addons/report_webkit_sample/i18n/de.po
index f89a9216dc4..14b87dbdadb 100644
--- a/addons/report_webkit_sample/i18n/de.po
+++ b/addons/report_webkit_sample/i18n/de.po
@@ -8,15 +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-31 10:19+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2011-07-02 13:05+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-03 04:47+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: report_webkit_sample
 #: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
@@ -24,12 +23,12 @@ msgid "WebKit invoice"
 msgstr "Webkit Rechnung"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
+#: report:report.webkitaccount.invoice:35
 msgid "Supplier Invoice"
 msgstr "Lieferanten Rechnung"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Unit Price"
 msgstr "Preis/ME"
 
@@ -65,92 +64,92 @@ msgid "Webkit Report Samples"
 msgstr "Beispiele Webkit Reports"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Disc.(%)"
 msgstr "Rabatt (%)"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
+#: report:report.webkitaccount.invoice:22
 msgid "Fax"
 msgstr "Fax"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Document"
 msgstr "Dokument"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Description"
 msgstr "Beschreibung"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Price"
 msgstr "Preis"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Invoice Date"
 msgstr "Datum Rechnung"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "QTY"
 msgstr "Anz."
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Base"
 msgstr "Steuergrundbetrag"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Partner Ref."
 msgstr "Partner Ref."
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Taxes"
 msgstr "Steuern"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Amount"
 msgstr "Betrag"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
+#: report:report.webkitaccount.invoice:28
 msgid "VAT"
-msgstr "USt."
+msgstr "UID"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
+#: report:report.webkitaccount.invoice:37
 msgid "Refund"
 msgstr "Gutschrift"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
+#: report:report.webkitaccount.invoice:19
 msgid "Tel"
 msgstr "Tel."
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
+#: report:report.webkitaccount.invoice:25
 msgid "E-mail"
 msgstr "E-Mail"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
+#: report:report.webkitaccount.invoice:33
 msgid "Invoice"
 msgstr "Rechnung"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
+#: report:report.webkitaccount.invoice:39
 msgid "Supplier Refund"
 msgstr "Lieferanten Gutschrift"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
+#: report:report.webkitaccount.invoice:76
 msgid "Total"
 msgstr "Summe"
 
diff --git a/addons/resource/i18n/fi.po b/addons/resource/i18n/fi.po
new file mode 100644
index 00000000000..6703e5ead1f
--- /dev/null
+++ b/addons/resource/i18n/fi.po
@@ -0,0 +1,348 @@
+# Finnish 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-06-20 09:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-21 04:36+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: resource
+#: help:resource.calendar.leaves,resource_id:0
+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 ""
+"Jos tyhjä, tämä on yrityksen yleinen loma-aika. Jos resurssi asetetaan, loma "
+"koskee vain sitä resurssia."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr "Perjantai"
+
+#. module: resource
+#: field:resource.resource,resource_type:0
+msgid "Resource Type"
+msgstr "Resurssin tyyppi"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_leaves
+#: view:resource.calendar.leaves:0
+msgid "Leave Detail"
+msgstr "Jätä yksityiskohdat"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
+msgid "Resources Leaves"
+msgstr "Resurssin vapaat"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: view:resource.calendar:0
+#: field:resource.calendar,attendance_ids:0
+#: view:resource.calendar.attendance:0
+msgid "Working Time"
+msgstr "Työaika"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Thursday"
+msgstr "Torstai"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Group By..."
+msgstr "Ryhmittely.."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Sunday"
+msgstr "Sunnuntai"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Search Resource"
+msgstr "Hae resurssia"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Type"
+msgstr "Tyyppi"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
+#: view:resource.resource:0
+msgid "Resources"
+msgstr "Resurssit"
+
+#. module: resource
+#: field:resource.calendar,manager:0
+msgid "Workgroup manager"
+msgstr "Työryhmän johtaja"
+
+#. module: resource
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
+msgstr "Työaika alkaa"
+
+#. module: resource
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr "Virhe! loman alkupäivän tulee olla aikaisempi kuin loman loppupäivä"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar
+msgid "Resource Calendar"
+msgstr "Resurssikalenteri"
+
+#. module: resource
+#: field:resource.calendar,company_id:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,company_id:0
+#: view:resource.resource:0
+#: field:resource.resource,company_id:0
+msgid "Company"
+msgstr "Yritys"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr "Materiaali"
+
+#. module: resource
+#: field:resource.calendar.attendance,dayofweek:0
+msgid "Day of week"
+msgstr "Viikonpäivä"
+
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr "Työaika loppuu"
+
+#. module: resource
+#: field:resource.calendar.attendance,date_from:0
+msgid "Starting date"
+msgstr "Aloituspäivämäärä"
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr "Hae työaikaa"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Reason"
+msgstr "Syy"
+
+#. module: resource
+#: view:resource.resource:0
+#: field:resource.resource,user_id:0
+msgid "User"
+msgstr "Käyttäjä"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Date"
+msgstr "Päiväys"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Search Working Period Leaves"
+msgstr "Hae työjakson lomia"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_to:0
+msgid "End Date"
+msgstr "Loppupvm"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
+msgid "Closing Days"
+msgstr "Sulkupäivät"
+
+#. module: resource
+#: model:ir.module.module,shortdesc:resource.module_meta_information
+#: model:ir.ui.menu,name:resource.menu_resource_config
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,resource_id:0
+#: view:resource.resource:0
+msgid "Resource"
+msgstr "Resurssi"
+
+#. module: resource
+#: view:resource.calendar:0
+#: field:resource.calendar,name:0
+#: field:resource.calendar.attendance,name:0
+#: field:resource.calendar.leaves,name:0
+#: field:resource.resource,name:0
+msgid "Name"
+msgstr "Nimi"
+
+#. module: resource
+#: model:ir.module.module,description:resource.module_meta_information
+msgid ""
+"\n"
+"    Module for resource management\n"
+"     A resource represent something that can be scheduled\n"
+"     (a developer on a task or a workcenter on manufacturing orders).\n"
+"     This module manages a resource calendar associated to every resource.\n"
+"     It also manages the leaves of every resource.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Wednesday"
+msgstr "Keskiviikko"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+#: field:resource.resource,calendar_id:0
+msgid "Working Period"
+msgstr "Työjakso"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_resource
+msgid "Resource Detail"
+msgstr "Resurssin yksityiskohdat"
+
+#. module: resource
+#: field:resource.resource,active:0
+msgid "Active"
+msgstr "Aktiivinen"
+
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,calendar_id:0
+msgid "Resource's Calendar"
+msgstr "Resurssin kalenteri"
+
+#. module: resource
+#: help:resource.resource,user_id:0
+msgid "Related user name for the resource to manage its access."
+msgstr "Liittyvä käyttäjätunnus resurssille sen oikeuksien määrittämiseksi"
+
+#. module: resource
+#: help:resource.resource,calendar_id:0
+msgid "Define the schedule of resource"
+msgstr "Määrittele resurssin aikataulutus"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_from:0
+msgid "Work from"
+msgstr "Työaika alkaen"
+
+#. module: resource
+#: field:resource.resource,code:0
+msgid "Code"
+msgstr "Koodi"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "Maanantai"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
+msgstr "Työaika päättyy"
+
+#. module: resource
+#: help:resource.resource,time_efficiency:0
+msgid ""
+"This field depict the efficiency of the resource to complete tasks. e.g  "
+"resource put alone on a phase of 5 days with 5 tasks assigned to him, will "
+"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 ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Tuesday"
+msgstr "Tiistai"
+
+#. module: resource
+#: field:resource.calendar.leaves,calendar_id:0
+msgid "Working time"
+msgstr "Työaika"
+
+#. 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 "Resurssin lomat"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "General Information"
+msgstr "Yleiset tiedot"
+
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
+msgid ""
+"Resources allow you to create and manage resources that should be involved "
+"in a specific project phase. You can also set their efficiency level and "
+"workload based on their weekly working hours."
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Inactive"
+msgstr "Passiivinen"
+
+#. module: resource
+#: code:addons/resource/faces/resource.py:340
+#, python-format
+msgid "(vacation)"
+msgstr "(loma)"
+
+#. module: resource
+#: field:resource.resource,time_efficiency:0
+msgid "Efficiency factor"
+msgstr "Tehokkuuskerroin"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Human"
+msgstr "Ihminen"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_attendance
+msgid "Work Detail"
+msgstr "Työn yksityiskohdat"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_from:0
+msgid "Start Date"
+msgstr "Alkupäivä"
+
+#. module: resource
+#: code:addons/resource/resource.py:246
+#, python-format
+msgid " (copy)"
+msgstr " (kopio)"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Saturday"
+msgstr "Lauantai"
diff --git a/addons/sale/company.py b/addons/sale/company.py
index 2b310925107..b316269ac9a 100644
--- a/addons/sale/company.py
+++ b/addons/sale/company.py
@@ -29,9 +29,8 @@ class company(osv.osv):
             "for security purpose"),
     }
     _defaults = {
-        'security_lead': 5.0,
+        'security_lead': 0.0,
     }
-    
 company()
 
-# 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/sale/i18n/it.po b/addons/sale/i18n/it.po
index 901fb7088dc..a691ad6acc9 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/i18n/it.po
@@ -7,14 +7,14 @@ 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-01-22 10:22+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-05-25 16:17+0000\n"
+"Last-Translator: simone.sandri <lexluxsox@hotmail.it>\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-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-26 04:36+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -144,6 +144,14 @@ msgid ""
 "configuration of the sales order, a draft invoice will be generated so that "
 "you just have to confirm it when you want to bill your customer."
 msgstr ""
+"Gli ordini di vendita consentono di gestire preventivi e ordini dai vostri "
+"clienti. OpenERP ti suggerisce di iniziare con la creazione di un "
+"preventivo. Una volta confermato, il preventivo sarà convertito in un ordine "
+"di vendita. OpenERP è in grado di gestire diversi tipi di prodotti, in modo "
+"che un ordine di vendita può trasformarsi in ordini di consegna, ordini di "
+"fabbricazione, acquisti e così via. In base alla configurazione dell 'ordine "
+"di vendita, verrà generata un fattura tipo, in modo che devi solo confermare "
+"quando la si desidera inviare al cliente."
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -2131,7 +2139,7 @@ msgstr "Cliente"
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
 msgid "Advance"
-msgstr ""
+msgstr "Avanzamento"
 
 #. module: sale
 #: selection:sale.report,month:0
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 03c3b458489..4bf5a6d0ea5 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -7,14 +7,14 @@ 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-01-14 23:11+0000\n"
-"Last-Translator: Oktay Altunergil <Unknown>\n"
+"PO-Revision-Date: 2011-06-10 19:46+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-11 04:56+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -25,7 +25,7 @@ msgstr "Satış elemanına göre son 90 gündeki satışlar"
 #. module: sale
 #: help:sale.installer,delivery:0
 msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Teklifinizdeki teslimat maliyetini hesaplamanızı sağlar."
+msgstr "Teklifinizdeki teslimat maliyetlerini hesaplamanızı sağlar."
 
 #. module: sale
 #: help:sale.order,picking_policy:0
@@ -33,7 +33,7 @@ msgid ""
 "If you don't have enough stock available to deliver all at once, do you "
 "accept partial shipments or not?"
 msgstr ""
-"Tek seferde teslimat için yeterli stok yoksa parçalı gönderim yapılmasını "
+"Tek seferde teslimat için yeterli stok yoksa parçalı teslimat yapılmasını "
 "kabul eder misiniz ?"
 
 #. module: sale
@@ -62,13 +62,13 @@ msgstr "Siparişi İptal Et"
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Configure Sales Order Logistics"
-msgstr "Satış siparişi lojistiğini yapılandır"
+msgstr "Satış Siparişi Lojistiğini Yapılandır"
 
 #. module: sale
 #: code:addons/sale/sale.py:603
 #, python-format
 msgid "The quotation '%s' has been converted to a sales order."
-msgstr "'%s' teklifi satış siparişine çevrildi."
+msgstr "'%s' Teklifi satış siparişine çevrildi."
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -347,7 +347,7 @@ msgstr "Yapılandır"
 #. module: sale
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Aynı üründen olmayan bir parti atamaya çalışıyorsunuz"
 
 #. module: sale
 #: code:addons/sale/sale.py:620
@@ -469,6 +469,8 @@ msgid ""
 "Select a product of type service which is called 'Advance Product'. You may "
 "have to create it and set it as a default value on this field."
 msgstr ""
+"'Ön Ürün' olarak adlandırılmış servis türüne bir ürün seçin. Bir tane "
+"oluştun ve bu alan için varsayılan olarak ayarlayın."
 
 #. module: sale
 #: report:sale.order:0
@@ -522,7 +524,7 @@ msgstr "Onaylanma Tarihi"
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
-msgstr ""
+msgstr "Tahsisli Paydaş"
 
 #. module: sale
 #: sql_constraint:sale.order:0
@@ -1097,7 +1099,7 @@ msgstr "Sipariş Tarihi"
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Document of the move to the output or to the customer."
-msgstr ""
+msgstr "Çıkışa ya da müşteriyeyapılan hareket belgesi."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
@@ -1248,7 +1250,7 @@ msgstr "Kullanılan ölçü birimi"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
 msgid "Sale OrderLine Make_invoice"
-msgstr ""
+msgstr "Satış SiparişSatırı Fatura_Kes"
 
 #. module: sale
 #: help:sale.config.picking_policy,step:0
@@ -1336,7 +1338,7 @@ msgstr "Bitti"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_installer
 msgid "sale.installer"
-msgstr ""
+msgstr "satış.kurucu"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_invoice0
@@ -1377,7 +1379,7 @@ msgstr "Paketleme Kuralı"
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
 msgid "Document of the move to the customer."
-msgstr ""
+msgstr "Müşteriye işlenen hareket belgesi"
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
@@ -1706,7 +1708,7 @@ msgstr "Onayla"
 #. module: sale
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Hata! Yinelemeli şirketler oluşturamazsınız."
 
 #. module: sale
 #: view:board.board:0
@@ -1923,12 +1925,12 @@ msgstr "Direk Teslimat"
 #. module: sale
 #: field:sale.installer,sale_journal:0
 msgid "Invoicing journals"
-msgstr ""
+msgstr "Faturalama Yevmiyeleri"
 
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
-msgstr ""
+msgstr "Gelişmiş Ürün"
 
 #. module: sale
 #: view:sale.report:0
@@ -1995,7 +1997,7 @@ msgstr "Ata"
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Sipariş Tarihi"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
@@ -2048,7 +2050,7 @@ msgstr "Bu ürün için üretim planı yapmalısınız"
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Layout Sequence"
-msgstr ""
+msgstr "Yerleşim Sırası"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_shop_form
@@ -2081,7 +2083,7 @@ msgstr "Mayıs"
 #. module: sale
 #: help:sale.installer,sale_order_dates:0
 msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
+msgstr "Satış Siparişlerine taahhüt, istenen ve yürürlük tarihlerini ekler."
 
 #. module: sale
 #: view:sale.order:0
@@ -2093,7 +2095,7 @@ msgstr "Müşteri"
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
 msgid "Advance"
-msgstr ""
+msgstr "Gelişmiş"
 
 #. module: sale
 #: selection:sale.report,month:0
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index aaaec228d7b..e4f917ba063 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -31,7 +31,7 @@ class sale_report(osv.osv):
         'date': fields.date('Date Order', readonly=True),
         'date_confirm': fields.date('Date Confirm', readonly=True),
         'shipped': fields.boolean('Shipped', readonly=True),
-        'shipped_qty_1': fields.integer('Shipped Qty', readonly=True),
+        'shipped_qty_1': fields.integer('Shipped', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'month': fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'),
             ('05', 'May'), ('06', 'June'), ('07', 'July'), ('08', 'August'), ('09', 'September'),
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 41cdecee0ea..c62510e9ab6 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -21,7 +21,7 @@
                 <field name="categ_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_uom_qty" sum="# of Qty"/>
-                <field name="shipped_qty_1" sum="Shipped Qty"/>
+                <field name="shipped_qty_1" sum="Shipped"/>
                 <field name="uom_name" invisible="not context.get('set_visible',False)"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay" sum="Commitment Delay"/>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 0b436f0dc91..7d7978bbcf8 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -25,6 +25,7 @@ import time
 
 from osv import fields, osv
 from tools.translate import _
+import tools
 import decimal_precision as dp
 import netsvc
 
@@ -236,25 +237,25 @@ class sale_order(osv.osv):
         'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', readonly=True, help="This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."),
         'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Related Picking', readonly=True, help="This is a list of picking that has been generated for this sales order."),
         'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sales order has been delivered. This field is updated only after the scheduler(s) have been launched."),
-        'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'),
-        'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
-        'invoiced': fields.function(_invoiced, method=True, string='Paid',
+        'picked_rate': fields.function(_picked_rate, string='Picked', type='float'),
+        'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
+        'invoiced': fields.function(_invoiced, string='Paid',
             fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid."),
         'note': fields.text('Notes'),
 
-        'amount_untaxed': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Untaxed Amount',
+        'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Sale Price'), string='Untaxed Amount',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
             },
             multi='sums', help="The amount without tax."),
-        'amount_tax': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Taxes',
+        'amount_tax': fields.function(_amount_all, digits_compute= dp.get_precision('Sale Price'), string='Taxes',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
             },
             multi='sums', help="The tax amount."),
-        'amount_total': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Total',
+        'amount_total': fields.function(_amount_all, digits_compute= dp.get_precision('Sale Price'), string='Total',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
@@ -474,16 +475,21 @@ class sale_order(osv.osv):
         # last day of the last month as invoice date
         if date_inv:
             context['date_inv'] = date_inv
-        for o in self.browse(cr, uid, ids, context=context):
-            lines = []
-            for line in o.order_line:
-                if line.invoiced:
-                    continue
-                elif (line.state in states):
-                    lines.append(line.id)
-            created_lines = obj_sale_order_line.invoice_line_create(cr, uid, lines)
-            if created_lines:
-                invoices.setdefault(o.partner_id.id, []).append((o, created_lines))
+        set_company = tools.get_and_sort_by_field(cr, uid, obj=self, ids=ids, field='company_id', context=context)
+        for company_id, so_ids in set_company.items():
+            ctx = context.copy()
+            ctx.update({'force_company': company_id})
+            print "Boom invoice", company_id, so_ids
+            for o in self.browse(cr, uid, ids, context=ctx):
+                lines = []
+                for line in o.order_line:
+                    if line.invoiced:
+                        continue
+                    elif (line.state in states):
+                        lines.append(line.id)
+                created_lines = obj_sale_order_line.invoice_line_create(cr, uid, lines, context=context)
+                if created_lines:
+                    invoices.setdefault(o.partner_id.id, []).append((o, created_lines))
         if not invoices:
             for o in self.browse(cr, uid, ids, context=context):
                 for i in o.invoice_ids:
@@ -851,7 +857,7 @@ class sale_order_line(osv.osv):
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'procurement_id': fields.many2one('procurement.order', 'Procurement'),
         'price_unit': 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, method=True, string='Subtotal', digits_compute= dp.get_precision('Sale Price')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Sale Price')),
         'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}),
         'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}),
@@ -863,7 +869,7 @@ class sale_order_line(osv.osv):
         'product_packaging': fields.many2one('product.packaging', 'Packaging'),
         'move_ids': fields.one2many('stock.move', 'sale_line_id', 'Inventory Moves', readonly=True),
         'discount': fields.float('Discount (%)', digits=(16, 2), readonly=True, states={'draft': [('readonly', False)]}),
-        'number_packages': fields.function(_number_packages, method=True, type='integer', string='Number Packages'),
+        'number_packages': fields.function(_number_packages, type='integer', string='Number Packages'),
         'notes': fields.text('Notes'),
         'th_weight': fields.float('Weight', readonly=True, states={'draft': [('readonly', False)]}),
         'state': fields.selection([('draft', 'Draft'),('confirmed', 'Confirmed'),('done', 'Done'),('cancel', 'Cancelled'),('exception', 'Exception')], 'State', required=True, readonly=True,
@@ -914,50 +920,55 @@ class sale_order_line(osv.osv):
 
         create_ids = []
         sales = {}
-        for line in self.browse(cr, uid, ids, context=context):
-            if not line.invoiced:
-                if line.product_id:
-                    a = line.product_id.product_tmpl_id.property_account_income.id
-                    if not a:
-                        a = line.product_id.categ_id.property_account_income_categ.id
+        set_company = tools.get_and_sort_by_field(cr, uid, obj=self, ids=ids, field='company_id', context=context)
+        for company_id, sol_ids in set_company.items():
+            ctx = context.copy()
+            ctx.update({'force_company': company_id})
+            print "Boom line", company_id, sol_ids
+            for line in self.browse(cr, uid, sol_ids, context=ctx):
+                if not line.invoiced:
+                    if line.product_id:
+                        a = line.product_id.product_tmpl_id.property_account_income.id
+                        if not a:
+                            a = line.product_id.categ_id.property_account_income_categ.id
+                        if not a:
+                            raise osv.except_osv(_('Error !'),
+                                    _('There is no income account defined ' \
+                                            'for this product: "%s" (id:%d)') % \
+                                            (line.product_id.name, line.product_id.id,))
+                    else:
+                        prop = self.pool.get('ir.property').get(cr, uid,
+                                'property_account_income_categ', 'product.category',
+                                context=context)
+                        a = prop and prop.id or False
+                    uosqty = _get_line_qty(line)
+                    uos_id = _get_line_uom(line)
+                    pu = 0.0
+                    if uosqty:
+                        pu = round(line.price_unit * line.product_uom_qty / uosqty,
+                                self.pool.get('decimal.precision').precision_get(cr, uid, 'Sale Price'))
+                    fpos = line.order_id.fiscal_position or False
+                    a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, a)
                     if not a:
                         raise osv.except_osv(_('Error !'),
-                                _('There is no income account defined ' \
-                                        'for this product: "%s" (id:%d)') % \
-                                        (line.product_id.name, line.product_id.id,))
-                else:
-                    prop = self.pool.get('ir.property').get(cr, uid,
-                            'property_account_income_categ', 'product.category',
-                            context=context)
-                    a = prop and prop.id or False
-                uosqty = _get_line_qty(line)
-                uos_id = _get_line_uom(line)
-                pu = 0.0
-                if uosqty:
-                    pu = round(line.price_unit * line.product_uom_qty / uosqty,
-                            self.pool.get('decimal.precision').precision_get(cr, uid, 'Sale Price'))
-                fpos = line.order_id.fiscal_position or False
-                a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, a)
-                if not a:
-                    raise osv.except_osv(_('Error !'),
-                                _('There is no income category account defined in default Properties for Product Category or Fiscal Position is not defined !'))
-                inv_id = self.pool.get('account.invoice.line').create(cr, uid, {
-                    'name': line.name,
-                    'origin': line.order_id.name,
-                    'account_id': a,
-                    'price_unit': pu,
-                    'quantity': uosqty,
-                    'discount': line.discount,
-                    'uos_id': uos_id,
-                    'product_id': line.product_id.id or False,
-                    'invoice_line_tax_id': [(6, 0, [x.id for x in line.tax_id])],
-                    'note': line.notes,
-                    'account_analytic_id': line.order_id.project_id and line.order_id.project_id.id or False,
-                })
-                cr.execute('insert into sale_order_line_invoice_rel (order_line_id,invoice_id) values (%s,%s)', (line.id, inv_id))
-                self.write(cr, uid, [line.id], {'invoiced': True})
-                sales[line.order_id.id] = True
-                create_ids.append(inv_id)
+                                    _('There is no income category account defined in default Properties for Product Category or Fiscal Position is not defined !'))
+                    inv_id = self.pool.get('account.invoice.line').create(cr, uid, {
+                        'name': line.name,
+                        'origin': line.order_id.name,
+                        'account_id': a,
+                        'price_unit': pu,
+                        'quantity': uosqty,
+                        'discount': line.discount,
+                        'uos_id': uos_id,
+                        'product_id': line.product_id.id or False,
+                        'invoice_line_tax_id': [(6, 0, [x.id for x in line.tax_id])],
+                        'note': line.notes,
+                        'account_analytic_id': line.order_id.project_id and line.order_id.project_id.id or False,
+                    })
+                    cr.execute('insert into sale_order_line_invoice_rel (order_line_id,invoice_id) values (%s,%s)', (line.id, inv_id))
+                    self.write(cr, uid, [line.id], {'invoiced': True})
+                    sales[line.order_id.id] = True
+                    create_ids.append(inv_id)
         # Trigger workflow events
         wf_service = netsvc.LocalService("workflow")
         for sid in sales.keys():
@@ -1174,17 +1185,11 @@ class sale_config_picking_policy(osv.osv_memory):
 
     _columns = {
         'name': fields.char('Name', size=64),
-        'picking_policy': fields.selection([
-            ('direct', 'Direct Delivery'),
-            ('one', 'All at Once')
-        ], 'Picking Default Policy', required=True, help="If you are sure that you have enough stock to send complete order at once please select 'All at Once'. If you want to send the order in the partial shipments please select 'Direct Delivery'..."),
         'order_policy': fields.selection([
             ('manual', 'Invoice Based on Sales Orders'),
             ('picking', 'Invoice Based on Deliveries'),
-        ], 'Shipping Default Policy', required=True,
-           help="""The Shipping Policy is used to synchronise invoice and delivery operations.
-        - The "Invoice Based on Sales Orders" option will create the picking order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.  
-        - The "Invoice Based on Deliveries" option is used to create an invoice during the picking process."""),
+        ], 'Invoicing Method', required=True,
+           help="You can generate invoices based on sales orders or based on shippings."),
         'step': fields.selection([
             ('one', 'Delivery Order Only'),
             ('two', 'Picking List & Delivery Order')
@@ -1195,7 +1200,6 @@ class sale_config_picking_policy(osv.osv_memory):
            "in one or two operations by the worker.")
     }
     _defaults = {
-        'picking_policy': 'direct',
         'order_policy': 'manual',
         'step': 'one'
     }
@@ -1208,7 +1212,6 @@ class sale_config_picking_policy(osv.osv_memory):
         location_id = location_id and location_id[1] or False
         chaining_type = False
         for o in self.browse(cr, uid, ids, context=context):
-            ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], o.picking_policy)
             ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], o.order_policy)
             if o.step == 'one':
                 chaining_type = 'transparent'
diff --git a/addons/sale/sale_installer.py b/addons/sale/sale_installer.py
index a8cc5432020..fa7dffc9d6d 100644
--- a/addons/sale/sale_installer.py
+++ b/addons/sale/sale_installer.py
@@ -22,8 +22,7 @@
 from osv import fields, osv
 
 class sale_installer(osv.osv_memory):
-    _name = 'sale.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         'delivery': fields.boolean('Delivery Costs', 
diff --git a/addons/sale/sale_installer.xml b/addons/sale/sale_installer.xml
index 4149871ad36..38b1de7d2b8 100644
--- a/addons/sale/sale_installer.xml
+++ b/addons/sale/sale_installer.xml
@@ -2,55 +2,22 @@
   <data>
     <record id="view_sale_installer" model="ir.ui.view">
       <field name="name">sale.installer.view</field>
-      <field name="model">sale.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes">
-            <attribute name="string">Sales Application Configuration</attribute>
-          </form>
-
-          <separator string="title" position="attributes">
-            <attribute name="string">Configure Your Sales Management Application</attribute>
-          </separator>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">Enhance your core Sales Application with additional functionalities.</attribute>
-          </xpath>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                <attribute name='string'></attribute>
-          </xpath>
-          <xpath expr="//button[@string='Install Modules']" position="attributes">
-                   <attribute name="string">Configure</attribute>
-          </xpath>
-          <group colspan="8">
-            <field name="delivery"/>
-            <field name="sale_journal"/>
-            <field name="sale_layout"/>
-            <field name="sale_margin"/>
-            <field name="sale_order_dates"/>
-          </group>
+          <xpath expr="//group[@name='sale']" position="replace">
+            <newline/>
+            <separator  string="Sales Management Features" colspan="4" />
+            <field name="delivery" />
+            <field name="sale_journal" />
+            <field name="sale_layout" />
+            <field name="sale_margin" />
+            <field name="sale_order_dates" />               
+          </xpath>           
         </data>
       </field>
     </record>
-
-    <record id="action_sale_installer" model="ir.actions.act_window">
-      <field name="name">Sales Application Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">sale.installer</field>
-      <field name="view_id" ref="view_sale_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="sale_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_sale_installer"/>
-      <field name="restart">always</field>
-      <field name="sequence">3</field>
-      <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
-    </record>
-
   </data>
 </openerp>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 85206cdf6b0..ccab928cc67 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -125,12 +125,12 @@
                                     <notebook>
                                         <page string="Order Line">
                                             <field colspan="4"
-                                                context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
+                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
                                                 name="product_id"
                                                 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging, parent.fiscal_position, False)"
                                                 />
                                             <field
-                                                context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
+                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
                                                 name="product_uom_qty"
                                                 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, True)"
                                                 />
@@ -140,7 +140,7 @@
                                             <field groups="product.group_uos" name="product_uos"/>
                                             <field
                                                 name="product_packaging"
-                                                context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
+                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
                                                 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, False)"
                                                 domain="[('product_id','=',product_id)]"
                                                 groups="base.group_extended"/>
@@ -531,7 +531,7 @@
         <!-- configartion view -->
 
         <record id="view_config_picking_policy" model="ir.ui.view">
-            <field name="name">Configure Picking Policy for Sales Order </field>
+            <field name="name">Set Up Your Invoicing Method</field>
             <field name="model">sale.config.picking_policy</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.res_config_view_base"/>
@@ -544,18 +544,16 @@
                 <attribute name="string">Configure Sales Order Logistics</attribute>
                   </separator>
                   <xpath expr="//label[@string='description']" position="attributes">
-                    <attribute name="string">Setup your sales workflow and default values.</attribute>
+                    <attribute name="string">Define your invoice method. A services company usually invoices based on sale orders while a retailer usually invoices based on deliveries.</attribute>
                   </xpath>
                 <xpath expr='//separator[@string="vsep"]' position='attributes'>
                       <attribute name='rowspan'>15</attribute>
                       <attribute name='string'></attribute>
                   </xpath>
                 <group string="res_config_contents" position="replace">
-                  <field name="picking_policy" groups="base.group_extended"/>
-                  <newline/>
                   <field name="order_policy"/>
                   <newline/>
-                  <field name="step"/>
+                  <field name="step" groups="base.group_extended"/>
                 </group>
                 <xpath expr='//button[@name="action_skip"]' position='replace'/>
               </data>
@@ -563,7 +561,7 @@
         </record>
 
         <record id="action_config_picking_policy" model="ir.actions.act_window">
-            <field name="name">Configure Picking Policy for Sales Order</field>
+            <field name="name">Set up your Invoicing Method</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.config.picking_policy</field>
             <field name="view_id" ref="view_config_picking_policy"/>
@@ -575,7 +573,9 @@
         <!-- register configuration wizard -->
         <record id="config_wizard_step_sale_picking_policy" model="ir.actions.todo">
             <field name="action_id" ref="action_config_picking_policy"/>
-            <field name="restart">always</field>
+            <field name="category_id" ref="base.category_sales_management_config"/>
+            <field name="type">normal</field>
+            <field name="state">skip</field>
             <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
         </record>
 
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index b04a6570209..6bbb2b296a8 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -7,7 +7,9 @@
     </record>
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
+
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
         <field name="name">Sales / User - See All Leads</field>
     </record>
@@ -42,7 +44,7 @@
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
- 
+
     <!-- Multi - Salesmen sales order assignation rules -->
 
     <record id="sale_order_personal_rule" model="ir.rule">
diff --git a/addons/sale_analytic_plans/i18n/fi.po b/addons/sale_analytic_plans/i18n/fi.po
new file mode 100644
index 00000000000..7780b9fd7f4
--- /dev/null
+++ b/addons/sale_analytic_plans/i18n/fi.po
@@ -0,0 +1,44 @@
+# Finnish 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:58+0000\n"
+"PO-Revision-Date: 2011-06-09 05:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: sale_analytic_plans
+#: field:sale.order.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr "Analyyttinen jakelu"
+
+#. module: sale_analytic_plans
+#: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
+msgid "Sales Analytic Distribution Management"
+msgstr "Myynnin analyyttisen jakelun hallinta"
+
+#. module: sale_analytic_plans
+#: model:ir.module.module,description:sale_analytic_plans.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage analytic distribution and sales orders.\n"
+"    "
+msgstr ""
+"\n"
+"    Perusmoduuli jolla hallitaan analyyttistä jakelua ja myyntitilauksia\n"
+"    "
+
+#. module: sale_analytic_plans
+#: model:ir.model,name:sale_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Myyntitilausrivi"
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index 9570fe0c6fa..0072730ab4d 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -26,6 +26,8 @@ class sale_order(osv.osv):
 
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'categ_id': fields.many2one('crm.case.categ', 'Category', \
+            domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]")
     }
 
 sale_order()
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index b5d6a0ee0fc..2ba148416d5 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -22,6 +22,7 @@
             <field name="arch" type="xml">
                 <field name="user_id" position="after">
                 <field name="section_id" widget="selection" groups="base.group_extended"/>
+                <field name="categ_id" widget="selection" groups="base.group_extended"/>
                 </field>
             </field>
         </record>
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index f48df128e31..030a7567e57 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -91,6 +91,7 @@ class crm_make_sale(osv.osv_memory):
                 vals = {
                     'origin': _('Opportunity: %s') % str(case.id),
                     'section_id': case.section_id and case.section_id.id or False,
+                    'categ_id': case.categ_id and case.categ_id.id or False,
                     'shop_id': make.shop_id.id,
                     'partner_id': partner.id,
                     'pricelist_id': pricelist,
diff --git a/addons/sale_journal/i18n/fi.po b/addons/sale_journal/i18n/fi.po
new file mode 100644
index 00000000000..e188449bf4f
--- /dev/null
+++ b/addons/sale_journal/i18n/fi.po
@@ -0,0 +1,162 @@
+# Finnish 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-06-09 05:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,note:0
+msgid "Note"
+msgstr "Huomautus"
+
+#. module: sale_journal
+#: help:res.partner,property_invoice_type:0
+msgid "The type of journal used for sales and picking."
+msgstr "Myynnin ja keräilyn seurannan tyyppi"
+
+#. module: sale_journal
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Tilauksen viite tulee olla yksilöllinen!"
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Invoicing"
+msgstr "Laskutus"
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Myynnit & Ostot"
+
+#. module: sale_journal
+#: help:sale_journal.invoice.type,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the invoice "
+"type without removing it."
+msgstr ""
+"Jos aktiivisen kentän arvoksi asetetaan False (epätosi), se sallii "
+"laskutyypin piilottamisen ilman sen poistamista."
+
+#. module: sale_journal
+#: view:sale_journal.invoice.type:0
+msgid "Notes"
+msgstr "Huomautukset"
+
+#. module: sale_journal
+#: field:res.partner,property_invoice_type:0
+msgid "Invoicing Method"
+msgstr "Laskutustapa"
+
+#. module: sale_journal
+#: model:ir.module.module,description:sale_journal.module_meta_information
+msgid ""
+"\n"
+"    The sales journal modules allows you to categorise your\n"
+"    sales and deliveries (picking lists) between different journals.\n"
+"    This module is very helpful for bigger companies that\n"
+"    works by departments.\n"
+"\n"
+"    You can use journal for different purposes, some examples:\n"
+"    * isolate sales of different departments\n"
+"    * journals for deliveries by truck or by UPS\n"
+"\n"
+"    Journals have a responsible and evolves between different status:\n"
+"    * draft, open, cancel, done.\n"
+"\n"
+"    Batch operations can be processed on the different journals to\n"
+"    confirm all sales at once, to validate or invoice packing, ...\n"
+"\n"
+"    It also supports batch invoicing methods that can be configured by\n"
+"    partners and sales orders, examples:\n"
+"    * daily invoicing,\n"
+"    * monthly invoicing, ...\n"
+"\n"
+"    Some statistics by journals are provided.\n"
+"    "
+msgstr ""
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Non grouped"
+msgstr "Ei ryhmitelty"
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Grouped"
+msgstr "Ryhmitelty"
+
+#. module: sale_journal
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Virhe! Rekursiivisesti rinnastettuja jäseniä ei voi luoda."
+
+#. module: sale_journal
+#: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
+msgid ""
+"Invoice types are used for partners, sales orders and delivery orders. You "
+"can create a specific invoicing journal to group your invoicing according to "
+"your customer's needs: daily, each Wednesday, monthly, etc."
+msgstr ""
+"Laskutyyppejä käytetään yhteistyökumppaneihin, myyntitilauksiin ja "
+"toimitusmääräimiin. Voit luoda erityyppisiä kokoomalaskuja laskujen "
+"yhdistämiseksi asiakastarpeiden mukaisesti: päivittäinen, joka keskiviikko, "
+"kuukausittain tms."
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,invoicing_method:0
+msgid "Invoicing method"
+msgstr "Laskutustapa"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_sale_order
+msgid "Sales Order"
+msgstr "Myyntitilaus"
+
+#. module: sale_journal
+#: field:sale.order,invoice_type_id:0
+#: view:sale_journal.invoice.type:0
+#: field:sale_journal.invoice.type,name:0
+#: field:stock.picking,invoice_type_id:0
+msgid "Invoice Type"
+msgstr "Laskutyyppi"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,active:0
+msgid "Active"
+msgstr "Aktiivinen"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_res_partner
+msgid "Partner"
+msgstr "Kumppani"
+
+#. 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 "Laskutyypit"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_stock_picking
+msgid "Picking List"
+msgstr "Keräilylista"
+
+#. module: sale_journal
+#: model:ir.module.module,shortdesc:sale_journal.module_meta_information
+msgid "Managing sales and deliveries by journal"
+msgstr "Myyntien ja toimitusten hallinta yhteenvetoina"
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index 8d5d219537f..136e7d68198 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -48,7 +48,6 @@ class res_partner(osv.osv):
             type = 'many2one',
             relation = 'sale_journal.invoice.type',
             string = "Invoicing Method",
-            method = True,
             view_load = True,
             group_name = "Accounting Properties",
             help = "The type of journal used for sales and picking."),
diff --git a/addons/sale_layout/i18n/fi.po b/addons/sale_layout/i18n/fi.po
new file mode 100644
index 00000000000..abebab1528b
--- /dev/null
+++ b/addons/sale_layout/i18n/fi.po
@@ -0,0 +1,292 @@
+# Finnish 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-06-09 05:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "Välisumma"
+
+#. 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 ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr "Otsikko"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr "Ale. (%)"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "Huomautus"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Unit Price"
+msgstr "Yksikköhinta"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Order N°"
+msgstr "Tilaus no."
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "Tilausrivit"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr "Alennus (%)"
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Layout Type"
+msgstr "Asettelun tyyppi"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Seq."
+msgstr "Sarja"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr "Mittayksikkö"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr "Tuote"
+
+#. module: sale_layout
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Tilauksen viite tulee olla yksilöllinen!"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Description"
+msgstr "Kuvaus"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Manual Description"
+msgstr "Käsin syötetty kuvaus"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Our Salesman"
+msgstr "Myyjämme"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Automatic Declaration"
+msgstr "Automaattinen ilmoitus"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "Laskurivit"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quantity"
+msgstr "Määrä"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation N°"
+msgstr "Tarjous no."
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "VAT"
+msgstr "ALV"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr "Luo lasku"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr "Ominaisuudet"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Invoice address :"
+msgstr "Laskutusosoite:"
+
+#. module: sale_layout
+#: model:ir.module.module,shortdesc:sale_layout.module_meta_information
+msgid "Sale Order Layout"
+msgstr "Myyntitilauksen asettelu"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr "Sivunvaihto"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr "Huomautukset"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Date Ordered"
+msgstr "Tilauspäivämäärä"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Shipping address :"
+msgstr "Toimitusosoite:"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes"
+msgstr "Verot"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Net Total :"
+msgstr "Yhteensä veroton"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Tel. :"
+msgstr "Puh.:"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Total :"
+msgstr "Yhteensä:"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Payment Terms"
+msgstr "Maksuehdot"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr "Historia"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr "Myyntitilausrivit"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr "Erotinrivi"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Your Reference"
+msgstr "Viitteenne"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation Date"
+msgstr "Tarjouksen Päiväys"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "TVA :"
+msgstr "ALV:"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr "Määrä"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr "Tilat"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr "Myyntitilauksen rivit"
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr "Tilaus asettelulla"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Lisätiedot"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes :"
+msgstr "Verot:"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Fax :"
+msgstr "Faksi:"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order
+msgid "Sales Order"
+msgstr "Myyntitilaus"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Tilausrivi"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Price"
+msgstr "Hinta"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Myyntitilausrivi"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Varastosiirrot"
diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
index af901928037..6dee4ddd62f 100644
--- a/addons/sale_layout/sale_layout_view.xml
+++ b/addons/sale_layout/sale_layout_view.xml
@@ -5,52 +5,52 @@
                <field name="domain">[('layout_type','=', 'article')]</field>
              </record>
 
-		<record model="ir.ui.view" id="view_order_form_inherit_1">
-			<field name="name">sale.order.form.inherit_1</field>
-			<field name="model">sale.order</field>
-			<field name="inherit_id" ref="sale.view_order_form"/>
+        <record model="ir.ui.view" id="view_order_form_inherit_1">
+            <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="type">form</field>
-			<field name="arch" type="xml">
-				<xpath expr="/form/notebook/page/field[@name='order_line']" position="replace">
-					<field name="abstract_line_ids" colspan="4" nolabel="1" widget="one2many_list">
-							<form string="Sale Order Lines">
-								<notebook>
-	                                <page string="Order Line">
-										<separator colspan="4" string="Automatic Declaration"/>
-										<field colspan="4"
-					                        context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
-					                        name="product_id"
-					                        attrs="{'readonly':[('layout_type','!=','article')]}"
-					                        on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging, parent.fiscal_position)"
-					                        select="1"/>
-					                    <field
-					                        context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
-					                        name="product_uom_qty"
-					                        attrs="{'readonly':[('layout_type','!=','article')]}"
-					                        on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position)"
-					                        select="1"/>
-					                    <field name="product_uom"
-					                  		 required="0"
-					                    	attrs="{'readonly':[('layout_type','!=','article')],  'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"
-					                        on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
-					                    <field
-					                        name="product_packaging"
-					                        attrs="{'readonly':[('layout_type','!=','article')]}"
-					                        context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
-					                        on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position)"
-					                        domain="[('product_id','=',product_id)]"
-					                        groups="base.group_extended"/>
-					                    <separator colspan="4" string="Manual Description" />
-					                    <field name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/>
-					                    <field name="sequence" string="Seq."/>
-					                    <field colspan="4" name="name" select="2" attrs="{'readonly':[('layout_type','in',('line','break'))] }"/>
-					                    <field name="price_unit" select="2" attrs="{'readonly':[('layout_type','!=','article')],'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"/>
-					                    <field name="discount" attrs="{'readonly':[('layout_type','!=','article')]}"/>
-					                    <field name="type" attrs="{'readonly':[('layout_type','!=','article')]}"/>
-					                    <field name="delay" select="2" attrs="{'readonly':[('layout_type','!=','article')]}"/>
-					                    <field colspan="4" name="tax_id" domain="[('parent_id','=',False)]" attrs="{'readonly':[('layout_type','!=','article')]}"/>
-					                    <separator colspan="4" string="States"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='order_line']" position="replace">
+                    <field name="abstract_line_ids" colspan="4" nolabel="1" widget="one2many_list">
+                            <form string="Sale Order Lines">
+                                <notebook>
+                                    <page string="Order Line">
+                                        <separator colspan="4" string="Automatic Declaration"/>
+                                        <field colspan="4"
+                                            context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
+                                            name="product_id"
+                                            attrs="{'readonly':[('layout_type','!=','article')]}"
+                                            on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging, parent.fiscal_position)"
+                                            select="1"/>
+                                        <field
+                                            context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
+                                            name="product_uom_qty"
+                                            attrs="{'readonly':[('layout_type','!=','article')]}"
+                                            on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position)"
+                                            select="1"/>
+                                        <field name="product_uom"
+                                               required="0"
+                                            attrs="{'readonly':[('layout_type','!=','article')],  'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"
+                                            on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
+                                        <field
+                                            name="product_packaging"
+                                            attrs="{'readonly':[('layout_type','!=','article')]}"
+                                            context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
+                                            on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position)"
+                                            domain="[('product_id','=',product_id)]"
+                                            groups="base.group_extended"/>
+                                        <separator colspan="4" string="Manual Description" />
+                                        <field name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/>
+                                        <field name="sequence" string="Seq."/>
+                                        <field colspan="4" name="name" select="2" attrs="{'readonly':[('layout_type','in',('line','break'))] }"/>
+                                        <field name="price_unit" select="2" attrs="{'readonly':[('layout_type','!=','article')],'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"/>
+                                        <field name="discount" attrs="{'readonly':[('layout_type','!=','article')]}"/>
+                                        <field name="type" attrs="{'readonly':[('layout_type','!=','article')]}"/>
+                                        <field name="delay" select="2" attrs="{'readonly':[('layout_type','!=','article')]}"/>
+                                        <field colspan="4" name="tax_id" domain="[('parent_id','=',False)]" attrs="{'readonly':[('layout_type','!=','article')]}"/>
+                                        <separator colspan="4" string="States"/>
                                         <field name="state" select="2"/>
                                         <group col="3" colspan="2">
                                             <field name="invoiced" select="2"/>
@@ -58,11 +58,11 @@
                                         </group>
                                     </page>
                                     <page groups="base.group_extended" string="Extra Info">
-										<field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
-										<field groups="product.group_uos" name="product_uos"/>
-										<field name="address_allotment_id" select="2"/>
-										<separator colspan="4" string="Properties"/>
-										<field colspan="4" name="property_ids" nolabel="1"/>
+                                        <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
+                                        <field groups="product.group_uos" name="product_uos"/>
+                                        <field name="address_allotment_id" select="2"/>
+                                        <separator colspan="4" string="Properties"/>
+                                        <field colspan="4" name="property_ids" nolabel="1"/>
                                     </page>
                                     <page string="Notes">
                                         <field colspan="4" name="notes" nolabel="1"/>
@@ -74,8 +74,8 @@
                                         <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
                                     </page>
                                 </notebook>
-							</form>
-							<tree string="Sales order lines">
+                            </form>
+                            <tree string="Sales order lines">
                                     <field colspan="4" name="name"/>
                                     <field name="product_uom_qty" string="Qty"/>
                                     <field name="product_uom" string="UoM"/>
@@ -85,10 +85,10 @@
                                     <field name="price_subtotal"/>
                                     <field name="sequence"/>
                                 </tree>
-					</field>
-				</xpath>
-			</field>
-		</record>
+                    </field>
+                </xpath>
+            </field>
+        </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/sale_margin/i18n/fi.po b/addons/sale_margin/i18n/fi.po
new file mode 100644
index 00000000000..630903ae46b
--- /dev/null
+++ b/addons/sale_margin/i18n/fi.po
@@ -0,0 +1,410 @@
+# Finnish 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-06-09 05:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Category"
+msgstr "Kategoria"
+
+#. 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 "Asiakashyvitys"
+
+#. 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 "Asiakaslasku"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "February"
+msgstr "Helmikuu"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Current"
+msgstr "Nykyinen"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Group By..."
+msgstr "Ryhmittely.."
+
+#. 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 "Tila"
+
+#. 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 ""
+
+#. 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 "Luonnos"
+
+#. 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 "Maksettu"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_stock_picking
+msgid "Picking List"
+msgstr "Keräilylista"
+
+#. module: sale_margin
+#: help:sale.order,margin:0
+msgid ""
+"It gives profitability by calculating the difference between the Unit Price "
+"and Cost Price."
+msgstr ""
+"Antaa kannattavuuden laskemalla myyntihinnan ja hankintakustannusten välisen "
+"eron."
+
+#. 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 "Tyyppi"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_product
+msgid "Invoice Statistics"
+msgstr "Laskutilastot"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner.product,product_id:0
+#: field:report.account.invoice.product,product_id:0
+msgid "Product"
+msgstr "Tuote"
+
+#. module: sale_margin
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Tilauksen viite tulee olla yksilöllinen!"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoice by Partner"
+msgstr "Lasku yhteistyökumppaneittain"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "August"
+msgstr "Elokuu"
+
+#. 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 "Proforma"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "May"
+msgstr "Toukokuu"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "June"
+msgstr "Kesäkuu"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Date Invoiced"
+msgstr "Laskun päiväys"
+
+#. module: sale_margin
+#: model:ir.module.module,shortdesc:sale_margin.module_meta_information
+msgid "Margins in Sales Order"
+msgstr "Myyntitilauksen kate"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Search Margin"
+msgstr "Hae kate"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "This Year"
+msgstr "Tänä vuonna"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,date:0
+msgid "Date"
+msgstr "Päivämäärä"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "July"
+msgstr "Heinäkuu"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Extended Filters..."
+msgstr "Laajennetut Suotimet..."
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_this_month_product
+msgid "This Month"
+msgstr "Tässä kuussa"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,day:0
+msgid "Day"
+msgstr "Päivä"
+
+#. module: sale_margin
+#: field:report.account.invoice.category,categ_id:0
+msgid "Categories"
+msgstr "Luokat"
+
+#. 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 "Hankintahinta"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "October"
+msgstr "Lokakuu"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "January"
+msgstr "Tammikuu"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,year:0
+msgid "Year"
+msgstr "Vuosi"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "September"
+msgstr "Syyskuu"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "April"
+msgstr "Huhtikuu"
+
+#. 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 "Määrä"
+
+#. 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 "Toimittajan hyvitys"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "March"
+msgstr "Maaliskuu"
+
+#. 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 "Kate"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "November"
+msgstr "Marraskuu"
+
+#. 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 "Määrä"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoices by product"
+msgstr "Laskut tuotteittain"
+
+#. 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 "Toimittajan lasku"
+
+#. 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 "Laskut"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "December"
+msgstr "Joulukuu"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Laskun rivi"
+
+#. 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 "Kuukausi"
+
+#. 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 "Peruutettu"
+
+#. 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 ""
+"Tämä raportti antaa yleiskuvan kaikista järjestelmän luomista laskuista. "
+"Voit lajitella ja ryhmitellä tulokset halutuilla kriteereillä löytäen "
+"nopeasti halutut tiedot."
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice Report"
+msgstr "Laskuraportti"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Done"
+msgstr "Valmis"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice"
+msgstr "Lasku"
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Customer Invoices"
+msgstr "Asiakkaan laskut"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner,partner_id:0
+#: field:report.account.invoice.partner.product,partner_id:0
+msgid "Partner"
+msgstr "Kumppani"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order
+msgid "Sales Order"
+msgstr "Myyntitilaus"
+
+#. 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 "Avoin"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_report
+msgid "Invoice Analysis"
+msgstr "Laskuanalyysi"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Myyntitilausrivi"
diff --git a/addons/sale_margin/i18n/zh_CN.po b/addons/sale_margin/i18n/zh_CN.po
new file mode 100644
index 00000000000..9397a2b316d
--- /dev/null
+++ b/addons/sale_margin/i18n/zh_CN.po
@@ -0,0 +1,405 @@
+# Chinese (Simplified) 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-06-28 05:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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-06-29 04:43+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Category"
+msgstr "类别"
+
+#. 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 "客户退款"
+
+#. 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 "客户发票"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Current"
+msgstr "目前"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Group By..."
+msgstr "分组..."
+
+#. 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 "状态"
+
+#. 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 ""
+
+#. 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 "草稿"
+
+#. 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 "已付"
+
+#. 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 ""
+
+#. 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 "类别"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_product
+msgid "Invoice Statistics"
+msgstr ""
+
+#. module: sale_margin
+#: field:report.account.invoice.partner.product,product_id:0
+#: field:report.account.invoice.product,product_id:0
+msgid "Product"
+msgstr "产品"
+
+#. module: sale_margin
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "单号必须唯一！"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoice by Partner"
+msgstr ""
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "August"
+msgstr "8月"
+
+#. 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 "形式发票"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Date Invoiced"
+msgstr "开票日期"
+
+#. module: sale_margin
+#: model:ir.module.module,shortdesc:sale_margin.module_meta_information
+msgid "Margins in Sales Order"
+msgstr "销售订单利润率"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Search Margin"
+msgstr "查询利润率"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "This Year"
+msgstr "本年"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Extended Filters..."
+msgstr "扩展过滤器..."
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_this_month_product
+msgid "This Month"
+msgstr "本月"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: sale_margin
+#: field:report.account.invoice.category,categ_id:0
+msgid "Categories"
+msgstr "类别"
+
+#. 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 "成本价"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "April"
+msgstr "4月"
+
+#. 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 "金额"
+
+#. 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 "供应商退款"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "March"
+msgstr "3月"
+
+#. 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 "毛利"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "November"
+msgstr "11月"
+
+#. 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 "数量"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoices by product"
+msgstr "产品发票"
+
+#. 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 "供应商发票"
+
+#. 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 "发票"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "发票明细"
+
+#. 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 "月份"
+
+#. 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 "已取消"
+
+#. 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 ""
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice Report"
+msgstr "发票报表"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Done"
+msgstr "已完成"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice"
+msgstr "发票"
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Customer Invoices"
+msgstr "客户发票"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner,partner_id:0
+#: field:report.account.invoice.partner.product,partner_id:0
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order
+msgid "Sales Order"
+msgstr "销售订单"
+
+#. 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 ""
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_report
+msgid "Invoice Analysis"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "销售订单明细"
diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index 8f1cb8027ae..24f36b9f94b 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -49,7 +49,7 @@ class sale_order_line(osv.osv):
         return res
 
     _columns = {
-        'margin': fields.function(_product_margin, method=True, string='Margin', store=True),
+        'margin': fields.function(_product_margin, string='Margin', store=True),
         'purchase_price': fields.float('Cost Price', digits=(16,2))
     }
 
@@ -67,7 +67,7 @@ class sale_order(osv.osv):
         return result
 
     _columns = {
-        'margin': fields.function(_product_margin, method=True, string='Margin', store=True, help="It gives profitability by calculating the difference between the Unit Price and Cost Price."),
+        'margin': fields.function(_product_margin, string='Margin', store=True, help="It gives profitability by calculating the difference between the Unit Price and Cost Price."),
     }
 
 sale_order()
diff --git a/addons/sale_mrp/i18n/fi.po b/addons/sale_mrp/i18n/fi.po
new file mode 100644
index 00000000000..6be833d9b5e
--- /dev/null
+++ b/addons/sale_mrp/i18n/fi.po
@@ -0,0 +1,66 @@
+# Finnish 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-06-09 05:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sales order."
+msgstr "Määrittele asiakkaan viite myyntitilaukselta"
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sales Reference"
+msgstr "Myynnin viite"
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Valmistustilaus"
+
+#. 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 ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sales Name"
+msgstr "Myynnin nimi"
+
+#. module: sale_mrp
+#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
+msgid "Sales and MRP Management"
+msgstr "Myynnin ja MRP:n hallinta"
+
+#. module: sale_mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "Tilattu määrä ei voi olle negatiivinen tai nolla !"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sales order."
+msgstr "Määrittele myyntitilauksen nimi"
diff --git a/addons/sale_mrp/i18n/zh_CN.po b/addons/sale_mrp/i18n/zh_CN.po
new file mode 100644
index 00000000000..121e60bffee
--- /dev/null
+++ b/addons/sale_mrp/i18n/zh_CN.po
@@ -0,0 +1,66 @@
+# Chinese (Simplified) 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-06-28 05:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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-06-29 04:43+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sales order."
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sales Reference"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "生成订单"
+
+#. 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 ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sales Name"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
+msgid "Sales and MRP Management"
+msgstr "销售和MRP管理"
+
+#. module: sale_mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "订单数量不能为0或者负数!"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sales order."
+msgstr ""
diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py
index ae1df1eb946..840c33770a7 100644
--- a/addons/sale_mrp/sale_mrp.py
+++ b/addons/sale_mrp/sale_mrp.py
@@ -70,8 +70,8 @@ class mrp_production(osv.osv):
         return res
 
     _columns = {
-        'sale_name': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sales Name', help='Indicate the name of sales order.'),
-        'sale_ref': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sales Reference', help='Indicate the Customer Reference from sales order.'),
+        'sale_name': fields.function(_ref_calc, multi='sale_name', type='char', string='Sales Name', help='Indicate the name of sales order.'),
+        'sale_ref': fields.function(_ref_calc, multi='sale_name', type='char', string='Sales Reference', help='Indicate the Customer Reference from sales order.'),
     }
 
 mrp_production()
diff --git a/addons/sale_order_dates/i18n/fi.po b/addons/sale_order_dates/i18n/fi.po
new file mode 100644
index 00000000000..72a1ee7fde7
--- /dev/null
+++ b/addons/sale_order_dates/i18n/fi.po
@@ -0,0 +1,72 @@
+# Finnish 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-06-09 05:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: sale_order_dates
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Tilauksen viite tulee olla yksilöllinen!"
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date on which customer has requested for sales."
+msgstr "Päiväys jonka asiakas on pyytänyt."
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr "Luvattu päivä"
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr "Toimeenpanopäivä"
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sales Order Dates"
+msgstr "Myyntitilauksen Päiväykset"
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created."
+msgstr "Keräilypäivä"
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr "Pyydetty päivä"
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sales Order"
+msgstr "Myyntitilaus"
+
+#. 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"
+"Lisää lupaus, pyydetty ja todellinen päivä myyntitilaukselle.\n"
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made."
+msgstr "Tuotteiden toimituspäivä."
diff --git a/addons/sale_order_dates/i18n/zh_CN.po b/addons/sale_order_dates/i18n/zh_CN.po
new file mode 100644
index 00000000000..1f886800e9f
--- /dev/null
+++ b/addons/sale_order_dates/i18n/zh_CN.po
@@ -0,0 +1,70 @@
+# Chinese (Simplified) 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-06-28 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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-06-29 04:43+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: sale_order_dates
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "单号必须唯一！"
+
+#. 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 "生效日期"
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sales Order Dates"
+msgstr "销售订单日期"
+
+#. 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 "申请日期"
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sales Order"
+msgstr "销售订单"
+
+#. 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 ""
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made."
+msgstr "发货单生成日期"
diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/sale_order_dates.py
index 60595903ab8..ceb6d48755c 100644
--- a/addons/sale_order_dates/sale_order_dates.py
+++ b/addons/sale_order_dates/sale_order_dates.py
@@ -54,9 +54,9 @@ class sale_order_dates(osv.osv):
         return res
 
     _columns = {
-        'commitment_date': fields.function(_get_commitment_date, method=True, store=True, type='date', string='Commitment Date', help="Date on which delivery of products is to be made."),
+        'commitment_date': fields.function(_get_commitment_date, store=True, type='date', string='Commitment Date', help="Date on which delivery of products is to be made."),
         'requested_date': fields.date('Requested Date', help="Date on which customer has requested for sales."),
-        'effective_date': fields.function(_get_effective_date, method=True, type='date', store=True, string='Effective Date',help="Date on which picking is created."),
+        'effective_date': fields.function(_get_effective_date, type='date', store=True, string='Effective Date',help="Date on which picking is created."),
     }
 
 sale_order_dates()
diff --git a/addons/share/__init__.py b/addons/share/__init__.py
index 9c0c7bf7da2..e3c3acf1bc5 100644
--- a/addons/share/__init__.py
+++ b/addons/share/__init__.py
@@ -19,5 +19,6 @@
 #
 ##############################################################################
 
+import ir_model
 import res_users
 import wizard
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 085266b4dae..104b2561c97 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -22,7 +22,7 @@
 
 {
     "name" : "Sharing Tools",
-    "version" : "1.3",
+    "version" : "1.5",
     "depends" : ["base"],
     "author" : "OpenERP SA",
     "category": 'Tools',
diff --git a/addons/share/i18n/fi.po b/addons/share/i18n/fi.po
new file mode 100644
index 00000000000..d22933c18bc
--- /dev/null
+++ b/addons/share/i18n/fi.po
@@ -0,0 +1,519 @@
+# Finnish 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-06-13 06:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-14 04:40+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: share
+#: code:addons/share/web/editors.py:15
+#, python-format
+msgid "Sharing"
+msgstr "Jakaminen"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:462
+#, python-format
+msgid ""
+"This additional data has been automatically added to your current access.\n"
+msgstr "Nämä lisätiedot on automaattisesti lisätty nykyiseen pääsyysi.\n"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Existing External Users"
+msgstr "Olemassaolevat sisäiset käyttäjät"
+
+#. module: share
+#: help:res.groups,share:0
+msgid "Group created to set access rights for sharing data with some users."
+msgstr ""
+"Ryhmä luotu käyttöoikeuksien määrittämiseksi tietojen jakamiseksi joidenkin "
+"käyttäjien kanssa."
+
+#. module: share
+#: model:ir.module.module,shortdesc:share.module_meta_information
+msgid "Share Management"
+msgstr ""
+
+#. module: share
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Kahdella eri käyttäjällä ei voi olla samaa käyttäjätunnusta!"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:76
+#, python-format
+msgid "Sharing Wizard - Step 1"
+msgstr "Jako velho - vaihe 1"
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+msgid "Share Access Rules"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:453
+#, python-format
+msgid ""
+"Dear,\n"
+"\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Valittu yritys ei ole sallittu tälle käyttäjälle"
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Next"
+msgstr "Seuraava"
+
+#. module: share
+#: help:share.wizard,action_id:0
+msgid ""
+"The action that opens the screen containing the data you wish to share."
+msgstr "Toiminto avaa ruudun joka sisältää tiedot joita haluat jakaa."
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:68
+#, python-format
+msgid "Please specify \"share_root_url\" in context"
+msgstr ""
+"Ole hyvä ja määrittele jakamisen perus url (share_root_url) alkupiste."
+
+#. module: share
+#: view:share.wizard:0
+msgid "Congratulations, you have successfully setup a new shared access!"
+msgstr "Onnittelut, olet onnistuneesti määritellyt uuden jaetun pääsyn!"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:275
+#, python-format
+msgid "(Copy for sharing)"
+msgstr "(kopioi jaettavaksi)"
+
+#. module: share
+#: field:share.wizard.result.line,newly_created:0
+msgid "Newly created"
+msgstr "Uusi luotu"
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Generic Share Access URL"
+msgstr "Yleinen jaon URL"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:457
+#, python-format
+msgid ""
+"You may use the following login and password to get access to this protected "
+"area:\n"
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Regular groups only (no share groups"
+msgstr "Vain normaalit ryhmät (ei jakoryhmiä)"
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read & Write"
+msgstr "Luku ja kirjoitus"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 2"
+msgstr "Jako velho: vaihe 2"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 0"
+msgstr "JJako velho: vaihe 0"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 1"
+msgstr "JJako velho: vaihe 1"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:458
+#: field:share.wizard.result.line,login:0
+#, python-format
+msgid "Username"
+msgstr "Käyttäjätunnus"
+
+#. module: share
+#: field:res.users,share:0
+msgid "Share User"
+msgstr "Jaettu käyttäjä"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:452
+#, python-format
+msgid "%s has shared OpenERP %s information with you"
+msgstr "%s on jakanut OpenERP %s tietoja kanssasi"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Finish"
+msgstr "Valmis"
+
+#. module: share
+#: field:share.wizard,user_ids:0
+#: field:share.wizard.user,user_id:0
+msgid "Users"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:103
+#, python-format
+msgid ""
+"This username (%s) already exists, perhaps data has already been shared with "
+"this person.\n"
+"You may want to try selecting existing shared users instead."
+msgstr ""
+"Käyttäjätunnus (%s) on jo olemassa, ehkä tiedot on jo jaettu tämän käyttäjän "
+"kanssa.\n"
+"Voit ehkä haluta valita olemassaolevia jaettuja käyttäjiä tämän sijasta."
+
+#. module: share
+#: field:share.wizard,new_users:0
+msgid "New users"
+msgstr "Uudet käyttäjät"
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "res.groups"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:149
+#, python-format
+msgid "%s (Shared)"
+msgstr "%s (jaettu)"
+
+#. module: share
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr "Ryhmän nimen tulee olla uniikki!"
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "New users (emails required)"
+msgstr "Uudet käyttäjät (sähköpostit vaaditaan)"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:418
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr "Jakosuodatin luotu käyttäjän %s (%s) toimesta ryhmälle %s"
+
+#. module: share
+#: view:res.groups:0
+msgid "Groups"
+msgstr "Ryhmät"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Select the desired shared access mode:"
+msgstr "Valitse haluttu jaon tyyppi"
+
+#. module: share
+#: field:res.groups,share:0
+msgid "Share Group"
+msgstr "Jako ryhmä"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:459
+#: field:share.wizard.result.line,password:0
+#, python-format
+msgid "Password"
+msgstr "Salasana"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Who would you want to share this data with?"
+msgstr "Kenen kanssa haluat jakaa nämä tiedot?"
+
+#. module: share
+#: model:ir.module.module,description:share.module_meta_information
+msgid ""
+"The goal is to implement a generic sharing mechanism, where user of OpenERP\n"
+"can share data from OpenERP to their colleagues, customers, or friends.\n"
+"The system will work by creating new users and groups on the fly, and by\n"
+"combining the appropriate access rights and ir.rules to ensure that the "
+"/shared\n"
+"users/ will only have access to the correct data.\n"
+"    "
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:102
+#, python-format
+msgid "User already exists"
+msgstr "Käyttäjä on jo olemassa"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Send Email Notification(s)"
+msgstr "Lähetä sähköpostitiedote"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:463
+#, python-format
+msgid ""
+"You may use your existing login and password to view it. As a reminder, your "
+"login is %s.\n"
+msgstr ""
+"Voit käyttää nykyistä käyttäjätunnustasi ja salasanaasi katsoaksesi ne. "
+"Muista että kirjautumisesti on %s.\n"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:460
+#, python-format
+msgid "Database"
+msgstr "Tietokanta"
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_user
+msgid "share.wizard.user"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Please select the action that opens the screen containing the data you want "
+"to share."
+msgstr ""
+"Ole hyvä ja valitse toiminto joka avaa ruudun jossa on tiedot jotka haluat "
+"jakaa."
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "Existing external users"
+msgstr "Olemassaolevat sisäiset käyttäjät"
+
+#. module: share
+#: view:share.wizard:0
+#: field:share.wizard,result_line_ids:0
+msgid "Summary"
+msgstr "Yhteenveto"
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Users to share with"
+msgstr "Käyttäjät joiden kanssa jaetaan"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:304
+#, python-format
+msgid "Indirect sharing filter created by user %s (%s) for group %s"
+msgstr "Epäsuora jakosuodin luotu käyttäjän %s (%s) toimesta ryhmälle %s"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:448
+#, python-format
+msgid "Email required"
+msgstr "Sähköposti vaaditaan"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:240
+#, python-format
+msgid "Copied access for sharing"
+msgstr "Kopioitu pääsy jakamista varten"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Optionally, you may specify an additional domain restriction that will be "
+"applied to the shared data."
+msgstr ""
+"Vaihtoehtoisesti voit määritellä ylimääräisiä toimialuerajoituksia jotka "
+"asetetaan jaetuille tiedoille."
+
+#. module: share
+#: view:share.wizard:0
+msgid "New Users (please provide one e-mail address per line below)"
+msgstr "Uudet käyttäjät (syötä alapuolelle yksi sähköpostiosoite per rivi)"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:448
+#, python-format
+msgid ""
+"The current user must have an email address configured in User Preferences "
+"to be able to send outgoing emails."
+msgstr ""
+"Nykyisellä käyttäjällä tulee olle sähköpostiosoite määriteltynä "
+"käyttäjäasetuksissa voidakseen lähettää sähköposteja."
+
+#. module: share
+#: view:res.users:0
+msgid "Regular users only (no share user)"
+msgstr "Vain tavalliset käyttäjät (ei jaettuja käyttäjiä)"
+
+#. module: share
+#: field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr "Jaon URL"
+
+#. module: share
+#: field:share.wizard,domain:0
+msgid "Domain"
+msgstr "Toimialue"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:314
+#, python-format
+msgid ""
+"Sorry, the current screen and filter you are trying to share are not "
+"supported at the moment.\n"
+"You may want to try a simpler filter."
+msgstr ""
+"Anteeksi, nykyistä ruutua ja suodinta jota yrität jakaa ei tueta "
+"tällähetkellä.\n"
+"Voit yrittää yksinkertaisempaa suodinta."
+
+#. module: share
+#: field:share.wizard,access_mode:0
+msgid "Access Mode"
+msgstr "Pääsyn tyyppi"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access info"
+msgstr "Pääsyn tiedot"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:454
+#, python-format
+msgid ""
+"To access it, you can go to the following URL:\n"
+"    %s"
+msgstr ""
+"Päästäksesi tietoihin, mene seuraavaan osoitteeseen (url):\n"
+"    %s"
+
+#. module: share
+#: field:share.wizard,action_id:0
+msgid "Action to share"
+msgstr "Jaettava toiminto"
+
+#. module: share
+#: code:addons/share/web/editors.py:18
+#, python-format
+msgid "Share"
+msgstr "Jaa"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:434
+#, python-format
+msgid "Sharing Wizard - Step 2"
+msgstr "Jakovelho - vaihe 2"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Here is a summary of the access points you have just created:"
+msgstr "Tässä on yhteenveto pääsypisteistä jotka juuri teit."
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_result_line
+msgid "share.wizard.result.line"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:313
+#, python-format
+msgid "Sharing access could not be setup"
+msgstr "Jaon pääsyn tyyppi ei voi olla asennus"
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.actions.act_window,name:share.action_share_wizard_step1
+#: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+#: field:share.wizard.result.line,share_wizard_id:0
+msgid "Share Wizard"
+msgstr "Jakovelho"
+
+#. module: share
+#: help:share.wizard,user_type:0
+msgid "Select the type of user(s) you would like to share data with."
+msgstr "Valitse käyttäjien tyyppi joiden kanssa haluat jakaa tietoja."
+
+#. module: share
+#: view:share.wizard:0
+msgid "Cancel"
+msgstr "Peruuta"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Close"
+msgstr "Sulje"
+
+#. module: share
+#: help:res.users,share:0
+msgid ""
+"External user with limited access, created only for the purpose of sharing "
+"data."
+msgstr ""
+"Ulkoinen käyttäjä jolla on rajoitettu pääsy, luotu vain tietojen jakamista "
+"varten."
+
+#. module: share
+#: help:share.wizard,domain:0
+msgid "Optional domain for further data filtering"
+msgstr "Vaihtoehtoinen toimialue tarkempaa tietojen suodatusta varten"
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read-only"
+msgstr "Vain luku"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:323
+#, python-format
+msgid "*usual password*"
+msgstr "*normaali salasana*"
+
+#, python-format
+#~ msgid ""
+#~ "Dear,\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Hyvä,\n"
+#~ "\n"
+
+#, python-format
+#~ msgid ""
+#~ "You may use the following login and password to get access to this protected "
+#~ "area:"
+#~ msgstr ""
+#~ "Voit käyttää seuraavaa käyttäjätunnusta ja salasanaa päästäksesi tälle "
+#~ "suojatulle alueelle"
+
+#~ msgid "Sharing Tools"
+#~ msgstr "Jakotyökalut"
+
+#~ msgid "Access Groups"
+#~ msgstr "Pääsyryhmät"
diff --git a/addons/share/i18n/zh_CN.po b/addons/share/i18n/zh_CN.po
new file mode 100644
index 00000000000..8a84584c370
--- /dev/null
+++ b/addons/share/i18n/zh_CN.po
@@ -0,0 +1,484 @@
+# Chinese (Simplified) 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-07-08 03:38+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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-07-08 04:43+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: share
+#: code:addons/share/web/editors.py:15
+#, python-format
+msgid "Sharing"
+msgstr "共享"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:462
+#, python-format
+msgid ""
+"This additional data has been automatically added to your current access.\n"
+msgstr "这数据已自动添加到当前帐户\n"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Existing External Users"
+msgstr "现有的外部用户"
+
+#. module: share
+#: help:res.groups,share:0
+msgid "Group created to set access rights for sharing data with some users."
+msgstr "群组创建为设置一些用户的共享数据访问权限"
+
+#. module: share
+#: model:ir.module.module,shortdesc:share.module_meta_information
+msgid "Share Management"
+msgstr ""
+
+#. module: share
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "你不能同时登录两个用户！"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:76
+#, python-format
+msgid "Sharing Wizard - Step 1"
+msgstr "共享向导 - 步骤1"
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+msgid "Share Access Rules"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:453
+#, python-format
+msgid ""
+"Dear,\n"
+"\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "选择的群组不在这用允许的群组"
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Next"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,action_id:0
+msgid ""
+"The action that opens the screen containing the data you wish to share."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:68
+#, python-format
+msgid "Please specify \"share_root_url\" in context"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Congratulations, you have successfully setup a new shared access!"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:275
+#, python-format
+msgid "(Copy for sharing)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,newly_created:0
+msgid "Newly created"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Generic Share Access URL"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:457
+#, python-format
+msgid ""
+"You may use the following login and password to get access to this protected "
+"area:\n"
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Regular groups only (no share groups"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read & Write"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 2"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 0"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 1"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:458
+#: field:share.wizard.result.line,login:0
+#, python-format
+msgid "Username"
+msgstr ""
+
+#. module: share
+#: field:res.users,share:0
+msgid "Share User"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:452
+#, python-format
+msgid "%s has shared OpenERP %s information with you"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Finish"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,user_ids:0
+#: field:share.wizard.user,user_id:0
+msgid "Users"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:103
+#, python-format
+msgid ""
+"This username (%s) already exists, perhaps data has already been shared with "
+"this person.\n"
+"You may want to try selecting existing shared users instead."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,new_users:0
+msgid "New users"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "res.groups"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:149
+#, python-format
+msgid "%s (Shared)"
+msgstr ""
+
+#. module: share
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "New users (emails required)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:418
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Groups"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Select the desired shared access mode:"
+msgstr ""
+
+#. module: share
+#: field:res.groups,share:0
+msgid "Share Group"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:459
+#: field:share.wizard.result.line,password:0
+#, python-format
+msgid "Password"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Who would you want to share this data with?"
+msgstr "你想和谁共享这数据？"
+
+#. module: share
+#: model:ir.module.module,description:share.module_meta_information
+msgid ""
+"The goal is to implement a generic sharing mechanism, where user of OpenERP\n"
+"can share data from OpenERP to their colleagues, customers, or friends.\n"
+"The system will work by creating new users and groups on the fly, and by\n"
+"combining the appropriate access rights and ir.rules to ensure that the "
+"/shared\n"
+"users/ will only have access to the correct data.\n"
+"    "
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:102
+#, python-format
+msgid "User already exists"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Send Email Notification(s)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:463
+#, python-format
+msgid ""
+"You may use your existing login and password to view it. As a reminder, your "
+"login is %s.\n"
+msgstr "作为提醒，你现在使用的登录名是 %s\n"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:460
+#, python-format
+msgid "Database"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_user
+msgid "share.wizard.user"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Please select the action that opens the screen containing the data you want "
+"to share."
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "Existing external users"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+#: field:share.wizard,result_line_ids:0
+msgid "Summary"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Users to share with"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:304
+#, python-format
+msgid "Indirect sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:448
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:240
+#, python-format
+msgid "Copied access for sharing"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Optionally, you may specify an additional domain restriction that will be "
+"applied to the shared data."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "New Users (please provide one e-mail address per line below)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:448
+#, python-format
+msgid ""
+"The current user must have an email address configured in User Preferences "
+"to be able to send outgoing emails."
+msgstr ""
+
+#. module: share
+#: view:res.users:0
+msgid "Regular users only (no share user)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:314
+#, python-format
+msgid ""
+"Sorry, the current screen and filter you are trying to share are not "
+"supported at the moment.\n"
+"You may want to try a simpler filter."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,access_mode:0
+msgid "Access Mode"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access info"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:454
+#, python-format
+msgid ""
+"To access it, you can go to the following URL:\n"
+"    %s"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,action_id:0
+msgid "Action to share"
+msgstr ""
+
+#. module: share
+#: code:addons/share/web/editors.py:18
+#, python-format
+msgid "Share"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:434
+#, python-format
+msgid "Sharing Wizard - Step 2"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Here is a summary of the access points you have just created:"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_result_line
+msgid "share.wizard.result.line"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:313
+#, python-format
+msgid "Sharing access could not be setup"
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.actions.act_window,name:share.action_share_wizard_step1
+#: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+#: field:share.wizard.result.line,share_wizard_id:0
+msgid "Share Wizard"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,user_type:0
+msgid "Select the type of user(s) you would like to share data with."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Close"
+msgstr ""
+
+#. module: share
+#: help:res.users,share:0
+msgid ""
+"External user with limited access, created only for the purpose of sharing "
+"data."
+msgstr ""
+
+#. module: share
+#: help:share.wizard,domain:0
+msgid "Optional domain for further data filtering"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read-only"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:323
+#, python-format
+msgid "*usual password*"
+msgstr ""
+
+#, python-format
+#~ msgid ""
+#~ "Dear,\n"
+#~ "\n"
+#~ msgstr ""
+#~ "尊敬的\n"
+#~ "\n"
diff --git a/addons/share/ir_model.py b/addons/share/ir_model.py
new file mode 100644
index 00000000000..437a0c51095
--- /dev/null
+++ b/addons/share/ir_model.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A. (<http://www.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/>.
+#
+##############################################################################
+from osv import fields, osv
+
+class ir_model_access(osv.osv):
+    _inherit = 'ir.model.access'
+
+    # overload group_names_with_access() to avoid returning sharing groups
+    # by filtering out groups with share=true.
+    def group_names_with_access(self, cr, model_name, access_mode):
+        """Returns the names of visible groups which have been granted ``access_mode`` on
+           the model ``model_name``.
+           :rtype: list
+        """
+        assert access_mode in ['read','write','create','unlink'], 'Invalid access mode: %s' % access_mode
+        cr.execute('''SELECT
+                        g.name
+                      FROM
+                        ir_model_access a 
+                        JOIN ir_model m ON (a.model_id=m.id) 
+                        JOIN res_groups g ON (a.group_id=g.id)
+                      WHERE
+                        m.model=%s AND
+                        (g.share IS NULL or g.share IS false) AND
+                        a.perm_''' + access_mode, (model_name,))
+        return [x[0] for x in cr.fetchall()]
+
+ir_model_access()
\ No newline at end of file
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index 990bf29a84a..b70afda6152 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -10,16 +10,29 @@
                 <xpath expr="/search/field[@name='company_ids']" position="after">
                     <field name="share">
                         <filter name="no_share" string="Regular users only (no share user)" icon="terp-partner"
-                            domain="[('share','=',False)]"/>
+                            domain="[('share','=',False)]" default="1"/>
                     </field>
                 </xpath>
             </field>
         </record>
 
+        <!-- Hide share users/groups by default -->
         <record model="ir.actions.act_window" id="base.action_res_users">
             <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>
@@ -31,16 +44,27 @@
                     <field name="name"/>
                     <field name="share">
                         <filter name="no_share" string="Regular groups only (no share groups" icon="terp-partner"
-                            domain="[('share','=',False)]"/>
+                            domain="[('share','=',False)]" default="1"/>
                     </field>
                 </search>
             </field>
         </record>
 
+        <!-- Hide share users/groups by default -->
         <record model="ir.actions.act_window" id="base.action_res_groups">
             <field name="name">Groups</field>
             <field name="context">{'search_default_no_share': 1}</field>
         </record>
-
+        <record id="view_groups_form_share" model="ir.ui.view">
+            <field name="name">res.groups.form</field>
+            <field name="model">res.groups</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_groups_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page//field[@name='users']" position="attributes">
+                    <attribute name="context">{'search_default_no_share':1}</attribute>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/share/security/share_security.xml b/addons/share/security/share_security.xml
index ea27101fd53..a5405dbcb48 100644
--- a/addons/share/security/share_security.xml
+++ b/addons/share/security/share_security.xml
@@ -3,7 +3,8 @@
     <data noupdate="1">
         <record id="group_share_user" model="res.groups">
             <field name="name">Sharing / 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>
         </record>
-
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/share/web/controllers.py b/addons/share/web/controllers.py
index 4b723f225da..e682c8d9709 100644
--- a/addons/share/web/controllers.py
+++ b/addons/share/web/controllers.py
@@ -12,7 +12,7 @@ class ShareWizardController(openerp.controllers.SecuredController):
     _cp_path = "/share"
 
     @expose()
-    def index(self, domain, search_domain, context, view_id, action_id=None):
+    def index(self, domain, context, view_id, search_domain='[]', action_id=None):
         context = ast.literal_eval(context)
 
         if not action_id:
@@ -34,11 +34,9 @@ class ShareWizardController(openerp.controllers.SecuredController):
             scheme, netloc, '/openerp/login',
             'db=%(dbname)s&user=%(login)s&password=%(password)s', ''))
 
-        share_wiz_id = rpc.RPCProxy('ir.ui.menu').search(
-            [('name','=', 'Share Wizard')])
         context.update(
-            active_ids=share_wiz_id,
-            active_id=share_wiz_id[0],
+            #active_ids=share_wiz_id,
+            #active_id=share_wiz_id[0],
             _terp_view_name='Share Wizard',
             share_root_url=share_root_url)
         Share = rpc.RPCProxy('share.wizard')
diff --git a/addons/share/web/editors.py b/addons/share/web/editors.py
index fd6199a4fd6..677de4a8317 100644
--- a/addons/share/web/editors.py
+++ b/addons/share/web/editors.py
@@ -1,41 +1,94 @@
 # -*- coding: utf-8 -*-
 import openobject.templating
 
-class ShareActionEditor(openobject.templating.TemplateEditor):
+class FormEditor(openobject.templating.TemplateEditor):
+    templates = ['/openerp/controllers/templates/form.mako']
+    MAIN_FORM_BODY = u'id="main_form_body"'
+
+    def insert_share_button(self, output):
+        # Insert the share button on the form title H1 line, at the very end,
+        # but only if the user is a member of the sharing group 
+        share_opener_insertion = output.index('% endif', output.index(
+                '/view_diagram/process',
+                output.index(self.MAIN_FORM_BODY))) + len('% endif')
+        return output[:share_opener_insertion] + '''
+    <%
+        if 'has_share' not in cp.session:
+            cp.session['has_share'] = rpc.RPCProxy('share.wizard').has_share()
+    %>
+    % if cp.session['has_share'] and buttons.toolbar and not is_dashboard:
+        <a id="share-opener" href="#share" title="${_('Share this in 2 clicks...')}">
+            <img id="share-opener-img" src="/share/static/images/share.png"/>
+        </a>
+               <script type="text/javascript">
+                   jQuery(document).ready(function() {
+                       jQuery("#share-opener").click(function() {
+                           jQuery(this).attr(
+                               "href",
+                               openobject.http.getURL('/share', {
+                                   context: jQuery("#_terp_context").val(),
+                                   domain: jQuery("#_terp_domain").val(),
+                                   view_id: jQuery("#_terp_view_id").val(),
+                                   action_id: jQuery("#_terp_action_id").val(),
+                                   search_domain: jQuery("#_terp_view_type").val() == "form" ? 
+                                                         ("[('id','=',"+jQuery("#_terp_id").val()+")]") : 
+                                                            jQuery("#_terp_search_domain").val(),
+                           }));
+                       });
+                   });
+               </script>
+               \n
+    % endif
+''' + output[share_opener_insertion:]
+
+    def edit(self, template, template_text):
+        return self.insert_share_button(
+            super(FormEditor, self).edit(template, template_text))
+
+
+class SidebarEditor(openobject.templating.TemplateEditor):
     templates = ['/openerp/widgets/templates/sidebar.mako']
     ADD_SHARE_SECTION = u'id="sidebar"'
 
     def insert_share_link(self, output):
-        # Insert the link on the line right after the link to open the
-        # attachment form
+        # Insert the link on the line, right after the link to open the
+        # attachment form, but only if the user is a member of the sharing group 
         share_opener_insertion = output.index(
                 '\n',
                 output.index(self.ADD_SHARE_SECTION)) + 1
-        return output[:share_opener_insertion] + \
-               '''<div id="share-wizard" class="sideheader-a"><h2>${_("Sharing")}</h2></div>
-                     <ul class="clean-a">
-                         <li>
-                             <a id="sharing" href="#share">${_("Share")}</a>
-                         </li>
-                     </ul>
-                       <script type="text/javascript">
-                           jQuery(document).ready(function() {
-                               jQuery("#sharing").click(function() {
-                                   jQuery(this).attr(
-                                       "href",
-                                       openobject.http.getURL('/share', {
-                                           context: jQuery("#_terp_context").val(),
-                                           domain: jQuery("#_terp_domain").val(),
-                                           view_id: jQuery("#_terp_view_id").val(),
-                                           action_id: jQuery("#_terp_action_id").val(),
-                                           search_domain: jQuery("#_terp_search_domain").val(),
-                                   }));
-                               });
-                           });
-                       </script>
-                       \n''' + \
-                output[share_opener_insertion:]
+        return output[:share_opener_insertion] + '''
+    <%
+        if 'has_share' not in cp.session:
+            cp.session['has_share'] = rpc.RPCProxy('share.wizard').has_share()
+    %>
+    % if cp.session['has_share']:
+        <div id="share-wizard" class="sideheader-a"><h2>${_("Sharing")}</h2></div>
+             <ul class="clean-a">
+                 <li>
+                     <a id="sharing" href="#share">${_("Share")}</a>
+                 </li>
+             </ul>
+               <script type="text/javascript">
+                   jQuery(document).ready(function() {
+                       jQuery("#sharing").click(function() {
+                           jQuery(this).attr(
+                               "href",
+                               openobject.http.getURL('/share', {
+                                   context: jQuery("#_terp_context").val(),
+                                   domain: jQuery("#_terp_domain").val(),
+                                   view_id: jQuery("#_terp_view_id").val(),
+                                   action_id: jQuery("#_terp_action_id").val(),
+                                   search_domain: jQuery("#_terp_view_type").val() == "form" ? 
+                                                         ("[('id','=',"+jQuery("#_terp_id").val()+")]") : 
+                                                            jQuery("#_terp_search_domain").val(),
+                           }));
+                       });
+                   });
+               </script>
+               \n
+    % endif
+''' + output[share_opener_insertion:]
 
     def edit(self, template, template_text):
         return self.insert_share_link(
-            super(ShareActionEditor, self).edit(template, template_text))
+            super(SidebarEditor, self).edit(template, template_text))
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 6eda2360d2b..eec8b440dfa 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -21,97 +21,186 @@
 import logging
 import random
 import time
+from urllib import quote_plus
 
 import tools
 from osv import osv, fields
-from osv.expression import expression
+from osv import expression
 from tools.translate import _
 from tools.safe_eval import safe_eval
 
 FULL_ACCESS = ('perm_read', 'perm_write', 'perm_create', 'perm_unlink')
+READ_WRITE_ACCESS = ('perm_read', 'perm_write')
 READ_ONLY_ACCESS = ('perm_read',)
+UID_ROOT = 1
 
+# Pseudo-domain to represent an empty filter, constructed using
+# osv.expression's DUMMY_LEAF
+DOMAIN_ALL = [(1, '=', 1)]
 
-RANDOM_PASS_CHARACTERS = [chr(x) for x in range(48, 58) + range(97, 123) + range(65, 91)]
-RANDOM_PASS_CHARACTERS.remove('l') #lowercase l, easily mistaken as one or capital i
-RANDOM_PASS_CHARACTERS.remove('I') #uppercase i, easily mistaken as one or lowercase L
-RANDOM_PASS_CHARACTERS.remove('O') #uppercase o, mistaken with zero
-RANDOM_PASS_CHARACTERS.remove('o') #lowercase o, mistaken with zero
-RANDOM_PASS_CHARACTERS.remove('0') #zero, mistaken with o-letter
-RANDOM_PASS_CHARACTERS.remove('1') #one, mistaken with lowercase-L or capital i
+# A good selection of easy to read password characters (e.g. no '0' vs 'O', etc.)
+RANDOM_PASS_CHARACTERS = 'aaaabcdeeeefghjkmnpqrstuvwxyzAAAABCDEEEEFGHJKLMNPQRSTUVWXYZ23456789'
 def generate_random_pass():
-    pass_chars = RANDOM_PASS_CHARACTERS[:]
-    random.shuffle(pass_chars)
-    return ''.join(pass_chars[0:10])
+    return ''.join(random.sample(RANDOM_PASS_CHARACTERS,10))
 
 
-class share_create(osv.osv_memory):
-    __logger = logging.getLogger('share.wizard')
+# 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'
     _description = 'Share Wizard'
 
+    def _assert(self, condition, error_message, context=None):
+        """Raise a user error with the given message if condition is not met.
+           The error_message should have been translated with _().
+        """
+        if not condition:
+            raise osv.except_osv(_('Sharing access could not be created'), error_message)
+
+    def has_group(self, cr, uid, module, group_xml_id, context=None):
+        """Returns True if current user is a member of the group identified by the module, group_xml_id pair."""
+        # if the group was deleted or does not exist, we say NO (better safe than sorry)
+        try:
+            model, group_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, module, group_xml_id)
+        except ValueError:
+            return False
+        return group_id in self.pool.get('res.users').read(cr, uid, uid, ['groups_id'], context=context)['groups_id']
+
+    def has_share(self, cr, uid, context=None):
+        return self.has_group(cr, uid, module='share', group_xml_id='group_share_user', context=context)
+
+    def has_email(self, cr, uid, context=None):
+        return bool(self.pool.get('res.users').browse(cr, uid, uid, context=context).user_email)
+
+    def view_init(self, cr, uid, fields_list, context=None):
+        if not self.has_email(cr, uid, context=context):
+            raise osv.except_osv(_('No e-mail address configured'),
+                                 _('You must configure your e-mail address in the user preferences before using the Share button.'))
+        return super(share_wizard, self).view_init(cr, uid, fields_list, context=context)
+
+    def _user_type_selection(self, cr, uid, context=None):
+        """Selection values may be easily overridden/extended via inheritance"""
+        return [('emails','List of emails')]
+
+    """Override of create() to auto-compute the action name"""
+    def create(self, cr, uid, values, context=None):
+        if 'action_id' in values and not 'name' in values:
+            action = self.pool.get('ir.actions.actions').browse(cr, uid, values['action_id'], context=context)
+            values['name'] = action.name
+        return super(share_wizard,self).create(cr, uid, values, context=context)
+
     _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."),
         'domain': fields.char('Domain', size=256, help="Optional domain for further data filtering"),
-        'user_type': fields.selection([('existing','Existing external users'),('new','New users (emails required)')],'Users to share with',
-                help="Select the type of user(s) you would like to share data with."),
-        'user_ids': fields.many2many('res.users', 'share_wizard_res_user_rel', 'share_id', 'user_id', 'Existing users', domain=[('share', '=', True)]),
-        'new_users': fields.text("New users"),
-        'access_mode': fields.selection([('readwrite','Read & Write'),('readonly','Read-only')],'Access Mode'),
+        'user_type': fields.selection(_user_type_selection,'Users to share with',
+                     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,
+                                        help="Access rights to be granted on the shared documents."),
         'result_line_ids': fields.one2many('share.wizard.result.line', 'share_wizard_id', 'Summary', readonly=True),
-        'share_root_url': fields.char('Generic Share Access URL', size=512, readonly=True, tooltip='Main access page for users that are granted shared access')
+        'share_root_url': fields.char('Share Access URL', size=512, readonly=True, tooltip='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."),
     }
     _defaults = {
-        'user_type' : lambda self, cr, uid, *a: 'existing' if self.pool.get('res.users').search(cr, uid, [('share', '=', True)]) else 'new',
+        'user_type' : 'new',
         'domain': lambda self, cr, uid, context, *a: context.get('domain', '[]'),
         'share_root_url': lambda self, cr, uid, context, *a: context.get('share_root_url') or _('Please specify "share_root_url" in context'),
         'action_id': lambda self, cr, uid, context, *a: context.get('action_id'),
-        'access_mode': 'readonly'
+        'access_mode': 'readonly',
     }
 
     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': _('Sharing Wizard - Step 1'),
+            'name': _('Grant instant access to 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'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
+            'views': [(step1_form_view_id, 'form')],
             'type': 'ir.actions.act_window',
             'target': 'new'
         }
 
     def _create_share_group(self, cr, uid, wizard_data, context=None):
         group_obj = self.pool.get('res.groups')
-        share_group_name = '%s: %s (%d-%s)' %('Sharing', wizard_data.action_id.res_model, uid, time.time())
+        share_group_name = '%s: %s (%d-%s)' %('Shared', wizard_data.name, uid, time.time())
         # create share group without putting admin in it
-        return group_obj.create(cr, 1, {'name': share_group_name, 'share': True}, {'noadmin': True})
+        return group_obj.create(cr, UID_ROOT, {'name': share_group_name, 'share': True}, {'noadmin': True})
 
     def _create_new_share_users(self, cr, uid, wizard_data, group_id, context=None):
+        """Create one new res.users record for each email address provided in
+           wizard_data.new_users, ignoring already existing users.
+           Populates wizard_data.result_line_ids with one new line for
+           each user (existing or not). New users will also have a value
+           for the password field, so they can receive it by email.
+           Returns the ids of the created users, and the ids of the
+           ignored, existing ones."""
         user_obj = self.pool.get('res.users')
-        current_user = user_obj.browse(cr, uid, uid, context=context)
-        user_ids = []
-        if wizard_data.user_type == 'new':
-            for new_user in wizard_data.new_users.split('\n'):
-                # attempt to show more user-friendly msg than default constraint error
-                existing = user_obj.search(cr, 1, [('login', '=', new_user)])
-                if existing:
-                    raise osv.except_osv(_('User already exists'),
-                                         _('This username (%s) already exists, perhaps data has already been shared with this person.\nYou may want to try selecting existing shared users instead.') % new_user)
-                user_id = user_obj.create(cr, 1, {
-                        'login': new_user,
-                        'password': generate_random_pass(),
-                        'name': new_user,
-                        'user_email': new_user,
-                        'groups_id': [(6,0,[group_id])],
-                        'share': True,
-                        'company_id': current_user.company_id and current_user.company_id.id
-                })
-                user_ids.append(user_id)
-        return user_ids
+        current_user = user_obj.browse(cr, UID_ROOT, uid, context=context)
+        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}
+                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
+            })
+            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):
         if context is None:
@@ -124,81 +213,165 @@ class share_create(osv.osv_memory):
         dataobj = self.pool.get('ir.model.data')
         menu_id = dataobj._get_id(cr, uid, 'base', 'menu_administration_shortcut', new_context)
         shortcut_menu_id  = int(dataobj.read(cr, uid, menu_id, ['res_id'], new_context)['res_id'])
-        action_id = self.pool.get('ir.actions.act_window').create(cr, 1, values, new_context)
+        action_id = self.pool.get('ir.actions.act_window').create(cr, UID_ROOT, values, new_context)
         menu_data = {'name': values['name'],
                      'sequence': 10,
                      'action': 'ir.actions.act_window,'+str(action_id),
                      'parent_id': shortcut_menu_id,
                      'icon': 'STOCK_JUSTIFY_FILL'}
         menu_obj = self.pool.get('ir.ui.menu')
-        menu_id =  menu_obj.create(cr, 1, menu_data)
-        sc_data= {'name': values['name'], 'sequence': 1,'res_id': menu_id }
-        sc_menu_id = self.pool.get('ir.ui.view_sc').create(cr, uid, sc_data, new_context)
+        menu_id =  menu_obj.create(cr, UID_ROOT, menu_data)
+        sc_data = {'name': values['name'], 'sequence': UID_ROOT,'res_id': menu_id }
+        self.pool.get('ir.ui.view_sc').create(cr, uid, sc_data, new_context)
 
         # update menu cache
-        user_groups = set(self.pool.get('res.users').read(cr, 1, uid, ['groups_id'])['groups_id'])
+        user_groups = set(self.pool.get('res.users').read(cr, UID_ROOT, uid, ['groups_id'])['groups_id'])
         key = (cr.dbname, shortcut_menu_id, tuple(user_groups))
         menu_obj._cache[key] = True
         return action_id
 
+    def _cleanup_action_context(self, context_str, user_id):
+        """Returns a dict representing the context_str evaluated (safe_eval) as
+           a dict where items that are not useful for shared actions
+           have been removed. If the evaluation of context_str as a
+           dict fails, context_str is returned unaltered.
 
-    def _setup_action_and_shortcut(self, cr, uid, wizard_data, user_ids, new_users, context=None):
-        user_obj = self.pool.get('res.users')
-        menu_action_id = user_obj._get_menu(cr, uid, context=context)
-        values = {
-            'name': (_('%s (Shared)') % wizard_data.action_id.name)[:64],
-            'domain': wizard_data.domain,
-            'context': wizard_data.action_id.context,
-            'res_model': wizard_data.action_id.res_model,
-            'view_mode': wizard_data.action_id.view_mode,
-            'view_type': wizard_data.action_id.view_type,
-            'search_view_id': wizard_data.action_id.search_view_id.id,
+           :param user_id: the integer uid to be passed as 'uid' in the
+                           evaluation context
+           """
+        result = False
+        if context_str:
+            try:
+                context = safe_eval(context_str, tools.UnquoteEvalContext(), nocopy=True)
+                result = dict(context)
+                for key in context:
+                    # Remove all context keys that seem to toggle default
+                    # filters based on the current user, as it makes no sense
+                    # for shared users, who would not see any data by default.
+                    if key and key.startswith('search_default_') and 'user_id' in key:
+                        result.pop(key)
+            except Exception:
+                # Note: must catch all exceptions, as UnquoteEvalContext may cause many
+                #       different exceptions, as it shadows builtins.
+                self._logger.debug("Failed to cleanup action context as it does not parse server-side", exc_info=True)
+                result = context_str
+        return result
+
+    def _shared_action_def(self, cr, uid, wizard_data, context=None):
+        copied_action = wizard_data.action_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_type': copied_action.view_type,
+            'search_view_id': copied_action.search_view_id.id,
+            'view_id': copied_action.view_id.id,
         }
+        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]
+        return action_def
+
+    def _setup_action_and_shortcut(self, cr, uid, wizard_data, user_ids, make_home, context=None):
+        """Create a shortcut to reach the shared data, as well as the corresponding action, for
+           each user in ``user_ids``, and assign it as their home action if ``make_home`` is True.
+           Meant to be overridden for special cases.
+        """
+        values = self._shared_action_def(cr, uid, wizard_data, context=None)
+        user_obj = self.pool.get('res.users')
         for user_id in user_ids:
             action_id = self._create_shortcut(cr, user_id, values)
-            if new_users:
-                user_obj.write(cr, 1, [user_id], {'action_id': action_id})
-            else:
-                user_obj.write(cr, 1, [user_id], {'action_id': menu_action_id})
+            if make_home:
+                # We do this only for new share users, as existing ones already have their initial home
+                # action. Resetting to the default menu does not work well as the menu is rather empty
+                # and does not contain the shortcuts in most cases.
+                user_obj.write(cr, UID_ROOT, [user_id], {'action_id': action_id})
 
     def _get_recursive_relations(self, cr, uid, model, ttypes, relation_fields=None, suffix=None, context=None):
         """Returns list of tuples representing recursive relationships of type ``ttypes`` starting from
            model with ID ``model_id``.
 
-           @param model: browsable model to start loading relationships from
-           @param ttypes: list of relationship types to follow (e.g: ['one2many','many2many'])
-           @param relation_fields: list of previously followed relationship tuples - to avoid duplicates
+           :param model: browsable model to start loading relationships from
+           :param ttypes: list of relationship types to follow (e.g: ['one2many','many2many'])
+           :param relation_fields: list of previously followed relationship tuples - to avoid duplicates
                                    during recursion
-           @param suffix: optional suffix to append to the field path to reach the main object
+           :param suffix: optional suffix to append to the field path to reach the main object
         """
-        
         if relation_fields is None:
             relation_fields = []
         local_rel_fields = []
         models = [x[1].model for x in relation_fields]
         model_obj = self.pool.get('ir.model')
         model_osv = self.pool.get(model.model)
-        for field in model_osv._columns.values() + [x[2] for x in model_osv._inherit_fields.itervalues()]:
-            if field._type in ttypes and field._obj not in models:
-                relation_model_id = model_obj.search(cr, uid, [('model','=',field._obj)])[0]
-                if field._type == 'one2many':
-                    relation_field = '%s.%s'%(field._fields_id, suffix) if suffix else field._fields_id
-                else:
-                    relation_field = None # TODO: add some filtering for m2m and m2o - not always possible...
-                model_browse = model_obj.browse(cr, uid, relation_model_id, context=context)
-                local_rel_fields.append((relation_field, model_browse))
-                if relation_model_id != model.id and field._type in ['one2many', 'many2many']:
-                    local_rel_fields += self._get_recursive_relations(cr, uid, model_browse,
-                        [field._type], relation_fields + local_rel_fields, suffix=relation_field, context=context)
+        for colinfo in get_column_infos(model_osv).itervalues():
+            coldef = colinfo.column
+            coltype = coldef._type
+            relation_field = None
+            if coltype in ttypes and colinfo.column._obj not in models:
+                relation_model_id = model_obj.search(cr, UID_ROOT, [('model','=',coldef._obj)])[0]
+                relation_model_browse = model_obj.browse(cr, UID_ROOT, relation_model_id, context=context)
+                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)
+                    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
+                local_rel_fields.append((relation_field, relation_model_browse))
+                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_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:
+                            # inverse relationship is available in the parent
+                            local_rel_fields.append((relation_field, parent_model_browse))
+                        else:
+                            # TODO: can we setup a proper rule to restrict inherited models
+                            # in case the parent does not contain the reverse m2o?
+                            local_rel_fields.append((None, parent_model_browse))
+                if relation_model_id != model.id and coltype in ['one2many', 'many2many']:
+                    local_rel_fields += self._get_recursive_relations(cr, uid, relation_model_browse,
+                        [coltype], relation_fields + local_rel_fields, suffix=relation_field, context=context)
         return local_rel_fields
 
     def _get_relationship_classes(self, cr, uid, model, context=None):
+        """Computes the *relationship classes* reachable from the given
+           model. The 4 relationship classes are:
+           - [obj0]: the given model itself (and its parents via _inherits, if any)
+           - [obj1]: obj0 and all other models recursively accessible from
+                     obj0 via one2many relationships
+           - [obj2]: obj0 and all other models recursively accessible from
+                     obj0 via one2many and many2many relationships
+           - [obj3]: all models recursively accessible from obj1 via many2one
+                     relationships
+
+           Each class is returned as a list of pairs [(field,model_browse)], where
+           ``model`` is the browse_record of a reachable ir.model, and ``field`` is
+           the dot-notation reverse relationship path coming from that model to obj0,
+           or None if there is no reverse path.
+           
+           :return: ([obj0], [obj1], [obj2], [obj3])
+           """
+        # obj0 class and its parents
         obj0 = [(None, model)]
-        obj1 = self._get_recursive_relations(cr, uid, model, ['one2many'], context=context)
-        obj2 = self._get_recursive_relations(cr, uid, model, ['one2many', 'many2many'], context=context)
-        obj3 = self._get_recursive_relations(cr, uid, model, ['many2one'], context=context)
+        model_obj = self.pool.get(model.model)
+        ir_model_obj = self.pool.get('ir.model')
+        for parent in model_obj._inherits:
+            parent_model_browse = ir_model_obj.browse(cr, UID_ROOT,
+                    ir_model_obj.search(cr, UID_ROOT, [('model','=',parent)]))[0]
+            obj0 += [(None, parent_model_browse)]
+
+        obj1 = self._get_recursive_relations(cr, uid, model, ['one2many'], relation_fields=obj0, context=context)
+        obj2 = self._get_recursive_relations(cr, uid, model, ['one2many', 'many2many'], relation_fields=obj0, context=context)
+        obj3 = self._get_recursive_relations(cr, uid, model, ['many2one'], relation_fields=obj0, context=context)
         for dummy, model in obj1:
-            obj3 += self._get_recursive_relations(cr, uid, model, ['many2one'], context=context)
+            obj3 += self._get_recursive_relations(cr, uid, model, ['many2one'], relation_fields=obj0, context=context)
         return obj0, obj1, obj2, obj3
 
     def _get_access_map_for_groups_and_models(self, cr, uid, group_ids, model_ids, context=None):
@@ -215,23 +388,22 @@ class share_create(osv.osv_memory):
                         access_line.add(perm)
         return user_access_matrix
 
-    def _add_access_rights_for_share_group(self, cr, uid, group_id, mode,
-        fields_relations, context=None):
+    def _add_access_rights_for_share_group(self, cr, uid, group_id, mode, fields_relations, context=None):
         """Adds access rights to group_id on object models referenced in ``fields_relations``,
            intersecting with access rights of current user to avoid granting too much rights
         """
         model_access_obj = self.pool.get('ir.model.access')
         user_obj = self.pool.get('res.users')
-        target_model_ids = [x[1].id for x in fields_relations] 
-        perms_to_add = (mode == 'readonly') and READ_ONLY_ACCESS or FULL_ACCESS
+        target_model_ids = [x[1].id for x in fields_relations]
+        perms_to_add = (mode == 'readonly') and READ_ONLY_ACCESS or READ_WRITE_ACCESS
         current_user = user_obj.browse(cr, uid, uid, context=context)
 
         current_user_access_map = self._get_access_map_for_groups_and_models(cr, uid,
             [x.id for x in current_user.groups_id], target_model_ids, context=context)
         group_access_map = self._get_access_map_for_groups_and_models(cr, uid,
             [group_id], target_model_ids, context=context)
-        self.__logger.debug("Current user access matrix: %r", current_user_access_map)
-        self.__logger.debug("New group current access matrix: %r", group_access_map)
+        self._logger.debug("Current user access matrix: %r", current_user_access_map)
+        self._logger.debug("New group current access matrix: %r", group_access_map)
 
         # Create required rights if allowed by current user rights and not
         # already granted
@@ -251,126 +423,193 @@ class share_create(osv.osv_memory):
                     group_access_map.setdefault(model.model, set()).add(perm)
                     need_creation = True
             if need_creation:
-                model_access_obj.create(cr, 1, values)
-                self.__logger.debug("Creating access right for model %s with values: %r", model.model, values)
+                model_access_obj.create(cr, UID_ROOT, values)
+                self._logger.debug("Creating access right for model %s with values: %r", model.model, values)
 
-    def _link_or_copy_current_user_rules(self, cr, uid, group_id, fields_relations, context=None):
-        user_obj = self.pool.get('res.users')
+    def _link_or_copy_current_user_rules(self, cr, current_user, group_id, fields_relations, context=None):
         rule_obj = self.pool.get('ir.rule')
-        current_user = user_obj.browse(cr, uid, uid, context=context)
-        completed_models = set()
+        rules_done = set()
         for group in current_user.groups_id:
             for dummy, model in fields_relations:
-                if model.id in completed_models:
-                    continue
-                completed_models.add(model.id)
                 for rule in group.rule_groups:
-                    if rule.model_id == model.id:
+                    if rule.id in rules_done:
+                        continue
+                    rules_done.add(rule.id)
+                    if rule.model_id.id == model.id:
                         if 'user.' in rule.domain_force:
                             # Above pattern means there is likely a condition
                             # specific to current user, so we must copy the rule using
                             # the evaluated version of the domain.
                             # And it's better to copy one time too much than too few
-                            rule_obj.copy(cr, 1, rule.id, default={
-                                'name': '%s (%s)' %(rule.name, _('(Copy for sharing)')),
+                            rule_obj.copy(cr, UID_ROOT, rule.id, default={
+                                'name': '%s %s' %(rule.name, _('(Copy for sharing)')),
                                 'groups': [(6,0,[group_id])],
                                 'domain_force': rule.domain, # evaluated version!
                             })
-                            self.__logger.debug("Copying rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
+                            self._logger.debug("Copying rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
                         else:
                             # otherwise we can simply link the rule to keep it dynamic
                             rule_obj.write(cr, 1, [rule.id], {
                                     'groups': [(4,group_id)]
                                 })
-                            self.__logger.debug("Linking rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
+                            self._logger.debug("Linking rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
 
-    def _create_indirect_sharing_rules(self, cr, uid, wizard_data, group_id, fields_relations, context=None):
-        user_obj = self.pool.get('res.users')
-        current_user = user_obj.browse(cr, uid, uid, context=context)
+    def _check_personal_rule_or_duplicate(self, cr, group_id, rule, context=None):
+        """Verifies that the given rule only belongs to the given group_id, otherwise
+           duplicate it for the current group, and unlink the previous one.
+           The duplicated rule has the original domain copied verbatim, without
+           any evaluation.
+           Returns the final rule to use (browse_record), either the original one if it
+           only belongs to this group, or the copy."""
+        if len(rule.groups) == 1:
+            return rule
+        # duplicate it first:
         rule_obj = self.pool.get('ir.rule')
+        new_id = rule_obj.copy(cr, UID_ROOT, rule.id,
+                               default={
+                                       'name': '%s %s' %(rule.name, _('(Duplicated for modified sharing permissions)')),
+                                       'groups': [(6,0,[group_id])],
+                                       'domain_force': rule.domain_force, # non evaluated!
+                               })
+        self._logger.debug("Duplicating rule %s (%s) (domain: %s) for modified access ", rule.name, rule.id, rule.domain_force)
+        # then disconnect from group_id:
+        rule.write({'groups':[(3,group_id)]}) # disconnects, does not delete!
+        return rule_obj.browse(cr, UID_ROOT, new_id, context=context)
+
+    def _create_or_combine_sharing_rule(self, cr, current_user, wizard_data, group_id, model_id, domain, restrict=False, rule_name=None, context=None):
+        """Add a new ir.rule entry for model_id and domain on the target group_id.
+           If ``restrict`` is True, instead of adding a rule, the domain is
+           combined with AND operator with all existing rules in the group, to implement
+           an additional restriction (as of 6.1, multiple rules in the same group are
+           OR'ed by default, so a restriction must alter all existing rules)
+
+           This is necessary because the personal rules of the user that is sharing
+           are first copied to the new share group. Afterwards the filters used for
+           sharing are applied as an additional layer of rules, which are likely to
+           apply to the same model. The default rule algorithm would OR them (as of 6.1),
+           which would result in a combined set of permission that could be larger
+           than those of the user that is sharing! Hence we must forcefully AND the
+           rules at this stage.
+           One possibly undesirable effect can appear when sharing with a
+           pre-existing group, in which case altering pre-existing rules would not
+           be desired. This is addressed in the portal module.
+           """
+        if rule_name is None:
+            rule_name = _('Sharing filter created by user %s (%s) for group %s') % \
+                            (current_user.name, current_user.login, group_id)
+        rule_obj = self.pool.get('ir.rule')
+        rule_ids = rule_obj.search(cr, UID_ROOT, [('groups', 'in', group_id), ('model_id', '=', model_id)])
+        if rule_ids:
+            for rule in rule_obj.browse(cr, UID_ROOT, rule_ids, context=context):
+                if rule.domain_force == domain:
+                    # don't create it twice!
+                    if restrict:
+                        continue
+                    else:
+                        self._logger.debug("Ignoring sharing rule on model %s with domain: %s the same rule exists already", model_id, domain)
+                        return
+                if restrict:
+                    # restricting existing rules is done by adding the clause
+                    # with an AND, but we can't alter the rule if it belongs to
+                    # other groups, so we duplicate if needed
+                    rule = self._check_personal_rule_or_duplicate(cr, group_id, rule, context=context)
+                    eval_ctx = rule_obj._eval_context_for_combinations()
+                    org_domain = expression.normalize(eval(rule.domain_force, eval_ctx))
+                    new_clause = expression.normalize(eval(domain, eval_ctx))
+                    combined_domain = expression.AND([new_clause, org_domain])
+                    rule.write({'domain_force': combined_domain, 'name': rule.name + _('(Modified)')})
+                    self._logger.debug("Combining sharing rule %s on model %s with domain: %s", rule.id, model_id, domain)
+        if not restrict:
+            # Adding the new rule in the group is ok for normal cases, because rules
+            # in the same group and for the same model will be combined with OR
+            # (as of v6.1), so the desired effect is achieved.
+            rule_obj.create(cr, UID_ROOT, {
+                'name': rule_name,
+                'model_id': model_id,
+                'domain_force': domain,
+                'groups': [(4,group_id)]
+                })
+            self._logger.debug("Created sharing rule on model %s with domain: %s", model_id, domain)
+
+    def _create_indirect_sharing_rules(self, cr, current_user, wizard_data, group_id, fields_relations, context=None):
+        rule_name = _('Indirect sharing filter created by user %s (%s) for group %s') % \
+                            (current_user.name, current_user.login, group_id)
         try:
             domain = safe_eval(wizard_data.domain)
             if domain:
-                domain_expr = expression(domain)
+                domain_expr = expression.expression(domain)
                 for rel_field, model in fields_relations:
                     related_domain = []
+                    if not rel_field: continue
                     for element in domain:
                         if domain_expr._is_leaf(element):
-                            left, operator, right = element 
+                            left, operator, right = element
                             left = '%s.%s'%(rel_field, left)
                             element = left, operator, right
                         related_domain.append(element)
-                    rule_obj.create(cr, 1, {
-                        'name': _('Indirect sharing filter created by user %s (%s) for group %s') % \
-                            (current_user.name, current_user.login, group_id),
-                        'model_id': model.id,
-                        'domain_force': str(related_domain),
-                        'groups': [(4,group_id)]
-                    })
-                    self.__logger.debug("Created indirect rule on model %s with domain: %s", model.model, repr(related_domain))
+                    self._create_or_combine_sharing_rule(cr, current_user, wizard_data,
+                         group_id, model_id=model.id, domain=str(related_domain),
+                         rule_name=rule_name, restrict=True, context=context)
         except Exception:
-            self.__logger.exception('Failed to create share access')
-            raise osv.except_osv(_('Sharing access could not be setup'),
+            self._logger.exception('Failed to create share access')
+            raise osv.except_osv(_('Sharing access could not be created'),
                                  _('Sorry, the current screen and filter you are trying to share are not supported at the moment.\nYou may want to try a simpler filter.'))
 
-    def _create_result_lines(self, cr, uid, wizard_data, context=None):
-        user_obj = self.pool.get('res.users')
-        result_obj = self.pool.get('share.wizard.result.line')
+    def _finish_result_lines(self, cr, uid, wizard_data, share_group_id, context=None):
+        """Perform finalization of the share, and populate the summary"""
         share_root_url = wizard_data.share_root_url
-        format_url = '%(login)s' in share_root_url\
-                 and '%(password)s' in share_root_url\
-                 and '%(dbname)s' in share_root_url
-        existing_passwd_str = _('*usual password*')
-        if wizard_data.user_type == 'new':
-            for email in wizard_data.new_users.split('\n'):
-                user_id = user_obj.search(cr, 1, [('login', '=', email)], context=context)
-                password = user_obj.read(cr, 1, user_id[0], ['password'])['password']
-                share_url = share_root_url % \
-                        {'login': email,
-                         'password': password,
-                         'dbname': cr.dbname} if format_url else share_root_url
-                result_obj.create(cr, uid, {
-                        'share_wizard_id': wizard_data.id,
-                        'login': email,
-                        'password': password,
-                        'share_url': share_url,
-                    }, context=context)
-        else:
-            # existing users
-            for user in wizard_data.user_ids:
-                share_url = share_root_url % \
-                        {'login': user.login,
-                         'password': '',
-                         'dbname': cr.dbname} if format_url else share_root_url
-                result_obj.create(cr, uid, {
-                        'share_wizard_id': wizard_data.id,
-                        'login': user.login,
-                        'password': existing_passwd_str,
-                        'share_url': share_url,
-                        'newly_created': False,
-                    }, context=context)
+        format_url = '%(dbname)s' in share_root_url
+        for result in wizard_data.result_line_ids:
+                # share_root_url may contain placeholders for dbname, login and password
+                share_url = (share_root_url % \
+                                        {'login': quote_plus(result.user_id.login),
+                                         'password': '', # kept empty for security reasons
+                                         'dbname': quote_plus(cr.dbname)}) \
+                                          if format_url else share_root_url
+                result.write({'share_url': share_url}, context=context)
+
+    def _check_preconditions(self, cr, uid, wizard_data, context=None):
+        self._assert(wizard_data.action_id and wizard_data.access_mode,
+                     _('Action and Access Mode are required to create a shared access'),
+                     context=context)
+        self._assert(self.has_share(cr, uid, context=context),
+                     _('You must be a member of the Share/User group to use the share wizard'),
+                     context=context)
+        if wizard_data.user_type == 'emails':
+            self._assert(wizard_data.new_users,
+                     _('Please indicate the emails of the persons to share with, one per line'),
+                     context=context)
+
+    def _create_share_users_group(self, cr, uid, wizard_data, context=None):
+        """Creates the appropriate share group and share users, and populates
+           result_line_ids of wizard_data with one line for each user.
+
+           :return: the new group id (to which the shared access should be granted)
+        """
+        group_id = self._create_share_group(cr, uid, wizard_data, context=context)
+        # First create any missing user, based on the email addresses provided
+        new_ids, existing_ids = self._create_new_share_users(cr, uid, wizard_data, group_id, context=context)
+        # Finally, setup the new action and shortcut for the users.
+        if existing_ids:
+            # existing users still need to join the new group
+            self.pool.get('res.users').write(cr, UID_ROOT, existing_ids, {
+                                                'groups_id': [(4,group_id)],
+                                             })
+            # existing user don't need their home action replaced, only a new shortcut
+            self._setup_action_and_shortcut(cr, uid, wizard_data, existing_ids, make_home=False, context=context)
+        if new_ids:
+            # new users need a new shortcut AND a home action
+            self._setup_action_and_shortcut(cr, uid, wizard_data, new_ids, make_home=True, context=context)
+        return group_id
 
     def go_step_2(self, cr, uid, ids, context=None):
-        wizard_data = self.browse(cr, uid, ids and ids[0], context=context)
-        assert wizard_data.action_id and wizard_data.access_mode and \
-                ((wizard_data.user_type == 'new' and wizard_data.new_users) or \
-                    (wizard_data.user_type == 'existing' and wizard_data.user_ids))
+        wizard_data = self.browse(cr, uid, ids[0], context=context)
+        self._check_preconditions(cr, uid, wizard_data, context=context)
 
         # Create shared group and users
-        group_id = self._create_share_group(cr, uid, wizard_data, context=context)
-        user_obj = self.pool.get('res.users')
-        current_user = user_obj.browse(cr, uid, uid, context=context)
-        if wizard_data.user_type == 'new':
-            user_ids = self._create_new_share_users(cr, uid, wizard_data, group_id, context=context)
-        else:
-            user_ids = [x.id for x in wizard_data.user_ids]
-            # reset home action to regular menu as user needs access to multiple items
-            user_obj.write(cr, 1, user_ids, {
-                                   'groups_id': [(4,group_id)],
-                            })
-        self._setup_action_and_shortcut(cr, uid, wizard_data, user_ids, 
-            (wizard_data.user_type == 'new'), context=context)
+        group_id = self._create_share_users_group(cr, uid, wizard_data, context=context)
 
+        current_user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
 
         model_obj = self.pool.get('ir.model')
         model_id = model_obj.search(cr, uid, [('model','=', wizard_data.action_id.res_model)])[0]
@@ -379,59 +618,68 @@ class share_create(osv.osv_memory):
         # ACCESS RIGHTS
         # We have several classes of objects that should receive different access rights:
         # Let:
-        #   - [obj0] be the target model itself
+        #   - [obj0] be the target model itself (and its parents via _inherits, if any)
         #   - [obj1] be the target model and all other models recursively accessible from
         #            obj0 via one2many relationships
         #   - [obj2] be the target model and all other models recursively accessible from
         #            obj0 via one2many and many2many relationships
         #   - [obj3] be all models recursively accessible from obj1 via many2one relationships
+        #            (currently not used)
         obj0, obj1, obj2, obj3 = self._get_relationship_classes(cr, uid, model, context=context)
         mode = wizard_data.access_mode
 
-        # Add access to [obj0] and [obj1] according to chosen mode   
+        # Add access to [obj0] and [obj1] according to chosen mode
         self._add_access_rights_for_share_group(cr, uid, group_id, mode, obj0, context=context)
         self._add_access_rights_for_share_group(cr, uid, group_id, mode, obj1, context=context)
 
-        # Add read-only access (always) to [obj2] and [obj3]
+        # Add read-only access (always) to [obj2]
         self._add_access_rights_for_share_group(cr, uid, group_id, 'readonly', obj2, context=context)
-        self._add_access_rights_for_share_group(cr, uid, group_id, 'readonly', obj3, context=context)
-
 
         # IR.RULES
-        #   A. On [obj0]: 1 rule with domain of shared action
-        #   B. For each model in [obj1]: 1 rule in the form: 
+        #   A. On [obj0], [obj1], [obj2]: add all rules from all groups of
+        #     the user that is sharing
+        #     Warning: rules must be copied instead of linked if they contain a reference
+        #     to uid or if the rule is shared with other groups (and it must be replaced correctly)
+        #   B. On [obj0]: 1 rule with domain of shared action
+        #   C. For each model in [obj1]: 1 rule in the form:
         #           many2one_rel.domain_of_obj0
         #        where many2one_rel is the many2one used in the definition of the
         #        one2many, and domain_of_obj0 is the sharing domain
-        #        For example if [obj0] is project.project with a domain of 
+        #        For example if [obj0] is project.project with a domain of
         #                ['id', 'in', [1,2]]
-        #        then we will have project.task in [obj1] and we need to create this 
+        #        then we will have project.task in [obj1] and we need to create this
         #        ir.rule on project.task:
         #                ['project_id.id', 'in', [1,2]]
-        #   C. And on [obj0], [obj1], [obj2], [obj3]: add all rules from all groups of 
-        #     the user that is sharing 
-        #     (Warning: rules must be copied instead of linked if they contain a reference 
-        #     to uid, and it must be replaced correctly)
-        rule_obj = self.pool.get('ir.rule')
+
         # A.
-        rule_obj.create(cr, 1, {
-            'name': _('Sharing filter created by user %s (%s) for group %s') % \
-                        (current_user.name, current_user.login, group_id),
-            'model_id': model.id,
-            'domain_force': wizard_data.domain,
-            'groups': [(4,group_id)]
-            })
+        all_relations = obj0 + obj1 + obj2
+        self._link_or_copy_current_user_rules(cr, current_user, group_id, all_relations, context=context)
         # B.
-        self._create_indirect_sharing_rules(cr, uid, wizard_data, group_id, obj1, context=context)
+        main_domain = wizard_data.domain if wizard_data.domain != '[]' else DOMAIN_ALL
+        self._create_or_combine_sharing_rule(cr, current_user, wizard_data,
+                     group_id, model_id=model.id, domain=main_domain,
+                     restrict=True, context=context)
         # C.
-        all_relations = obj0 + obj1 + obj2 + obj3
-        self._link_or_copy_current_user_rules(cr, uid, group_id, all_relations, context=context)
-        # so far, so good -> populate summary results and return them
-        self._create_result_lines(cr, uid, wizard_data, context=context)
+        self._create_indirect_sharing_rules(cr, current_user, wizard_data, group_id, obj1, context=context)
+
+        # so far, so good -> check summary results and return them
+        self._finish_result_lines(cr, uid, wizard_data, group_id, context=context)
+
+        # update share URL to make it generic
+        generic_share_url = wizard_data.share_root_url % {'dbname': cr.dbname,
+                                                          'login': '',
+                                                          'password': ''}
+        wizard_data.write({'share_root_url': generic_share_url}, context=context)
+
+        # refresh wizard_data
+        wizard_data = self.browse(cr, uid, ids[0], context=context)
+
+        # send the confirmation emails:
+        self.send_emails(cr, uid, wizard_data, context=context)
 
         dummy, step2_form_view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'share', 'share_step2_form')
         return {
-            'name': _('Sharing Wizard - Step 2'),
+            'name': _('Shared access created!'),
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'share.wizard',
@@ -442,40 +690,55 @@ class share_create(osv.osv_memory):
             'target': 'new'
         }
 
-    def send_emails(self, cr, uid, ids, context=None):
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+    def send_emails(self, cr, uid, wizard_data, context=None):
+        self._logger.info('Sending share notifications by email...')
+        user = self.pool.get('res.users').browse(cr, UID_ROOT, uid)
         if not user.user_email:
             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.'))
-        for wizard_data in self.browse(cr, uid, ids, context=context):
-            for result_line in wizard_data.result_line_ids:
-                email_to = result_line.login
-                subject = _('%s has shared OpenERP %s information with you') % (user.name, wizard_data.action_id.name)
-                body = _("Dear,\n\n%s\n\n") % subject
-                body += _("To access it, you can go to the following URL:\n    %s") % result_line.share_url
-                body += "\n\n"
-                if result_line.newly_created:
-                    body += _("You may use the following login and password to get access to this protected area:\n")
-                    body += "%s: %s" % (_("Username"), result_line.login) + "\n"
-                    body += "%s: %s" % (_("Password"), result_line.password) + "\n"
-                    body += "%s: %s" % (_("Database"), cr.dbname) + "\n"
-                else:
-                    body += _("This additional data has been automatically added to your current access.\n")
-                    body += _("You may use your existing login and password to view it. As a reminder, your login is %s.\n") % result_line.login
 
-                if not tools.email_send(
-                                            user.user_email,
-                                            [email_to],
-                                            subject,
-                                            body):
-                    self.__logger.warning('Failed to send sharing email from %s to %s', user.user_email, email_to)
-        return {'type': 'ir.actions.act_window_close'}
-share_create()
+        # TODO: also send an HTML version of this mail
+        emails_sent = 0
+        for result_line in wizard_data.result_line_ids:
+            email_to = result_line.user_id.user_email
+            subject = wizard_data.name
+            body = _("Hello,")
+            body += "\n\n"
+            body += _("I've shared %s with you!") % wizard_data.name
+            body += "\n\n"
+            body += _("The documents are not attached, you can view them online directly on my OpenERP server at:")
+            body += "\n    " + result_line.share_url
+            body += "\n\n"
+            if wizard_data.message:
+                body += wizard_data.message
+                body += "\n\n"
+            if result_line.newly_created:
+                body += _("These are your credentials to access this protected area:\n")
+                body += "%s: %s" % (_("Username"), result_line.user_id.login) + "\n"
+                body += "%s: %s" % (_("Password"), result_line.password) + "\n"
+                body += "%s: %s" % (_("Database"), cr.dbname) + "\n"
+            else:
+                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 += "\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.")
+
+            if tools.email_send(user.user_email, [email_to], subject, body):
+                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):
     _name = 'share.wizard.result.line'
-    _rec_name = 'login'
+    _rec_name = 'user_id'
     _columns = {
-        'login': fields.char('Username', size=64, required=True, readonly=True),
+        'user_id': fields.many2one('res.users', required=True, readonly=True),
+        'login': fields.related('user_id', 'login', string='Login', type='char', size=64, required=True, readonly=True),
         'password': fields.char('Password', size=64, readonly=True),
         'share_url': fields.char('Share URL', size=512, required=True),
         'share_wizard_id': fields.many2one('share.wizard', 'Share Wizard', required=True),
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index bd281c7e97a..5087b85d7bd 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -7,7 +7,7 @@
             <field name="model">share.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Share wizard: step 0">
+                <form string="Sharing: preparation">
                     <separator colspan="4"
                         string="Please select the action that opens the screen containing the data you want to share."/>
                     <field name="action_id" colspan="4"/>
@@ -28,25 +28,24 @@
             <field name="model">share.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Share wizard: step 1">
-                    <separator colspan="4" string="Who would you want to share this data with?"/>
-                    <field name="user_type"/>
-                    <group colspan="4" attrs="{'invisible':[('user_type','!=','existing')]}">
-                        <separator colspan="4" string="Existing External Users"/>
-                        <field colspan="4" nolabel="1" name="user_ids" mode="tree"/>
+                <form string="Grant instant access to your documents">
+                    <group colspan="4" name="emails_group" attrs="{'invisible':[('user_type','!=','emails')]}">
+                        <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>
-                    <group colspan="4" attrs="{'invisible':[('user_type','!=','new')]}">
-                        <separator colspan="4" string="New Users (please provide one e-mail address per line below)"/>
-                        <field colspan="4" nolabel="1" name="new_users"/>
+                    <separator colspan="4" string="Optional: include a personal message"/>
+                    <group colspan="4" col="4">
+                        <field name="message" colspan="4" nolabel="1"/>
                     </group>
-                    <separator colspan="4" string="Select the desired shared access mode:"/>
-                    <group colspan="4">
-                        <field name="access_mode"/>
+                    <separator colspan="4" string="Extra 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="Finish" colspan="1" type="object" icon="gtk-go-forward"/>
+                        <button name="go_step_2" string="Share" colspan="1" type="object" icon="gtk-go-forward"/>
                     </group>
                 </form>
             </field>
@@ -57,26 +56,19 @@
             <field name="model">share.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Share wizard: step 2">
-                    <separator colspan="4" string="Congratulations, you have successfully setup a new shared access!"/>
-                    <label colspan="4" string="Here is a summary of the access points you have just created:"/>
+                <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">
                         <tree string="Summary">
                             <field name="login"/>
-                            <field name="password"/>
-                            <field name="share_url"/>
                         </tree>
                         <form string="Access info">
                             <field name="login"/>
-                            <field name="password"/>
-                            <field name="share_url" colspan="4"/>
                         </form>
                     </field>
-                    <field colspan="4" name="share_root_url"/>
                     <separator colspan="4"/>
                     <group colspan="4">
                         <button special="cancel" string="Close" icon='gtk-ok'/>
-                        <button name="send_emails" string="Send Email Notification(s)" colspan="1" type="object" icon="gtk-go-forward"/>
                     </group>
                 </form>
             </field>
@@ -114,8 +106,5 @@
             <field name="target">new</field>
         </record>
 
-        <!--  temporarily under Low-Level-Actions  -->
-        <menuitem action="action_share_wizard" id="menu_action_share_wizard" parent="base.next_id_4" groups="group_share_user" icon="terp-rating-rated"/>
-
     </data>
 </openerp>
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index 88b0a45a5c0..4b22fdc565d 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.po
@@ -7,30 +7,30 @@ 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-10-30 10:24+0000\n"
-"Last-Translator: Anup(OpenERP) <ach@tinyerp.com>\n"
+"PO-Revision-Date: 2011-06-25 18:52+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-26 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
 msgid "Track Outgoing Lots"
-msgstr ""
+msgstr "Giden Lotları İzle"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_ups_upload
 msgid "Stock ups upload"
-msgstr ""
+msgstr "Stok yükleme"
 
 #. module: stock
 #: code:addons/stock/product.py:76
 #, python-format
 msgid "Variation Account is not specified for Product Category: %s"
-msgstr ""
+msgstr "%s Ürün Kategorisi için Değişim Hesabı belirtilmedi"
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
@@ -42,23 +42,23 @@ msgstr "Zincirlenmiş Lokasyon Sabit ise"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Put in a new pack"
-msgstr ""
+msgstr "Yeni bir pakete yerleştir"
 
 #. module: stock
 #: field:stock.move.split.lines,action:0
 msgid "Action"
-msgstr "İşlem"
+msgstr "Eylem"
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Upstream Traceability"
-msgstr ""
+msgstr "Üretime Dönük İzlenebilirlik"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
 #: model:ir.ui.menu,name:stock.menu_report_stock_line_date
 msgid "Last Product Inventories"
-msgstr ""
+msgstr "Son Ürün Envanterleri"
 
 #. module: stock
 #: view:stock.move:0
@@ -68,20 +68,20 @@ msgstr "Bugün"
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
 msgid "Revision Number"
-msgstr ""
+msgstr "Revizyon Numarası"
 
 #. module: stock
 #: view:stock.move.memory.in:0
 #: view:stock.move.memory.out:0
 msgid "Product Moves"
-msgstr ""
+msgstr "Ürün Hareketleri"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_move_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_move_report
 #: view:report.stock.move:0
 msgid "Moves Analysis"
-msgstr ""
+msgstr "Hareket Analizleri"
 
 #. module: stock
 #: help:stock.production.lot,ref:0
@@ -89,6 +89,7 @@ msgid ""
 "Internal reference number in case it differs from the manufacturer's serial "
 "number"
 msgstr ""
+"Üretici seri numarasından farklı olması durumunda dahili referans numarası"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_inventory_form
@@ -97,11 +98,15 @@ msgid ""
 "per location. You can use it once a year when you do the general inventory "
 "or whenever you need it, to correct the current stock level of a product."
 msgstr ""
+"Periyodik Envanterler lokasyona göre mevcut ürün sayısını hesaplamak için "
+"kullanılır. Bunu genel envanter hazırlarken yılda bir kez, her ihtiyaç "
+"duyduğunuzda, bir ürünün mevcut stok seviyesini düzeltmek için "
+"kullanabilirsiniz."
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Picking list"
-msgstr ""
+msgstr "Alım listesi"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -133,6 +138,8 @@ msgid ""
 "This is the list of all delivery orders that have to be prepared, according "
 "to your different sales orders and your logistics rules."
 msgstr ""
+"Bu, çeşitli satış siparişleri ve lojistik kurallarınıza göre hazırlanması "
+"gereken tüm teslimat siparişlerinin listesidir."
 
 #. module: stock
 #: view:report.stock.move:0
@@ -148,15 +155,15 @@ msgstr "Gün"
 #: view:stock.picking:0
 #: view:stock.production.lot:0
 msgid "UoM"
-msgstr "Birim"
+msgstr "Ölçü Birimi"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:90
+#: code:addons/stock/wizard/stock_change_product_qty.py:104
 #: model:ir.actions.act_window,name:stock.action_inventory_form
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form
 #, python-format
 msgid "Physical Inventories"
-msgstr ""
+msgstr "Fiziksel Stoklar"
 
 #. module: stock
 #: field:product.category,property_stock_journal:0
@@ -178,25 +185,29 @@ msgid ""
 "value for all products in this category, it can also directly be set on each "
 "product."
 msgstr ""
+"Gerçek zamanlı envanter değerlendirmesi yaparken, tüm giden stok hareketleri "
+"için muadil Defter Öğeleri bu hesaba gönderilecektir. Bu, bu kategorideki "
+"tüm ürünler için varsayılan değerdir, ayrıca her bir üründe doğrudan "
+"ayarlanabilir."
 
 #. module: stock
-#: code:addons/stock/stock.py:1176
-#: code:addons/stock/stock.py:2378
+#: code:addons/stock/stock.py:1170
+#: code:addons/stock/stock.py:2415
 #, python-format
 msgid "Missing partial picking data for move #%s"
-msgstr ""
+msgstr "#%s hareketi için kısmi alım verileri eksik"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_partial_move
+#: model:ir.actions.server,name:stock.action_partial_move_server
 msgid "Deliver/Receive Products"
-msgstr ""
+msgstr "Ürün Alma/Teslim Etme"
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:135
 #, python-format
 msgid "You cannot delete any record!"
-msgstr ""
+msgstr "Hehangi bir kaydı silemezsiniz!"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:49
@@ -206,16 +217,19 @@ msgid ""
 "if you really want to change it '             #                        'for "
 "this product: \"%s\" (id: %d)"
 msgstr ""
+"Mevcut hareket kalemi zaten bir pakete atanmıştır, gerçekten değiştirmek "
+"istiyorsanız, lütfen öncelikle bunu kaldırın '             #                 "
+"       'bu ürün için: \"%s\" (id: %d)"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Not Applicable"
-msgstr "Uygun Değil"
+msgstr "Uygulanabilir Değil"
 
 #. module: stock
 #: help:stock.tracking,serial:0
 msgid "Other reference or serial number"
-msgstr ""
+msgstr "Diğer referans veya seri numarası"
 
 #. module: stock
 #: field:stock.move,origin:0
@@ -227,12 +241,12 @@ msgstr "Menşei"
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Non Inv"
-msgstr ""
+msgstr "Faturalandırılmamış"
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Identification"
-msgstr ""
+msgstr "Paket Kimliği"
 
 #. module: stock
 #: view:stock.move:0
@@ -240,13 +254,14 @@ msgstr ""
 #: field:stock.picking,name:0
 #: view:stock.production.lot:0
 msgid "Reference"
-msgstr "Referans"
+msgstr "Kaynak"
 
 #. module: stock
-#: code:addons/stock/stock.py:661
+#: code:addons/stock/stock.py:666
+#: code:addons/stock/stock.py:1472
 #, python-format
 msgid "Products to Process"
-msgstr ""
+msgstr "İşlenecek Ürünler"
 
 #. module: stock
 #: constraint:product.category:0
@@ -259,30 +274,33 @@ msgid ""
 "If checked, all product quantities will be set to zero to help ensure a real "
 "physical inventory is done"
 msgstr ""
+"Kontrol edildiyse, tüm ürün miktarları bir fiili fiziksel envanterin "
+"gerçekleştirilmesine yardımcı olmak üzere sıfırlanacaktır"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
 msgid "Split lines"
-msgstr ""
+msgstr "Ayırma çizgileri"
 
 #. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1120
 #, python-format
 msgid "You cannot cancel picking because stock move is in done state !"
-msgstr ""
+msgstr "Stok hareketi yapıldı durumunda olduğundan alımı iptal edemezsiniz!"
 
 #. module: stock
-#: code:addons/stock/stock.py:2198
-#: code:addons/stock/stock.py:2237
-#: code:addons/stock/stock.py:2297
+#: code:addons/stock/stock.py:2233
+#: code:addons/stock/stock.py:2274
+#: code:addons/stock/stock.py:2334
+#: code:addons/stock/wizard/stock_fill_inventory.py:53
 #, python-format
 msgid "Warning!"
-msgstr "Dikkat!"
+msgstr "Uyarı!"
 
 #. module: stock
 #: field:stock.invoice.onshipping,group:0
 msgid "Group by partner"
-msgstr "Cariye göre Gruplandır"
+msgstr "Paydaşa göre Gruplandır"
 
 #. module: stock
 #: model:ir.model,name:stock.model_res_partner
@@ -295,26 +313,26 @@ msgstr "Cariye göre Gruplandır"
 #: view:stock.picking:0
 #: field:stock.picking,partner_id:0
 msgid "Partner"
-msgstr "Ortak"
+msgstr "Paydaş"
 
 #. module: stock
 #: help:stock.move.memory.in,currency:0
 #: help:stock.move.memory.out,currency:0
 msgid "Currency in which Unit cost is expressed"
-msgstr ""
+msgstr "Birim maliyetin ifade edildiği para birimi"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:135
+#: code:addons/stock/wizard/stock_return_picking.py:126
 #, python-format
 msgid "No invoicing"
-msgstr ""
+msgstr "Faturalama yok"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
 #: field:stock.production.lot.revision,lot_id:0
 #: field:stock.report.prodlots,prodlot_id:0
 msgid "Production lot"
-msgstr "Üretim Lotu"
+msgstr "Üretim Partisi"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
@@ -324,23 +342,23 @@ msgstr "Ölçü Birimi Kategorileri"
 #. module: stock
 #: help:stock.incoterms,code:0
 msgid "Code for Incoterms"
-msgstr ""
+msgstr "Teslim Şekli Kodu"
 
 #. module: stock
 #: field:stock.tracking,move_ids:0
 msgid "Moves for this pack"
-msgstr ""
+msgstr "Bu pakete ait hareketler"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Internal Location"
-msgstr "Dahili Lokasyon"
+msgstr "İç Konum"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Confirm Inventory"
-msgstr "Envanteri Onayla"
+msgstr "Stok Onayla"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -366,12 +384,12 @@ msgstr "Fiili Stok Değeri"
 #. module: stock
 #: field:report.stock.move,day_diff2:0
 msgid "Lag (Days)"
-msgstr "Gecikme (gün)"
+msgstr "Gecikme (Gün)"
 
 #. module: stock
 #: model:ir.model,name:stock.model_action_traceability
 msgid "Action traceability "
-msgstr ""
+msgstr "İşlem izlenebilirliği "
 
 #. module: stock
 #: field:stock.location,posy:0
@@ -381,7 +399,7 @@ msgstr "Raflar (Y)"
 #. module: stock
 #: view:stock.move:0
 msgid "UOM"
-msgstr "Birim"
+msgstr "Ölçü Birimi"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -393,52 +411,53 @@ msgstr "Birim"
 #: view:stock.production.lot:0
 #: field:stock.production.lot,stock_available:0
 msgid "Available"
-msgstr "Mevcut"
+msgstr "Uygun"
 
 #. module: stock
 #: view:stock.picking:0
 #: field:stock.picking,min_date:0
 msgid "Expected Date"
-msgstr ""
+msgstr "Tahmini Tarih"
 
 #. module: stock
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_outgoing_product_board
 msgid "Outgoing Product"
-msgstr ""
+msgstr "Giden Ürün"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_warehouse_form
 msgid ""
 "Create and manage your warehouses and assign them a location from here"
 msgstr ""
+"Kendi depolarınızı oluşturup yönetin ve bunları buradan bir lokasyona atayın"
 
 #. module: stock
 #: field:report.stock.move,product_qty_in:0
 msgid "In Qty"
-msgstr ""
+msgstr "Gelen Miktar"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:115
+#: code:addons/stock/wizard/stock_fill_inventory.py:106
 #, python-format
 msgid "No product in this location."
-msgstr ""
+msgstr "Bu lokasyonda ürün yok."
 
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
 msgid "Location Output"
-msgstr "Lokasyon Çıkışı"
+msgstr "Çıkış Konumu"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.split_into
 #: model:ir.model,name:stock.model_stock_split_into
 msgid "Split into"
-msgstr ""
+msgstr "Böl"
 
 #. module: stock
 #: field:stock.move,price_currency_id:0
 msgid "Currency for average price"
-msgstr ""
+msgstr "Ortalama fiyat için para birimi"
 
 #. module: stock
 #: help:product.template,property_stock_account_input:0
@@ -447,33 +466,36 @@ msgid ""
 "incoming stock moves will be posted in this account. If not set on the "
 "product, the one from the product category is used."
 msgstr ""
+"Tüm gelen stoklar için gerçek zamanlı envanter değerlendirmesi, muadil "
+"Defter Öğeleri oluştururken bu hesaba gönderilecektir. Ürün üzerinde "
+"ayarlanmazsa, ürün kategorisinden biri kullanılır."
 
 #. module: stock
 #: field:report.stock.inventory,location_type:0
 #: field:stock.location,usage:0
 msgid "Location Type"
-msgstr "Lokasyon Tipi"
+msgstr "Konum Tipi"
 
 #. module: stock
 #: help:report.stock.move,type:0
 #: help:stock.picking,type:0
 msgid "Shipping type specify, goods coming in or going out."
-msgstr ""
+msgstr "Sevkiyat tipi belirtimi, giren veya çıkan mallar."
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
 msgid "Item Labels"
-msgstr ""
+msgstr "Öğe Etiketleri"
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_move
 msgid "Moves Statistics"
-msgstr ""
+msgstr "Hareket İstatistikleri"
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Product Lots Filter"
-msgstr ""
+msgstr "Ürün Lot Filtresi"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -488,44 +510,46 @@ msgstr "["
 msgid ""
 "Current quantity of products with this Production Lot Number available in "
 "company warehouses"
-msgstr ""
+msgstr "Firmanın depolarında bu Ürün Lot Numarasıyla mevcut ürün miktarı"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
 msgid "Move History (child moves)"
-msgstr ""
+msgstr "Hareket Geçmişi (alt hareketler)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1984
+#: code:addons/stock/stock.py:2015
 #, python-format
 msgid ""
 "There is no stock output account defined for this product or its category: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Bu ürün veya kategorisi için tanımlanan bir stok çıkış hesabı mevcut değil: "
+"\"%s\" (id: %d)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree6
 #: field:stock.picking,move_lines:0
 msgid "Internal Moves"
-msgstr "Dahili Hareketler"
+msgstr "İç Hareketler"
 
 #. module: stock
 #: field:stock.move,location_dest_id:0
 msgid "Destination Location"
-msgstr ""
+msgstr "Hedef Lokasyon"
 
 #. module: stock
-#: code:addons/stock/stock.py:751
+#: code:addons/stock/stock.py:754
 #, python-format
 msgid "You can not process picking without stock moves"
-msgstr ""
+msgstr "Stok hareketleri olmadan alımı gerçekleştiremezsiniz"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
 #: field:stock.move,product_packaging:0
 msgid "Packaging"
-msgstr "Sevkiyat Paketlemesi"
+msgstr "Paketleme"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -546,11 +570,15 @@ msgid ""
 "buttons on the right of each line. You can filter the products to deliver by "
 "customer, products or sale order (using the Origin field)."
 msgstr ""
+"Bu listede, müşterilerinize teslim etmeniz gereken tüm ürünleri "
+"bulabilirsiniz. Bu listeden, her bir satırın sağındaki düğmeleri kullanarak "
+"teslimatları doğrudan işleyebilirsiniz. Müşteriye teslim edilecek ürünleri, "
+"ürün ve satış siparişini (Orijin alanını kullanarak) filtreleyebilirsiniz."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
 msgid "Inventory Control"
-msgstr ""
+msgstr "Stok Kontrolü"
 
 #. module: stock
 #: view:stock.location:0
@@ -562,23 +590,23 @@ msgstr "Ek Bilgi"
 #: report:lot.stock.overview:0
 #: report:lot.stock.overview_all:0
 msgid "Location / Product"
-msgstr ""
+msgstr "Lokasyon / Ürün"
 
 #. module: stock
-#: code:addons/stock/stock.py:1306
+#: code:addons/stock/stock.py:1303
 #, python-format
 msgid "Reception"
-msgstr ""
+msgstr "Kabul"
 
 #. module: stock
 #: field:stock.tracking,serial:0
 msgid "Additional Reference"
-msgstr ""
+msgstr "Ek Referans"
 
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Production Lot Revisions"
-msgstr "Üretim Lot Revizyonu"
+msgstr "Ürün Parti Revizyonu"
 
 #. module: stock
 #: help:product.product,track_outgoing:0
@@ -586,6 +614,8 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "going to a Customer Location"
 msgstr ""
+"Bu ürün için mevcut olan ve bir Müşteri Lokasyonuna giden tüm hareketler "
+"için bir Üretim Lotu belirtmeye zorlar"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_journal_form
@@ -595,17 +625,21 @@ msgid ""
 "worker/team that should perform the operation. Examples of stock journals "
 "may be: quality control, pick lists, packing, etc."
 msgstr ""
+"Stok defteri sistemi her bir stok operasyonunu, operasyonu gerçekleştirecek "
+"çalışan/ekip veya gerçekleştirilecek olan operasyonun türüne göre belirli "
+"bir deftere atamanıza olanak sağlar. Stok defterlerine örnek olarak şunlar "
+"verilebilir: kalite kontrol, alım listeleri, paketleme vb."
 
 #. module: stock
 #: field:stock.location,complete_name:0
 #: field:stock.location,name:0
 msgid "Location Name"
-msgstr "Lokasyon Adı"
+msgstr "Konum Adı"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Posted Inventory"
-msgstr ""
+msgstr "Gönderilen Stok"
 
 #. module: stock
 #: view:stock.move:0
@@ -616,12 +650,12 @@ msgstr "Hareket Bilgisi"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Giden"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "August"
-msgstr ""
+msgstr "Ağustos"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_tracking_form
@@ -629,27 +663,27 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_action_tracking_form
 #: view:stock.tracking:0
 msgid "Packs"
-msgstr ""
+msgstr "Paketler"
 
 #. module: stock
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Aynı üründen olmayan bir lot atamaya çalışıyorsunuz"
 
 #. module: stock
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "Alış & Satış Bilgileri"
+msgstr "Satışlar & Satınalmalar"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "June"
-msgstr ""
+msgstr "Haziran"
 
 #. module: stock
 #: field:product.template,property_stock_procurement:0
 msgid "Procurement Location"
-msgstr "Satınalma Lokasyonu"
+msgstr "Satınalma Konumu"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_production_lot_form
@@ -659,7 +693,7 @@ msgstr "Satınalma Lokasyonu"
 #: field:stock.move.split,line_exist_ids:0
 #: field:stock.move.split,line_ids:0
 msgid "Production Lots"
-msgstr "Üretim Lotları"
+msgstr "Üretim Partileri"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -670,17 +704,17 @@ msgstr "Alıcı"
 #: model:ir.actions.act_window,name:stock.action_location_tree
 #: model:ir.ui.menu,name:stock.menu_action_location_tree
 msgid "Location Structure"
-msgstr ""
+msgstr "Lokasyon Yapısı"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "October"
-msgstr ""
+msgstr "Ekim"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line
 msgid "Inventory Line"
-msgstr ""
+msgstr "Stok Kalemi"
 
 #. module: stock
 #: help:product.category,property_stock_journal:0
@@ -688,17 +722,20 @@ msgid ""
 "When doing real-time inventory valuation, this is the Accounting Journal in "
 "which entries will be automatically posted when stock moves are processed."
 msgstr ""
+"Gerçek zamanlı envanter değerlendirmesi yaparken, stok hareketlerinin "
+"işlenmesi sırasında girdilerin otomatik olarak gönderileceği Hesap "
+"Defteridir."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
 msgid "Process Picking"
-msgstr ""
+msgstr "İşlem Alma"
 
 #. module: stock
-#: code:addons/stock/product.py:355
+#: code:addons/stock/product.py:358
 #, python-format
 msgid "Future Receptions"
-msgstr ""
+msgstr "Gelecek Kabuller"
 
 #. module: stock
 #: help:stock.inventory.line.split,use_exist:0
@@ -707,11 +744,13 @@ msgid ""
 "Check this option to select existing lots in the list below, otherwise you "
 "should enter new ones line by line."
 msgstr ""
+"Aşağıdaki listede mevcut lotları seçmek için bu şeçeneği işaretleyin, aksi "
+"halde kalem kalem yeni lot girmeniz gerekir."
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
 msgid "Destination Move"
-msgstr ""
+msgstr "Hedef Hareket"
 
 #. module: stock
 #: view:stock.move:0
@@ -722,27 +761,27 @@ msgstr "Şimdi İşle"
 #. module: stock
 #: field:stock.location,address_id:0
 msgid "Location Address"
-msgstr "Lokasyon Adresi"
+msgstr "Konum Adresi"
 
 #. module: stock
 #: help:stock.move,prodlot_id:0
 msgid "Production lot is used to put a serial number on the production"
-msgstr ""
+msgstr "Üretim lotu ürüne bir seri numarası vermek için kullanılır"
 
 #. module: stock
 #: field:stock.warehouse,lot_input_id:0
 msgid "Location Input"
-msgstr "Lokasyon Girişi"
+msgstr "Konum Girişi"
 
 #. module: stock
 #: help:stock.picking,date:0
 msgid "Date of Order"
-msgstr ""
+msgstr "Sipariş Tarihi"
 
 #. module: stock
 #: selection:product.product,valuation:0
 msgid "Periodical (manual)"
-msgstr ""
+msgstr "Periyodik (manuel)"
 
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
@@ -757,45 +796,45 @@ msgstr "Bilişim Tedarikçileri"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form_draft
 msgid "Draft Physical Inventories"
-msgstr ""
+msgstr "Fiziksel Taslak Envanterler"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Transit Location for Inter-Companies Transfers"
-msgstr ""
+msgstr "Ara Firma Transferleri için Geçiş Lokasyonu"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
 #: model:ir.model,name:stock.model_stock_change_product_qty
 #: view:stock.change.product.qty:0
 msgid "Change Product Quantity"
-msgstr ""
+msgstr "Ürün Miktarını Değiştir"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
 msgid "Merge Inventory"
-msgstr ""
+msgstr "Stok Birleştir"
 
 #. module: stock
-#: code:addons/stock/product.py:371
+#: code:addons/stock/product.py:374
 #, python-format
 msgid "Future P&L"
-msgstr ""
+msgstr "Gelecek Kâr ve Zarar"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4
 #: view:stock.picking:0
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "Gelen Sevkiyatlar"
 
 #. module: stock
 #: view:report.stock.inventory:0
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Scrap"
-msgstr ""
+msgstr "Hurda"
 
 #. module: stock
 #: field:stock.location,child_ids:0
@@ -805,12 +844,12 @@ msgstr "İçerir"
 #. module: stock
 #: view:board.board:0
 msgid "Incoming Products Delay"
-msgstr ""
+msgstr "Gelen Ürün Gecikmesi"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Locations"
-msgstr ""
+msgstr "Stok Lokasyonları"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -822,17 +861,17 @@ msgstr "Birim Fiyat"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines_exist
 msgid "Exist Split lines"
-msgstr ""
+msgstr "Mevcut Ayırma çizgileri"
 
 #. module: stock
 #: field:stock.move,date_expected:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Planlanan Tarih"
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Search"
-msgstr ""
+msgstr "Paket Arama"
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -843,13 +882,13 @@ msgstr "Acil"
 #: view:stock.picking:0
 #: report:stock.picking.list:0
 msgid "Journal"
-msgstr ""
+msgstr "Yevmiye"
 
 #. module: stock
 #: code:addons/stock/stock.py:1315
 #, python-format
 msgid "is scheduled %s."
-msgstr ""
+msgstr "%s planlanmıştır."
 
 #. module: stock
 #: help:stock.picking,location_id:0
@@ -858,21 +897,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 ""
+"Tamamlanmış ürünlerin gerektiği lokasyonda üretim yapıyorsanız, boş tutun. "
+"Sabit bir lokasyonda üretim yapıyorsanız, bir lokasyon ayarlayın. Üretim "
+"operasyonlarına taşeronluk yapıyorsanız, bu bir ortak lokasyonu olabilir."
 
 #. module: stock
 #: view:res.partner:0
 msgid "Inventory Properties"
-msgstr ""
+msgstr "Stok Özellikleri"
 
 #. module: stock
 #: field:report.stock.move,day_diff:0
 msgid "Execution Lead Time (Days)"
-msgstr ""
+msgstr "İcra Tamamlama Süresi (Gün)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
 msgid "Stock by Location"
-msgstr "Lokasyona göre Stok"
+msgstr "Konuma göre Stok"
 
 #. module: stock
 #: help:stock.move,address_id:0
@@ -880,17 +922,20 @@ msgid ""
 "Optional address where goods are to be delivered, specifically used for "
 "allotment"
 msgstr ""
+"Özellikle tahsis etmek için kullanılan, malların teslim edileceği isteğe "
+"bağlı adres"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Month-1"
-msgstr ""
+msgstr "Ay-1"
 
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
 "By unchecking the active field, you may hide a location without deleting it."
 msgstr ""
+"Aktif alanın işaretini kaldırarak, bir lokasyonu silmeden gizleyebilirsiniz."
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
@@ -911,41 +956,41 @@ msgstr "Görünüm"
 #. module: stock
 #: field:stock.location,parent_left:0
 msgid "Left Parent"
-msgstr ""
+msgstr "Sol Üst Öğe"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:132
 #, python-format
 msgid "Delivery Information"
-msgstr ""
+msgstr "Teslimat Bilgileri"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:48
 #, python-format
 msgid "Stock Inventory is done"
-msgstr ""
+msgstr "Stok Envanteri yapıldı"
 
 #. module: stock
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz kazanç kodu"
 
 #. module: stock
 #: code:addons/stock/product.py:148
 #, python-format
 msgid ""
 "There is no stock output account defined for this product: \"%s\" (id: %d)"
-msgstr ""
+msgstr "Bu ürün için belirtilen bir stok çıkış hesabı yok: \"%s\" (id: %d)"
 
 #. module: stock
 #: field:product.template,property_stock_production:0
 msgid "Production Location"
-msgstr "Üretim Lokasyonu"
+msgstr "Üretim Konumu"
 
 #. module: stock
 #: help:stock.picking,address_id:0
 msgid "Address of partner"
-msgstr ""
+msgstr "Cari adresi"
 
 #. module: stock
 #: model:res.company,overdue_msg:stock.res_company_shop0
@@ -967,6 +1012,21 @@ msgid ""
 "%(company_name)s\n"
 "        "
 msgstr ""
+"\n"
+"Tarih: %(date)s\n"
+"\n"
+"Sayın %(partner_name)s,\n"
+"\n"
+"Ekte, aşağıdaki toplam tutardaki ödenmeyen tüm faturalarınız için bir "
+"hatırlatma bulunmaktadır:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Teşekkürler,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s\n"
+"        "
 
 #. module: stock
 #: help:stock.location,usage:0
@@ -995,6 +1055,27 @@ msgid ""
 "location consumes the raw material and produces finished products\n"
 "                      "
 msgstr ""
+"* Tedarikçi Lokasyonu: Tedarikçilerinizden gelen ürünlerin kaynak "
+"lokasyonunu temsil eden sanal lokasyon\n"
+"                       \n"
+"* Görünüm: Deponuz için, alt lokasyonlarını birleştiren bir hiyerarşik yapı "
+"oluşturan sanal lokasyon; doğrudan ürünleri içeremez\n"
+"                       \n"
+"* Dahili Lokasyon: Kendi depolarınızdaki fiziksel lokasyonlar,\n"
+"                       \n"
+"* Müşteri Lokasyonu: Müşterilerinize gönderilen ürünler için hedef lokasyonu "
+"temsil eden sanal lokasyon\n"
+"                       \n"
+"* Envanter: Stok seviyelerini düzeltmek için envanter operasyonları muadili "
+"olarak görev yapan sanal lokasyon (Fiziksel envanterler)\n"
+"                       \n"
+"* Satınalma: Kaynak (tedarikçi veya üretim) henüz bilinmiyorken satınalma "
+"operasyonları geçici muadili olarak görev yapan sanal lokasyon. Satınalma "
+"zamanlayıcısı çalışmayı durdurduğunda, bu lokasyon boş olmalıdır.\n"
+"                       \n"
+"* Üretim: Üretim operasyonları için sanal muadil: bu lokasyon işlenmemiş "
+"materyalleri sarf ederek tamamlanmış ürün oluşturur\n"
+"                      "
 
 #. module: stock
 #: field:stock.production.lot.revision,author_id:0
@@ -1002,46 +1083,46 @@ msgid "Author"
 msgstr "Yazar"
 
 #. module: stock
-#: code:addons/stock/stock.py:1305
+#: code:addons/stock/stock.py:1302
 #, python-format
 msgid "Delivery Order"
-msgstr ""
+msgstr "Teslim Emri"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_memory_in
 msgid "stock.move.memory.in"
-msgstr ""
+msgstr "stok.hareket.hafıza.içeri"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Manual Operation"
-msgstr "Manuel Operasyon"
+msgstr "Manuel İşlem"
 
 #. module: stock
 #: view:stock.location:0
 #: view:stock.move:0
 msgid "Supplier"
-msgstr ""
+msgstr "Tedarikçi"
 
 #. module: stock
 #: field:stock.picking,date_done:0
 msgid "Date Done"
-msgstr "Tamamlanan Tarih"
+msgstr "Bitiş Tarihi"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Expected Shipping Date"
-msgstr "Tahmini Sevk Tarihi"
+msgstr "Tahmini Yükleme Tarihi"
 
 #. module: stock
 #: selection:stock.move,state:0
 msgid "Not Available"
-msgstr ""
+msgstr "Mevcut Değil"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "March"
-msgstr ""
+msgstr "Mart"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_inventory_line_split
@@ -1049,12 +1130,12 @@ msgstr ""
 #: view:stock.inventory:0
 #: view:stock.inventory.line:0
 msgid "Split inventory lines"
-msgstr ""
+msgstr "Stok Satırlarını Böl"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Physical Inventory"
-msgstr ""
+msgstr "Fiziksel Stok"
 
 #. module: stock
 #: help:stock.location,chained_company_id:0
@@ -1062,6 +1143,8 @@ msgid ""
 "The company the Picking List containing the chained move will belong to "
 "(leave empty to use the default company determination rules"
 msgstr ""
+"Zincirlenen hareketi içeren Alım Listesinin ait olacağı firma (varsayılan "
+"firma belirleme kurallarını kullanmak için boş bırakın"
 
 #. module: stock
 #: help:stock.location,chained_picking_type:0
@@ -1070,18 +1153,21 @@ msgid ""
 "empty to automatically detect the type based on the source and destination "
 "locations)."
 msgstr ""
+"Zincirlenen hareketi içerecek olan Alım Listesinin Sevkiyat Türü (sevkiyat "
+"türünü kaynak ve hedef lokasyonlara göre otomatik olarak belirlemek için boş "
+"bırakın)."
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Lot number"
-msgstr ""
+msgstr "Lot numarası"
 
 #. module: stock
 #: field:stock.inventory.line,product_uom:0
 #: field:stock.move.consume,product_uom:0
 #: field:stock.move.scrap,product_uom:0
 msgid "Product UOM"
-msgstr "Birim"
+msgstr "Ürün Ölçü Birimi"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
@@ -1092,28 +1178,29 @@ msgstr "Cari Lokasyonu"
 #: view:report.stock.inventory:0
 #: view:report.stock.move:0
 msgid "Total quantity"
-msgstr ""
+msgstr "Toplam miktar"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_consume
 #: view:stock.move.consume:0
 msgid "Consume Move"
-msgstr ""
+msgstr "Tüketim Hareketi"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
 msgid "European Customers"
-msgstr ""
+msgstr "Avrupalı Müşteriler"
 
 #. module: stock
 #: help:stock.location,chained_delay:0
 msgid "Delay between original move and chained move in days"
 msgstr ""
+"Gün olarak orijinal hareket ve zincirlenen hareket arasındaki gecikme"
 
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import current product inventory from the following location"
-msgstr ""
+msgstr "Aşağıdaki lokasyondan mevcut ürün envanterini al"
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
@@ -1124,11 +1211,16 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
+"Sadece zincirlenen bir lokasyon türü seçmeniz durumunda kullanılır.\n"
+"'Otomatik Hareket' değeri, otomatik olarak onaylanacak bir değerden sonra "
+"bir stok hareketi oluşturacaktır. 'Manuel Operasyon' durumunda, stok "
+"hareketi bir çalışan tarafından onaylanmalıdır. 'Otomatik No Adımı Eklendi' "
+"durumunda, lokasyon orijinal harekette değiştirilir."
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Downstream Traceability"
-msgstr ""
+msgstr "Çıkış İzlenebilirliği"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1137,20 +1229,24 @@ msgid ""
 "default one, as the source location for stock moves generated by production "
 "orders"
 msgstr ""
+"Mevcut ürün için, ürün siparişleri tarafından oluşturulan stok hareketleri "
+"için kaynak konum olarak, varsayılan yerine bu stok lokasyonu kullanılacaktır"
 
 #. module: stock
-#: code:addons/stock/stock.py:1975
+#: code:addons/stock/stock.py:2006
 #, python-format
 msgid ""
 "Can not create Journal Entry, Output Account defined on this product and "
 "Variant account on category of this product are same."
 msgstr ""
+"Bu üründe belirtilen Defter Giriş, Çıkış Hesabı oluşturulamıyor ve bu ürün "
+"kategorisinde Varyant hesabı aynıdır."
 
 #. module: stock
-#: code:addons/stock/stock.py:1322
+#: code:addons/stock/stock.py:1319
 #, python-format
 msgid "is in draft state."
-msgstr ""
+msgstr "taslak durumunda."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_tracking_form
@@ -1158,27 +1254,29 @@ msgid ""
 "This is the list of all your packs. When you select a Pack, you can get the "
 "upstream or downstream traceability of the products contained in the pack."
 msgstr ""
+"Bu tüm paketlerinizin bir listesidir. Bir Paket seçtiğinizde, pakette "
+"bulunan ürünlerin giriş veya çıkış izlenebilirliğini elde edebilirsiniz."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_ups_final
 msgid "Stock ups final"
-msgstr ""
+msgstr "Stok çıkış sonucu"
 
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
 msgid "Chaining Type"
-msgstr ""
+msgstr "Zincirleme Türü"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:135
+#: code:addons/stock/wizard/stock_return_picking.py:126
 #, python-format
 msgid "To be refunded/invoiced"
-msgstr ""
+msgstr "İade edilecek/faturalandırılacak"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop0
 msgid "Shop 1"
-msgstr ""
+msgstr "Mağaza 1"
 
 #. module: stock
 #: view:stock.change.product.qty:0
@@ -1192,12 +1290,12 @@ msgstr ""
 #: view:stock.picking:0
 #: view:stock.split.into:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_İptal"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Ready"
-msgstr ""
+msgstr "Hazır"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1207,13 +1305,13 @@ msgstr "Takvimi Göster"
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional Info"
-msgstr ""
+msgstr "Ek Bilgi"
 
 #. module: stock
-#: code:addons/stock/stock.py:1602
+#: code:addons/stock/stock.py:1619
 #, python-format
 msgid "Operation forbidden"
-msgstr ""
+msgstr "Operasyon yasaklandı"
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1221,10 +1319,12 @@ msgid "From"
 msgstr "Başlangıç"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:79
+#: code:addons/stock/wizard/stock_return_picking.py:77
 #, python-format
 msgid "You may only return pickings that are Confirmed, Available or Done!"
 msgstr ""
+"Alımları sadece Onaylandı, Mevcut veya Gerçekleştirildi durumundayken iade "
+"edebilirsiniz!"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1240,7 +1340,7 @@ msgstr "Üretim Lot Revizyonu"
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Picking List"
-msgstr ""
+msgstr "Dahili Alım Listesi"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -1260,13 +1360,13 @@ msgstr "Böl"
 #. module: stock
 #: view:stock.picking:0
 msgid "Search Stock Picking"
-msgstr ""
+msgstr "Stok Alımı Arama"
 
 #. module: stock
 #: code:addons/stock/product.py:93
 #, python-format
 msgid "Company is not specified in Location"
-msgstr ""
+msgstr "Lokasyonda firma belirtilmemiş"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1277,12 +1377,12 @@ msgstr "Tipi"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_5
 msgid "Generic IT Suppliers"
-msgstr ""
+msgstr "Genel IT Tedarikçileri"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Picking List:"
-msgstr ""
+msgstr "Alım Listesi:"
 
 #. module: stock
 #: field:stock.inventory,date:0
@@ -1290,7 +1390,7 @@ msgstr ""
 #: field:stock.production.lot,date:0
 #: field:stock.tracking,date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Oluşturma Tarihi"
 
 #. module: stock
 #: field:report.stock.lines.date,id:0
@@ -1300,7 +1400,7 @@ msgstr "Envanter Kalem No"
 #. module: stock
 #: help:stock.location,address_id:0
 msgid "Address of  customer or supplier."
-msgstr ""
+msgstr "Müşteri veya tedarikçini adresi."
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1319,24 +1419,24 @@ msgstr "Müşteri Lokasyonu"
 #: code:addons/stock/wizard/stock_partial_move.py:85
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Geçersiz işlem!"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:139
 #, python-format
 msgid "Receive Information"
-msgstr ""
+msgstr "Bilgi Al"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
 #: report:lot.stock.overview:0
 msgid "Location Inventory Overview"
-msgstr ""
+msgstr "Lokasyon Envanteri Genel Görünümü"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_replacement
 msgid "Stock Replacement"
-msgstr ""
+msgstr "Stok Değişimi"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1349,39 +1449,42 @@ msgid "None"
 msgstr "Yok"
 
 #. module: stock
+#: model:ir.actions.act_window,name:stock.action3
 #: view:stock.tracking:0
 msgid "Downstream traceability"
-msgstr ""
+msgstr "Çıkış izlenebilirliği"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:113
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:101
 #, python-format
 msgid "No Invoices were created"
-msgstr ""
+msgstr "Hiçbir Fatura oluşturulmadı"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
 msgid "OpenERP S.A."
-msgstr ""
+msgstr "OpenERP S.A."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:140
 #, python-format
 msgid "Receive"
-msgstr ""
+msgstr "Al"
 
 #. module: stock
 #: help:stock.incoterms,active:0
 msgid ""
 "By unchecking the active field, you may hide an INCOTERM without deleting it."
 msgstr ""
+"Aktif alanın işaretini kaldırarak, bir TESLİM ŞEKLİNİ silmeden "
+"gizleyebilirsiniz."
 
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
 #: field:stock.picking,date:0
 msgid "Order Date"
-msgstr ""
+msgstr "Sipariş Tarihi"
 
 #. module: stock
 #: field:stock.location,location_id:0
@@ -1399,33 +1502,41 @@ msgid ""
 "* Done: has been processed, can't be modified or cancelled anymore\n"
 "* Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr ""
+"* Taslak: henüz onaylanmamış ve onaylanana kadar zamanlanmayacak\n"
+"* Onaylandı: hala ürün mevcudiyeti bekleniyor\n"
+"* Mevcut: ürünler rezerve edildi, sadece onay bekleniyor.\n"
+"* Beklemede: otomatik olarak mevcut olmadan önce uygulanacak başka bir adım "
+"bekleniyor (örn. Sipariş Verme akışları)\n"
+"* Gerçekleştirildi: işlendiği için artık değiştirilemez veya iptal edilemez\n"
+"* İptal edildi: iptal edilmiştir ve artık onaylanamaz"
 
 #. module: stock
 #: help:stock.location,company_id:0
 msgid "Let this field empty if this location is shared between all companies"
 msgstr ""
+"Bu lokasyon tüm firmalar arasında paylaşılıyorsa, bu alanı boş bırakın"
 
 #. module: stock
-#: code:addons/stock/stock.py:2198
+#: code:addons/stock/stock.py:2233
 #, python-format
 msgid "Please provide a positive quantity to scrap!"
-msgstr ""
+msgstr "Lütfen ıskarta için pozitif bir değer girin!"
 
 #. module: stock
 #: field:stock.location,chained_delay:0
 msgid "Chaining Lead Time"
-msgstr ""
+msgstr "Zincirleme Tedarik Süresi"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:85
 #, python-format
 msgid "Cannot deliver products which are already delivered !"
-msgstr ""
+msgstr "Daha önceden teslim edilmiş ürünler teslim edilemez!"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
 msgid "Stock Invoice Onshipping"
-msgstr ""
+msgstr "Sevkiyatta Stok Faturalandırma"
 
 #. module: stock
 #: help:stock.move,state:0
@@ -1437,6 +1548,13 @@ msgid ""
 " When the picking is done the state is 'Done'.              \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
+"Stok hareketi oluşturulduğunda 'Taslak' durumundadır.\n"
+" Daha sonra, zamanlayıcı ürünleri bulamazsa 'Mevcut değil' durumuna "
+"ayarlanır.\n"
+" Ürünler rezerve edildiğinde, durum 'Mevcut' olarak ayarlanır.\n"
+" Alım yapıldığında, durum 'Gerçekleştirildi' olarak ayarlanır.              "
+"\n"
+"Hareket, başka bir hareketi bekliyorsa, durum 'Beklemede' olur."
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1446,21 +1564,21 @@ msgid "Supplier Location"
 msgstr "Tedarikçi Lokasyonu"
 
 #. module: stock
-#: code:addons/stock/stock.py:2217
+#: code:addons/stock/stock.py:2254
 #, python-format
 msgid "were scrapped"
-msgstr ""
+msgstr "ıskartaya atıldı"
 
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Partial"
-msgstr ""
+msgstr "Kısmi"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "September"
-msgstr ""
+msgstr "Eylül"
 
 #. module: stock
 #: help:stock.picking,backorder_id:0
@@ -1468,22 +1586,24 @@ msgid ""
 "If this picking was split this field links to the picking that contains the "
 "other part that has been processed already."
 msgstr ""
+"Bu alım ayrıldıysa, bu alan daha önceden işlenmiş olan diğer bölümü içeren "
+"alıma bağlanır."
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
 msgid "Stock Statistics"
-msgstr ""
+msgstr "Stok İstatistikleri"
 
 #. module: stock
 #: field:stock.move.memory.in,currency:0
 #: field:stock.move.memory.out,currency:0
 msgid "Currency"
-msgstr ""
+msgstr "Para birimi"
 
 #. module: stock
 #: field:product.product,track_production:0
 msgid "Track Manufacturing Lots"
-msgstr ""
+msgstr "Üretim Lotlarını İzle"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:44
@@ -1491,6 +1611,8 @@ msgstr ""
 msgid ""
 "Please select multiple physical inventories to merge in the list view."
 msgstr ""
+"Lütfen, birleştirmek için liste görünümünde birden fazla fiziksel envanter "
+"seçin."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
@@ -1519,7 +1641,7 @@ msgstr "Kullanılırlığı İptal Et"
 #. module: stock
 #: help:stock.move,date_expected:0
 msgid "Scheduled date for the processing of this move"
-msgstr ""
+msgstr "Bu hareketin işlenmesi için zamanlanan tarih"
 
 #. module: stock
 #: field:stock.inventory,move_ids:0
@@ -1529,17 +1651,17 @@ msgstr "Oluşan Hareketler"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Shelf 2"
-msgstr ""
+msgstr "Raf 2"
 
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
 msgid "Tracking lot"
-msgstr ""
+msgstr "Lot izleme"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "Sipariş Bakiyeleri"
 
 #. module: stock
 #: view:product.product:0
@@ -1550,30 +1672,30 @@ msgstr "Parça-Sayaç Lokasyon Tercihleri"
 #. module: stock
 #: view:stock.location:0
 msgid "Localization"
-msgstr ""
+msgstr "Lokalizasyon"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_tracklots
 msgid "Stock report by tracking lots"
-msgstr ""
+msgstr "Lot izleyerek stok raporu"
 
 #. module: stock
-#: code:addons/stock/product.py:367
+#: code:addons/stock/product.py:370
 #, python-format
 msgid "Delivered Qty"
-msgstr ""
+msgstr "Teslim Edilen Miktar"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.track_line
 #: view:stock.inventory.line.split:0
 #: view:stock.move.split:0
 msgid "Split in lots"
-msgstr ""
+msgstr "Lotlara ayır"
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Numbers"
-msgstr ""
+msgstr "Üretim Lot Numaraları"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -1595,7 +1717,7 @@ msgstr "Tarih"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Uzatılmış Filtreler..."
 
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
@@ -1606,17 +1728,17 @@ msgstr "Lokasyon Stoğu"
 #: code:addons/stock/wizard/stock_inventory_merge.py:64
 #, python-format
 msgid "Merging is only allowed on draft inventories."
-msgstr ""
+msgstr "Birleştirme işlemine sadece taslak envanterlerde izin verilir."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_dashboard_stock
 msgid "Dashboard"
-msgstr ""
+msgstr "Performans değerlendirme panosu"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_track
 msgid "Track moves"
-msgstr ""
+msgstr "Hareketleri izle"
 
 #. module: stock
 #: field:stock.incoterms,code:0
@@ -1626,19 +1748,19 @@ msgstr "Kodu"
 #. module: stock
 #: view:stock.inventory.line.split:0
 msgid "Lots Number"
-msgstr ""
+msgstr "Lot Numarası"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.open_board_warehouse
 #: model:ir.ui.menu,name:stock.menu_board_warehouse
 msgid "Warehouse Dashboard"
-msgstr ""
+msgstr "Depo Performans Değerlendirme Panosu"
 
 #. module: stock
-#: code:addons/stock/stock.py:510
+#: code:addons/stock/stock.py:512
 #, python-format
 msgid "You can not remove a lot line !"
-msgstr ""
+msgstr "Bir lot satırını silemezsiniz!"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_scrap
@@ -1646,13 +1768,13 @@ msgstr ""
 #: view:stock.move.scrap:0
 #: view:stock.picking:0
 msgid "Scrap Products"
-msgstr ""
+msgstr "Iskarta Ürünler"
 
 #. module: stock
-#: code:addons/stock/stock.py:1135
+#: code:addons/stock/stock.py:1128
 #, python-format
 msgid "You cannot remove the picking which is in %s state !"
-msgstr ""
+msgstr "%s durumunda olan bir alımı silemezsiniz!"
 
 #. module: stock
 #: view:stock.inventory.line.split:0
@@ -1667,7 +1789,7 @@ msgstr "İptal"
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking
 #: model:ir.model,name:stock.model_stock_return_picking
 msgid "Return Picking"
-msgstr ""
+msgstr "Alıma Geri Dön"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1706,34 +1828,36 @@ msgid "Shipping Address :"
 msgstr "Teslimat Adresi:"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:120
+#: code:addons/stock/wizard/stock_return_picking.py:115
 #, python-format
 msgid "Provide the quantities of the returned products."
-msgstr ""
+msgstr "İade edilen ürünlerin miktarını girin."
 
 #. module: stock
-#: code:addons/stock/stock.py:1978
+#: code:addons/stock/stock.py:2009
 #, python-format
 msgid ""
 "Can not create Journal Entry, Input Account defined on this product and "
 "Variant account on category of this product are same."
 msgstr ""
+"Bu üründe belirtilen Defter Giriş, Giriş Hesabı oluşturulamıyor ve bu ürün "
+"kategorisinde Varyant hesabı aynıdır."
 
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Cost Price"
-msgstr ""
+msgstr "Maliyet Bedeli"
 
 #. module: stock
 #: view:product.product:0
 #: field:product.product,valuation:0
 msgid "Inventory Valuation"
-msgstr ""
+msgstr "Envanter Değerlendirmesi"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Fatura Oluştur"
 
 #. module: stock
 #: view:stock.move:0
@@ -1747,6 +1871,8 @@ msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for goods you receive from the current partner"
 msgstr ""
+"Mevcut ortaktan aldığınız malların kaynak lokasyonu olarak varsayılan yerine "
+"bu stok lokasyonu kullanılacaktır"
 
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
@@ -1759,6 +1885,9 @@ msgid ""
 "Technical field used to record the product cost set by the user during a "
 "picking confirmation (when average price costing method is used)"
 msgstr ""
+"Bir alım onayı sırasında kullanıcı tarafından ayarlanan ürün maliyetini "
+"kaydetmek için kullanılan teknik alan (ortalama fiyat maliyet metodu "
+"kullanılırken)"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_move_report
@@ -1767,21 +1896,24 @@ msgid ""
 "moves. Use this report when you want to analyse the different routes taken "
 "by your products and inventory management performance."
 msgstr ""
+"Hareket Analizi, firma stok hareketlerini kolayca kontol ve analiz etmenize "
+"olanak sağlar. Ürün ve envanter yönetim performansınızdan alınan çeşitli "
+"rotaları analiz etmek istediğinizde bu raporu kullanın."
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
 msgid "Planned Lead Time (Days)"
-msgstr ""
+msgstr "Planlanan Tedarik Süresi (Gün)"
 
 #. module: stock
 #: field:stock.change.standard.price,new_price:0
 msgid "Price"
-msgstr ""
+msgstr "Fiyat"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Search Inventory"
-msgstr ""
+msgstr "Envanter Arama"
 
 #. module: stock
 #: field:stock.move.track,quantity:0
@@ -1789,23 +1921,25 @@ msgid "Quantity per lot"
 msgstr "Lot başına Miktar"
 
 #. module: stock
-#: code:addons/stock/stock.py:1981
+#: code:addons/stock/stock.py:2012
 #, python-format
 msgid ""
 "There is no stock input account defined for this product or its category: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Bu ürün veya kategorisi tarafından tanımlanan hiçbir stok giriş hesabı "
+"mevcut değil: \"%s\" (id: %d)"
 
 #. module: stock
-#: code:addons/stock/product.py:357
+#: code:addons/stock/product.py:360
 #, python-format
 msgid "Received Qty"
-msgstr ""
+msgstr "Alınan Miktar"
 
 #. module: stock
 #: field:stock.production.lot,ref:0
 msgid "Internal Reference"
-msgstr ""
+msgstr "Dahili Referans"
 
 #. module: stock
 #: help:stock.production.lot,prefix:0
@@ -1813,13 +1947,15 @@ msgid ""
 "Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
 "[INT_REF]"
 msgstr ""
+"Bu seri numarasını görüntülerken başına eklenecek isteğe bağlı önek: "
+"ÖNEK/SERİ [INT_REF]"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_fill_inventory
 #: model:ir.model,name:stock.model_stock_fill_inventory
 #: view:stock.fill.inventory:0
 msgid "Import Inventory"
-msgstr ""
+msgstr "Envanter Al"
 
 #. module: stock
 #: field:stock.incoterms,name:0
@@ -1857,6 +1993,25 @@ msgid ""
 "day)\n"
 "    "
 msgstr ""
+"OpenERP Envanter Yönetim modülü çoklu depo, çoklu ve yapılandırılmış "
+"lokasyonları yönetebilirsiniz.\n"
+"Çift giriş yönetimi sayesinde, envanter kontrolü etkili ve esnektir:\n"
+"* Hareket geçmişi ve planlama,\n"
+"* Farklı envanter metotları (FIFO, LIFO, ...)\n"
+"* Stok değerlendirmesi (standart veya ortalama fiyat, ...)\n"
+"* Envanter farklılıklarına karşı dayanıklılık\n"
+"* Otomatik yeniden takrar sipariş verme kuralları (stok seviyesi, JIT, ...)\n"
+"* Verilen barkod\n"
+"* Çift giriş sistemiyle hataların hızlı algılanması\n"
+"* İzlenebilirlik (giriş/çıkış, üretim lotları, seri numarası, ...)\n"
+"* Depo performans değerlendirme tablosu şunları içerir:\n"
+"    * Gecikmeli alınacak ürünler (tarih < = bugün)\n"
+"    * İstisnai satınalma\n"
+"    * Grafik: Alınan ürünlerin planlanana göre sayısı (her gün için haftalık "
+"çubuk grafik)\n"
+"    * Grafik: Teslim edilen ürünlerin planlanana göre sayısı (her gün için "
+"haftalık çubuk grafik)\n"
+"    "
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -1865,27 +2020,30 @@ msgid ""
 "default one, as the source location for stock moves generated when you do an "
 "inventory"
 msgstr ""
+"Bir envanter oluştururken meydana gelen stok hareketleri için kaynak "
+"lokasyon olarak, mevcut ürün için, varsayılan yerine bu stok lokasyonu "
+"kullanılacaktır"
 
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Stockable"
-msgstr ""
+msgstr "Stoklanabilir"
 
 #. module: stock
 #: selection:product.product,valuation:0
 msgid "Real Time (automated)"
-msgstr ""
+msgstr "Gerçek Zaman (otomatik)"
 
 #. module: stock
 #: help:stock.move,tracking_id:0
 msgid "Logistical shipping unit: pallet, box, pack ..."
-msgstr ""
+msgstr "Lojistik sevikayat ünitesi: palet, kutu, paket ..."
 
 #. module: stock
 #: view:stock.change.product.qty:0
 #: view:stock.change.standard.price:0
 msgid "_Apply"
-msgstr ""
+msgstr "_Uygula"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -1893,7 +2051,7 @@ msgstr ""
 #: report:stock.inventory.move:0
 #: report:stock.picking.list:0
 msgid "]"
-msgstr ""
+msgstr "]"
 
 #. module: stock
 #: field:product.template,property_stock_inventory:0
@@ -1904,7 +2062,7 @@ msgstr "Envanter Lokasyonu"
 #: view:report.stock.inventory:0
 #: view:report.stock.move:0
 msgid "Total value"
-msgstr ""
+msgstr "Toplam değer"
 
 #. module: stock
 #: help:stock.location,chained_journal_id:0
@@ -1912,28 +2070,31 @@ msgid ""
 "Inventory Journal in which the chained move will be written, if the Chaining "
 "Type is not Transparent (no journal is used if left empty)"
 msgstr ""
+"Zincirleme Türü Şeffaf değilse, Zincirlenen hareketin yazdırılacağı Envanter "
+"Defteri (boş bırakılırsa, defter kullanılmaz)"
 
 #. module: stock
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_incoming_product_board
 msgid "Incoming Product"
-msgstr ""
+msgstr "Gelen Ürün"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Creation"
-msgstr ""
+msgstr "Oluşturma"
 
 #. module: stock
 #: field:stock.move.memory.in,cost:0
 #: field:stock.move.memory.out,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "Maliyet"
 
 #. module: stock
 #: field:product.category,property_stock_account_input_categ:0
 #: field:product.template,property_stock_account_input:0
 #: field:stock.change.standard.price,stock_account_input:0
+#: field:stock.location,valuation_in_account_id:0
 msgid "Stock Input Account"
 msgstr "Stok Giriş Hes."
 
@@ -1941,12 +2102,12 @@ msgstr "Stok Giriş Hes."
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
 #: model:ir.ui.menu,name:stock.menu_warehouse_config
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Depo Yönetimi"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "Partial Delivery"
-msgstr ""
+msgstr "Kısmi Teslimat"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1964,11 +2125,13 @@ msgid ""
 "Move date: scheduled date until move is done, then date of actual move "
 "processing"
 msgstr ""
+"Hareket tarihi: hareket gerçekleştirilinceye kadar ayarlanan tarih, gerçek "
+"hareket işleme tarihi"
 
 #. module: stock
 #: field:report.stock.lines.date,date:0
 msgid "Latest Inventory Date"
-msgstr ""
+msgstr "Son Envanter Tarihi"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -1978,7 +2141,7 @@ msgstr ""
 #: view:stock.picking:0
 #: view:stock.production.lot:0
 msgid "Group By..."
-msgstr ""
+msgstr "Şuna göre grupla..."
 
 #. module: stock
 #: view:stock.location:0
@@ -1988,31 +2151,31 @@ msgstr "Zincirlenmiş Lokasyon Bilgisi"
 #. module: stock
 #: model:stock.location,name:stock.location_inventory
 msgid "Inventory loss"
-msgstr ""
+msgstr "Envanter kaybı"
 
 #. module: stock
-#: code:addons/stock/stock.py:1314
+#: code:addons/stock/stock.py:1311
 #, python-format
 msgid "Document"
-msgstr ""
+msgstr "Belge"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Input Picking List"
-msgstr ""
+msgstr "Giriş Alım Listesi"
 
 #. module: stock
 #: field:stock.move,product_uom:0
 #: field:stock.move.memory.in,product_uom:0
 #: field:stock.move.memory.out,product_uom:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Ölçü Birimi"
 
 #. module: stock
 #: code:addons/stock/product.py:176
 #, python-format
 msgid "Products: "
-msgstr ""
+msgstr "Ürünler: "
 
 #. module: stock
 #: help:product.product,track_production:0
@@ -2020,6 +2183,8 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "generated by a Manufacturing Order"
 msgstr ""
+"Bu üründe mevcut tüm hareketler için bir Üretim Lotu belirlemeye zorlar ve "
+"bir Üretim Siparişi tarafından oluşturulur"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.track_line_old
@@ -2030,66 +2195,67 @@ msgstr "Bir Hareketi izle"
 #. module: stock
 #: view:product.product:0
 msgid "Update"
-msgstr ""
+msgstr "Güncelle"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Taslak Olarak Ayarla"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_journal_form
 #: model:ir.ui.menu,name:stock.menu_action_stock_journal_form
 msgid "Stock Journals"
-msgstr ""
+msgstr "Stok Defterleri"
 
 #. module: stock
 #: selection:report.stock.move,type:0
 msgid "Others"
-msgstr ""
+msgstr "Diğerleri"
 
 #. module: stock
 #: code:addons/stock/product.py:90
 #, python-format
 msgid "Could not find any difference between standard price and new price!"
 msgstr ""
+"Standart fiyat veya yeni fiyat arasında herhangi bir fark bulunamadı!"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
 msgid "Partial Picking"
-msgstr ""
+msgstr "Kısmi Alım"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_scrapped
 #: field:stock.move,scrapped:0
 msgid "Scrapped"
-msgstr ""
+msgstr "Iskartaya atıldı"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Products "
-msgstr ""
+msgstr "Ürünler "
 
 #. module: stock
 #: field:product.product,track_incoming:0
 msgid "Track Incoming Lots"
-msgstr ""
+msgstr "Gelen Lotları İzle"
 
 #. module: stock
 #: view:board.board:0
 msgid "Warehouse board"
-msgstr ""
+msgstr "Depo değerlendirme panosu"
 
 #. module: stock
-#: code:addons/stock/product.py:377
+#: code:addons/stock/product.py:380
 #, python-format
 msgid "Future Qty"
-msgstr ""
+msgstr "Gelecek Miktar"
 
 #. module: stock
 #: field:product.category,property_stock_variation:0
 msgid "Stock Variation Account"
-msgstr ""
+msgstr "Stok Varyasyon Hesabı"
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2112,13 +2278,13 @@ msgid "Shipping Type"
 msgstr "Sevkiyat Tipi"
 
 #. module: stock
-#: code:addons/stock/stock.py:2175
+#: code:addons/stock/stock.py:2210
 #, python-format
 msgid "You can only delete draft moves."
-msgstr ""
+msgstr "Sadece taslak hareketlerini silebilirsiniz."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:74
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #: model:ir.actions.act_window,name:stock.act_product_location_open
 #: model:ir.ui.menu,name:stock.menu_stock_products_menu
 #: view:stock.inventory:0
@@ -2130,7 +2296,7 @@ msgstr "Stok Kartları"
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Change Price"
-msgstr ""
+msgstr "Fiyatı Değiştir"
 
 #. module: stock
 #: field:stock.picking,move_type:0
@@ -2142,7 +2308,7 @@ msgstr "Teslimat Yöntemi"
 #: help:stock.move,location_dest_id:0
 #: help:stock.picking,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr ""
+msgstr "Sistemin tamamlanan ürünleri stoklayacağı lokasyon."
 
 #. module: stock
 #: help:product.category,property_stock_variation:0
@@ -2150,6 +2316,8 @@ msgid ""
 "When real-time inventory valuation is enabled on a product, this account "
 "will hold the current value of the products."
 msgstr ""
+"Bir ürün üzerinde gerçek zamanlı envanter değerlendirmesi "
+"etkinleştirildiğinde, bu hesap ürünün mevcut değerini tutacaktır."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_reception_picking_move
@@ -2160,6 +2328,11 @@ msgid ""
 "the supplier or the purchase order reference. Then you can confirm all "
 "products received using the buttons on the right of each line."
 msgstr ""
+"Hangi satınalma siparişi ve alım siparişinden geldiğine bakılmaksızın, "
+"buradan bağımsız ürünler alabilirsiniz. Beklediğiniz tüm ürünlerin listesini "
+"bulabilirsiniz. Bir sipariş aldığınızda, tedarikçinin adına veya satınalma "
+"siparişinin referansına göre filtreleyebilirsiniz. Herbir satırın sağ "
+"tarafındaki tuşları kullanarak, alınan tüm ürünleri onaylayabilirsiniz."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -2169,24 +2342,24 @@ msgstr "Stok Hareketi"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Delay(Days)"
-msgstr ""
+msgstr "Gecikme (Gün)"
 
 #. module: stock
 #: field:stock.move.memory.in,move_id:0
 #: field:stock.move.memory.out,move_id:0
 msgid "Move"
-msgstr ""
+msgstr "Hareket"
 
 #. module: stock
 #: help:stock.picking,min_date:0
 msgid "Expected date for the picking to be processed"
-msgstr ""
+msgstr "İşlenecek alım için beklenen tarih"
 
 #. module: stock
-#: code:addons/stock/product.py:373
+#: code:addons/stock/product.py:376
 #, python-format
 msgid "P&L Qty"
-msgstr ""
+msgstr "Kâr ve Zarar Miktarı"
 
 #. module: stock
 #: view:stock.production.lot:0
@@ -2197,7 +2370,7 @@ msgstr "Revizyonlar"
 #. module: stock
 #: view:stock.picking:0
 msgid "This operation will cancel the shipment. Do you want to continue?"
-msgstr ""
+msgstr "Bu operasyon sevkiyatı iptal edecektir. Devam etmek istiyor musunuz?"
 
 #. module: stock
 #: help:product.product,valuation:0
@@ -2208,6 +2381,11 @@ msgid ""
 "current inventory value, and the stock input and stock output account will "
 "hold the counterpart moves for incoming and outgoing products."
 msgstr ""
+"Bir ürün için gerçek zamanlı değerlendirme etkinleştirilirse, sistem stok "
+"hareketlerine ilişkin defter girdilerini otomatik olarak yazacaktır. Ürün "
+"kategorisinde açılan envanter varyasyonu mevcut envanter değerini temsil "
+"edecek ve stok giriş ve stok çıkış hesabı gelen ve giden ürünler için muadil "
+"hareketleri tutacaktır."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_inventory_report
@@ -2216,6 +2394,9 @@ msgid ""
 "levels. Sort and group by selection criteria in order to better analyse and "
 "manage your company  activities."
 msgstr ""
+"Envanter Analizi firmanızın stok seviyelerini kolayca kontrol ve analiz "
+"etmenize olanak sağlar. Firma etkinliklerinizi daha iyi analiz etmek ve "
+"yönetmek için seçim kriterine göre sıralayıp gruplayın."
 
 #. module: stock
 #: help:report.stock.move,location_id:0
@@ -2224,6 +2405,8 @@ msgid ""
 "Sets a location if you produce at a fixed location. This can be a partner "
 "location if you subcontract the manufacturing operations."
 msgstr ""
+"Sabit bir lokasyon oluşturmanız durumunda bir lokasyon ayarlar. Üretim "
+"operasyonlarını taşerona vermeniz durumunda, bu bir ortak lokasyonu olabilir."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_form
@@ -2238,17 +2421,25 @@ msgid ""
 "location to the Stock location. Each report can be performed on physical, "
 "partner or virtual locations."
 msgstr ""
+"Deponuzun yapısı ve organizasyonunu yansıtmak üzere lokasyonlarınızı "
+"tanımlayın. OpenERP fiziksel lokasyonları (depolar, raflar, silo vb.), ortak "
+"lokasyonlarını (müşteriler, tedarikçiler) ve üretim siparişleri tüketimleri, "
+"envanterler gibi stok operasyonları muadili sanal lokasyonları "
+"yönetebilmektedir. OpenERP'deki her stok operasyonu ürünleri bir lokasyondan "
+"başka bir lokasyona taşır. Örneğin, bir tedarikçiden ürün alırken, OpenERP "
+"ürünleri Tedarikçi lokasyonundan Stok lokasyonuna taşıyacaktır. Her bir "
+"rapor fiziksel, ortak veya sanal lokasyonlarda gerçekleştirilebilir."
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
 msgid "Create"
-msgstr ""
+msgstr "Oluştur"
 
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Dates"
-msgstr ""
+msgstr "Tarihler"
 
 #. module: stock
 #: field:stock.move,priority:0
@@ -2258,10 +2449,10 @@ msgstr "Öncelik"
 #. module: stock
 #: view:stock.move:0
 msgid "Source"
-msgstr ""
+msgstr "Kaynak"
 
 #. module: stock
-#: code:addons/stock/stock.py:2557
+#: code:addons/stock/stock.py:2589
 #: model:ir.model,name:stock.model_stock_inventory
 #: selection:report.stock.inventory,location_type:0
 #: field:stock.inventory.line,inventory_id:0
@@ -2274,18 +2465,18 @@ msgstr "Envanter"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Alım Listesi"
 
 #. module: stock
 #: sql_constraint:stock.production.lot:0
 msgid ""
 "The combination of serial number and internal reference must be unique !"
-msgstr ""
+msgstr "Dahili referans ve seri numarası kombinasyonu özgün olmalıdır!"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_ups
 msgid "Stock ups"
-msgstr ""
+msgstr "Stok çıkışları"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -2296,26 +2487,26 @@ msgstr "Envanter İptali"
 #: field:stock.move.split.lines,name:0
 #: field:stock.move.split.lines.exist,name:0
 msgid "Tracking serial"
-msgstr ""
+msgstr "Seri izleme"
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:135
-#: code:addons/stock/stock.py:751
+#: code:addons/stock/stock.py:754
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Hata!"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_replacement_result
 msgid "Stock Replacement result"
-msgstr ""
+msgstr "Stok Yenileme sonucu"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
 #: model:ir.ui.menu,name:stock.menu_stock_uom_form_action
 msgid "Units of Measure"
-msgstr ""
+msgstr "Ölçü Birimleri"
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
@@ -2325,12 +2516,12 @@ msgstr "Sabit Lokasyon"
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "July"
-msgstr ""
+msgstr "Temmuz"
 
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Consumable"
-msgstr ""
+msgstr "Tüketilebilir"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_line_date
@@ -2340,11 +2531,15 @@ msgid ""
 "need this report in order to ensure that the stock of each product is "
 "controlled at least once a year."
 msgstr ""
+"Ürünleriniz üzerinde gerçekleştirilen en son envanterleri görüntüleyin ve "
+"bunları özel filtreleme kriterleriyle kolayca sıralayın. Sürekli ve kısmi "
+"envanterler oluşturmanız durumunda, her bir ürün stoğunun en az yılda bir "
+"kez kontrol edilmesini sağlamak için bu rapora ihtiyaç duyarsınız."
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
 msgid "Stock Level Forecast"
-msgstr ""
+msgstr "Stok Seviyesi Tahmini"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
@@ -2353,7 +2548,7 @@ msgstr ""
 #: field:stock.journal,name:0
 #: field:stock.picking,stock_journal_id:0
 msgid "Stock Journal"
-msgstr ""
+msgstr "Stok Defteri"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -2364,14 +2559,14 @@ msgstr "Satınalma"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
-msgstr ""
+msgstr "Maxtor Tedarikçileri"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:66
+#: code:addons/stock/wizard/stock_change_product_qty.py:80
 #: code:addons/stock/wizard/stock_change_standard_price.py:106
 #, python-format
 msgid "Active ID is not set in Context"
-msgstr ""
+msgstr "Aktif Kimlik Bağlam bölümünde ayarlanmamış"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2382,7 +2577,7 @@ msgstr "Kullanılabilir Yap"
 #: model:ir.actions.act_window,name:stock.move_scrap
 #: view:stock.move.scrap:0
 msgid "Scrap Move"
-msgstr ""
+msgstr "Iskarta Hareketi"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:138
@@ -2391,7 +2586,7 @@ msgstr ""
 #: view:stock.move:0
 #, python-format
 msgid "Receive Products"
-msgstr ""
+msgstr "Ürünleri Al"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:131
@@ -2399,7 +2594,7 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
 msgid "Deliver Products"
-msgstr ""
+msgstr "Ürünleri Teslim Et"
 
 #. module: stock
 #: view:stock.location.product:0
@@ -2409,29 +2604,30 @@ msgstr "Ürün Stoğunu Göster"
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Picking list"
-msgstr ""
+msgstr "Dahili Alım listesi"
 
 #. module: stock
 #: view:report.stock.move:0
 #: field:report.stock.move,month:0
 msgid "Month"
-msgstr ""
+msgstr "Ay"
 
 #. module: stock
 #: help:stock.picking,date_done:0
 msgid "Date of Completion"
-msgstr ""
+msgstr "Tamamlama Tarihi"
 
 #. module: stock
 #: help:stock.production.lot,name:0
 msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
-msgstr ""
+msgstr "Özgün ürün lotu PREFIX/SERIAL [INT_REF] olarak görüntülenecektir"
 
 #. module: stock
 #: help:stock.tracking,active:0
 msgid ""
 "By unchecking the active field, you may hide a pack without deleting it."
 msgstr ""
+"Aktif alanın işaretini kaldırarak, bir paketi silmeden gizleyebilirisiniz."
 
 #. module: stock
 #: view:stock.inventory.merge:0
@@ -2446,7 +2642,7 @@ msgstr "Envanterler"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Todo"
-msgstr ""
+msgstr "Yapılacak işlemler"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2462,13 +2658,13 @@ msgstr ""
 #: field:stock.production.lot.revision,company_id:0
 #: field:stock.warehouse,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Unit Of Measure"
-msgstr ""
+msgstr "Ölçü Birimi"
 
 #. module: stock
 #: code:addons/stock/product.py:122
@@ -2476,12 +2672,14 @@ msgstr ""
 msgid ""
 "There is no stock input account defined for this product: \"%s\" (id: %d)"
 msgstr ""
+"Bu ürün için tanımlanan hiçbir stok giriş hesabı mevcut değil: \"%s\" (id: "
+"%d)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2302
+#: code:addons/stock/stock.py:2339
 #, python-format
 msgid "Can not consume a move with negative or zero quantity !"
-msgstr ""
+msgstr "Negatif veya miktarı sıfır olan bir hareketi kullanamazsınız!"
 
 #. module: stock
 #: field:stock.location,stock_real:0
@@ -2491,13 +2689,13 @@ msgstr "Fiili Stok"
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Fill Inventory"
-msgstr ""
+msgstr "Envanteri Doldur"
 
 #. module: stock
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "Hata: Varsayılan UOM ve satınalma UOM aynı kategoride olmalıdır."
 
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
@@ -2507,6 +2705,10 @@ msgid ""
 "value for all products in this category, it can also directly be set on each "
 "product."
 msgstr ""
+"Gerçek zamanlı envanter değerlendirmesi yaparken, tüm gelen stok hareketleri "
+"için muadil Defter Öğeleri bu hesaba gönderilecektir. Bu, bu kategorideki "
+"tüm ürünler için varsayılan değerdir, ayrıca doğrudan her bir ürün üzerinde "
+"de ayarlanabilir."
 
 #. module: stock
 #: field:stock.production.lot.revision,date:0
@@ -2521,12 +2723,12 @@ msgstr "Revizyon Tarihi"
 #: field:stock.move.split.lines.exist,lot_id:0
 #: report:stock.picking.list:0
 msgid "Lot"
-msgstr ""
+msgstr "Lot"
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Number"
-msgstr ""
+msgstr "Üretim Lot Numarası"
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
@@ -2534,11 +2736,12 @@ msgid "Quantity (UOS)"
 msgstr "Miktar (2.Br.)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1647
+#: code:addons/stock/stock.py:1664
 #, python-format
 msgid ""
 "You are moving %.2f %s products but only %.2f %s available in this lot."
 msgstr ""
+"%.2f %s ürün taşıyorsunuz, ancak bu lotta sadece %.2f %s ürün mevcut."
 
 #. module: stock
 #: view:stock.move:0
@@ -2548,7 +2751,7 @@ msgstr "Kullanılabilir Yap"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Contact Address :"
-msgstr ""
+msgstr "İletişim Adresi:"
 
 #. module: stock
 #: field:stock.move,backorder_id:0
@@ -2573,14 +2776,15 @@ msgid "Properties"
 msgstr "Özellikler"
 
 #. module: stock
-#: code:addons/stock/stock.py:982
+#: code:addons/stock/stock.py:974
 #, python-format
 msgid "Error, no partner !"
-msgstr ""
+msgstr "Hata, hiç ortak yok!"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
 #: model:ir.model,name:stock.model_stock_incoterms
+#: model:ir.ui.menu,name:stock.menu_action_incoterm_open
 #: view:stock.incoterms:0
 msgid "Incoterms"
 msgstr "Teslim Sekilleri"
@@ -2590,7 +2794,7 @@ msgstr "Teslim Sekilleri"
 #: report:lot.stock.overview_all:0
 #: report:stock.inventory.move:0
 msgid "Total:"
-msgstr ""
+msgstr "Toplam:"
 
 #. module: stock
 #: help:stock.incoterms,name:0
@@ -2599,6 +2803,9 @@ msgid ""
 "costs and responsibilities between buyer and seller and reflect state-of-the-"
 "art transportation practices."
 msgstr ""
+"Teslim şekilleri satış koşulları grubudur. İşlem maliyetlerini ve "
+"sorumluluklarını alıcı ve satıcı arasında paylaştırmak ve gelişmiş taşıma "
+"faaliyetlerini yansıtmak için kullanılırlar."
 
 #. module: stock
 #: help:stock.fill.inventory,recursive:0
@@ -2606,27 +2813,29 @@ msgid ""
 "If checked, products contained in child locations of selected location will "
 "be included as well."
 msgstr ""
+"İşaretlenmesi durumunda, seçilen lokasyonun alt lokasyonlarında bulunan "
+"ürünler de dahil edilecektir."
 
 #. module: stock
 #: field:stock.move.track,tracking_prefix:0
 msgid "Tracking prefix"
-msgstr ""
+msgstr "Önek izleme"
 
 #. module: stock
 #: field:stock.inventory,name:0
 msgid "Inventory Reference"
-msgstr ""
+msgstr "Envanter Referansı"
 
 #. module: stock
-#: code:addons/stock/stock.py:1307
+#: code:addons/stock/stock.py:1304
 #, python-format
 msgid "Internal picking"
-msgstr ""
+msgstr "Dahili alım"
 
 #. module: stock
 #: view:stock.location.product:0
 msgid "Open Product"
-msgstr ""
+msgstr "Açık Ürün"
 
 #. module: stock
 #: field:stock.location.product,to_date:0
@@ -2637,7 +2846,7 @@ msgstr "Bitiş"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Process"
-msgstr ""
+msgstr "İşlem"
 
 #. module: stock
 #: field:stock.production.lot.revision,name:0
@@ -2658,6 +2867,9 @@ msgid ""
 "filter all resources of the day for the 'From' date and 23:59:59 for the "
 "'To' date)"
 msgstr ""
+"(Geçerli durumu açmak için boş tutun. 'Başlangıç' tarihinden 'Bitiş' "
+"tarihinin 23:59:59 saati için ilgili günün tüm kaynaklarını filtrelemek "
+"üzere SS:DD:SS öğesini 00:00:00 olarak ayarlayın)"
 
 #. module: stock
 #: view:product.category:0
@@ -2667,7 +2879,7 @@ msgstr "Stok Muhasebe Tercihi"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_out
 msgid "Customers Packings"
-msgstr ""
+msgstr "Tüketici Paketleri"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -2686,7 +2898,7 @@ msgstr "Bitti"
 #: model:ir.model,name:stock.model_stock_change_standard_price
 #: view:stock.change.standard.price:0
 msgid "Change Standard Price"
-msgstr ""
+msgstr "Standart Fiyatı Değiştir"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
@@ -2704,11 +2916,12 @@ msgid "Date done"
 msgstr "Tamamlanan Tarih"
 
 #. module: stock
-#: code:addons/stock/stock.py:983
+#: code:addons/stock/stock.py:975
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
 msgstr ""
+"Fatura oluşturmak istiyorsanız, alım listesine bir ortak yerleştiriniz."
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -2718,7 +2931,7 @@ msgstr "Acil Değil"
 #. module: stock
 #: view:stock.move:0
 msgid "To Do"
-msgstr ""
+msgstr "Yapılacak İşlemler"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -2729,19 +2942,19 @@ msgstr "Depolar"
 #. module: stock
 #: field:stock.journal,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Sorumlu"
 
 #. module: stock
 #: field:stock.move,returned_price:0
 msgid "Returned product price"
-msgstr ""
+msgstr "İade ürün fiyatı"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_inventory_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
 #: view:report.stock.inventory:0
 msgid "Inventory Analysis"
-msgstr ""
+msgstr "Envanter Analizleri"
 
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
@@ -2782,17 +2995,17 @@ msgid "Product"
 msgstr "Ürün"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:135
+#: code:addons/stock/wizard/stock_return_picking.py:126
 #, python-format
 msgid "Invoicing"
-msgstr ""
+msgstr "Faturalandırma"
 
 #. module: stock
-#: code:addons/stock/stock.py:2237
-#: code:addons/stock/stock.py:2297
+#: code:addons/stock/stock.py:2274
+#: code:addons/stock/stock.py:2334
 #, python-format
 msgid "Please provide Proper Quantity !"
-msgstr ""
+msgstr "Lütfen Uygun Bir Miktar girin!"
 
 #. module: stock
 #: field:stock.move,product_uos:0
@@ -2807,29 +3020,29 @@ msgstr "Yükseklik (Z)"
 #. module: stock
 #: field:stock.ups,weight:0
 msgid "Lot weight"
-msgstr ""
+msgstr "Lot ağırlığı"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_consume
 #: view:stock.move.consume:0
 msgid "Consume Products"
-msgstr ""
+msgstr "Ürünleri Kullan"
 
 #. module: stock
-#: code:addons/stock/stock.py:1646
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "Insufficient Stock in Lot !"
-msgstr ""
+msgstr "Lotta Yetersiz Stok!"
 
 #. module: stock
 #: field:stock.location,parent_right:0
 msgid "Right Parent"
-msgstr ""
+msgstr "Sağ Üst Öğe"
 
 #. module: stock
 #: field:stock.picking,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adres"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -2851,39 +3064,39 @@ msgstr "Satıcılar"
 #: field:report.stock.inventory,value:0
 #: field:report.stock.move,value:0
 msgid "Total Value"
-msgstr ""
+msgstr "Toplam Tutar"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
 msgid "Products by Category"
-msgstr ""
+msgstr "Kategoriye Göre Ürün"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
 msgid "Products Categories"
-msgstr ""
+msgstr "Ürün Kategorileri"
 
 #. module: stock
 #: field:stock.move.memory.in,wizard_id:0
 #: field:stock.move.memory.out,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Sihirbaz"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
 #: model:ir.model,name:stock.model_stock_location_product
 msgid "Products by Location"
-msgstr ""
+msgstr "Lokasyona Göre Ürün"
 
 #. module: stock
 #: field:stock.fill.inventory,recursive:0
 msgid "Include children"
-msgstr ""
+msgstr "Alt öğeleri dahil et"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_components
 msgid "Shelf 1"
-msgstr ""
+msgstr "Raf 1"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree6
@@ -2895,16 +3108,22 @@ msgid ""
 "preconfigured logistics rules, but you can also record manual stock "
 "operations."
 msgstr ""
+"Dahili Hareketler deponuzda gerçekleştirmeniz gereken tüm envanter "
+"hareketlerini gösterir. Tüm operasyonlar stok defterlerinde "
+"sınıflandırılabilir, böylece her bir çalışanın kendi defterinde kendi "
+"gerçekleştirilecek operasyon listesi bulunur. Çoğu operasyon önceden "
+"ayarlanmış lojistik kurallarınıza göre otomatik olarak OpenERP tarafından "
+"hazırlanır, ancak manuel stok operasyonlarını da kaydedebilirsiniz."
 
 #. module: stock
 #: view:stock.move:0
 msgid "Order"
-msgstr ""
+msgstr "Sipariş"
 
 #. module: stock
 #: field:stock.tracking,name:0
 msgid "Pack Reference"
-msgstr ""
+msgstr "Paket Referans"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -2921,17 +3140,17 @@ msgstr "Muhasebe Kayıtları"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Total"
-msgstr ""
+msgstr "Toplam"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_intermediatelocation0
 msgid "Internal Shippings"
-msgstr ""
+msgstr "Dahili Sevkiyatlar"
 
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
-msgstr ""
+msgstr "İlgili Hesabı Etkinleştir"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -2949,12 +3168,12 @@ msgstr "Lot Bilgisi"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "New pack"
-msgstr ""
+msgstr "Yeni paket"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Destination"
-msgstr ""
+msgstr "Hedef"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -2962,29 +3181,31 @@ msgid "All at once"
 msgstr "Tümünü birden"
 
 #. module: stock
-#: code:addons/stock/stock.py:1603
+#: code:addons/stock/stock.py:1620
 #, python-format
 msgid ""
 "Quantities, UoMs, Products and Locations cannot be modified on stock moves "
 "that have already been processed (except by the Administrator)"
 msgstr ""
+"Miktarlar, Birimler, Ürünler ve Lokasyonlar daha önceden işlenmiş olan stok "
+"hareketlerinde değiştirilemez (Yönetici hariç)"
 
 #. module: stock
-#: code:addons/stock/product.py:383
+#: code:addons/stock/product.py:386
 #, python-format
 msgid "Future Productions"
-msgstr ""
+msgstr "Sonraki Üretimler"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Faturalandırılacak"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:120
+#: code:addons/stock/wizard/stock_return_picking.py:115
 #, python-format
 msgid "Return lines"
-msgstr ""
+msgstr "İade kalemleri"
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_lines_date
@@ -2995,49 +3216,49 @@ msgstr "Envanter Tarihleri"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Total incoming quantity"
-msgstr ""
+msgstr "Gelen toplam miktar"
 
 #. module: stock
 #: field:report.stock.move,product_qty_out:0
 msgid "Out Qty"
-msgstr ""
+msgstr "Çıkış Miktarı"
 
 #. module: stock
 #: field:stock.production.lot,move_ids:0
 msgid "Moves for this production lot"
-msgstr ""
+msgstr "Bu üretim lotu hareketleri"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_memory_out
 msgid "stock.move.memory.out"
-msgstr ""
+msgstr "stock.move.memory.out"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:115
 #, python-format
 msgid "Message !"
-msgstr ""
+msgstr "Mesaj!"
 
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Put in current pack"
-msgstr ""
+msgstr "Mevcut pakete yerleştir"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Lot Inventory"
-msgstr ""
+msgstr "Lot Envanteri"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Reason"
-msgstr ""
+msgstr "Neden"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Delivery Order:"
-msgstr ""
+msgstr "Teslimat Siparişi:"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_production_lot_form
@@ -3049,6 +3270,12 @@ msgid ""
 "'Available' button to get all the lots you produced, received or delivered "
 "to customers."
 msgstr ""
+"Kaydettiğiniz tüm ürün lotlarının (seri numaraları) listesidir. Bir lot "
+"seçtiğinizde, lotta bulunan ürünlerin giriş ve çıkış izlenebilirliğini elde "
+"edebilirsiniz. Varsayılan olarak, listeyi deponuzda mevcut seri numaralarına "
+"göre listeleyebilirsiniz, ancak oluşturduğunuz, aldığınız ya da müşterilere "
+"teslim ettiğiniz lotların tümünü almak için 'Mevcut' düğmesi seçimini "
+"kaldırabilirsiniz."
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -3056,10 +3283,11 @@ msgid "Icon"
 msgstr "ikon"
 
 #. module: stock
-#: code:addons/stock/stock.py:2174
+#: code:addons/stock/stock.py:2209
+#: code:addons/stock/stock.py:2617
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "Kullanıcı Hatası"
 
 #. module: stock
 #: view:stock.inventory.line.split:0
@@ -3069,12 +3297,12 @@ msgstr ""
 #: view:stock.move.track:0
 #: view:stock.split.into:0
 msgid "Ok"
-msgstr ""
+msgstr "Tamam"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
 msgid "Non European Customers"
-msgstr ""
+msgstr "Avrupalı Olmayan Müşteriler"
 
 #. module: stock
 #: code:addons/stock/product.py:76
@@ -3083,32 +3311,34 @@ msgstr ""
 #: code:addons/stock/product.py:100
 #: code:addons/stock/product.py:121
 #: code:addons/stock/product.py:147
-#: code:addons/stock/stock.py:1975
-#: code:addons/stock/stock.py:1978
-#: code:addons/stock/stock.py:1981
-#: code:addons/stock/stock.py:1984
-#: code:addons/stock/stock.py:1987
-#: code:addons/stock/stock.py:1990
-#: code:addons/stock/stock.py:2302
-#: code:addons/stock/wizard/stock_fill_inventory.py:48
+#: code:addons/stock/stock.py:2006
+#: code:addons/stock/stock.py:2009
+#: code:addons/stock/stock.py:2012
+#: code:addons/stock/stock.py:2015
+#: code:addons/stock/stock.py:2018
+#: code:addons/stock/stock.py:2021
+#: code:addons/stock/stock.py:2339
+#: code:addons/stock/wizard/stock_fill_inventory.py:47
 #: code:addons/stock/wizard/stock_splitinto.py:49
 #: code:addons/stock/wizard/stock_splitinto.py:53
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Hata!"
 
 #. module: stock
-#: code:addons/stock/stock.py:1990
+#: code:addons/stock/stock.py:2021
 #, python-format
 msgid ""
 "There is no inventory variation account defined on the product category: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Ürün kategorisinde tanımlanan hiçbir envanter varyasyonu mevcut değil: "
+"\"%s\" (id: %d)"
 
 #. module: stock
 #: view:stock.inventory.merge:0
 msgid "Do you want to merge theses inventories ?"
-msgstr ""
+msgstr "Bu envanterleri birleştirmek istiyor musunuz?"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -3117,23 +3347,24 @@ msgstr ""
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "İptal edildi"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Picking"
-msgstr ""
+msgstr "Alım"
 
 #. module: stock
 #: help:stock.picking,move_type:0
 msgid "It specifies goods to be delivered all at once or by direct delivery"
 msgstr ""
+"Bir seferde ya da doğrudan teslimatla teslim edilecek malları belirtir"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:83
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
 #, python-format
 msgid "This picking list does not require invoicing."
-msgstr ""
+msgstr "Bu alım listesi faturalandırma gerektirmez."
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -3156,20 +3387,29 @@ msgid ""
 "* Fixed Location: The chained location is taken from the next field: Chained "
 "Location if Fixed."
 msgstr ""
+"Bu lokasyonun başka bir lokasyona zincirlenip zincirlenmeyeceğini, yani bu "
+"lokasyondaki herhangi bir ürünün \n"
+"daha sonra zincirlenen lokasyona hareket edip etmeyeceğini belirler. "
+"Zincirlenen lokasyon türe göre belirlenir:\n"
+"* Hiçbiri: Hiçbir zincirleme yok\n"
+"* Müşteri: Zincirlenen lokasyon, gelen ürünlerin Alım listesinde belirtilen "
+"Ortağın Ortak formundaki Müşteri Lokasyon alanından alınacaktır.\n"
+"* Sabit Lokasyon: Zincirlenen lokasyon bir sonraki alandan alınır: Sabit "
+"olması durumunda Zincirlenen Lokasyon."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Uyarı"
 
 #. module: stock
-#: code:addons/stock/stock.py:1321
-#: code:addons/stock/stock.py:2557
+#: code:addons/stock/stock.py:1318
+#: code:addons/stock/stock.py:2589
 #, python-format
 msgid "is done."
-msgstr ""
+msgstr "yapıldı."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree
@@ -3184,6 +3424,8 @@ msgid ""
 "This stock location will be used, instead of the default one, as the "
 "destination location for goods you send to this partner"
 msgstr ""
+"Bu ortağa gönderdiğiniz mallar için hedef lokasyon olarak, varsayılan yerine "
+"bu stok lokasyonu kullanılacaktır"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -3202,29 +3444,31 @@ msgstr "Onayla"
 #. module: stock
 #: help:stock.location,icon:0
 msgid "Icon show in  hierarchical tree view"
-msgstr ""
+msgstr "Hiyerarşik ağaç gösteriminde simge gösterilir"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
 #: view:stock.inventory.merge:0
 msgid "Merge inventories"
-msgstr ""
+msgstr "Envanterleri birleştir"
 
 #. module: stock
 #: help:stock.change.product.qty,new_quantity:0
 msgid "This quantity is expressed in the Default UoM of the product."
-msgstr ""
+msgstr "Bu miktar, Varsayılan ürün birimi olarak ifade edilir."
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Reception:"
-msgstr ""
+msgstr "Alım:"
 
 #. module: stock
 #: help:stock.location,scrap_location:0
 msgid ""
 "Check this box to allow using this location to put scrapped/damaged goods."
 msgstr ""
+"Iskartaya atılan/hasarlı malları yerleştirmek için bu lokasyonun "
+"kullanılmasına izin vermek üzere bu kutuyu işaretleyin."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
@@ -3234,18 +3478,18 @@ msgstr "Bağlı Toplama"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Total outgoing quantity"
-msgstr ""
+msgstr "Giden toplam miktar"
 
 #. module: stock
 #: field:stock.picking,backorder_id:0
 msgid "Back Order of"
-msgstr ""
+msgstr "Sipariş Bakiyesi"
 
 #. module: stock
 #: help:stock.move.memory.in,cost:0
 #: help:stock.move.memory.out,cost:0
 msgid "Unit Cost for this product line"
-msgstr ""
+msgstr "Bu ürün hattı için Birim Maliyet"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_category
@@ -3254,13 +3498,13 @@ msgstr ""
 #: view:report.stock.move:0
 #: field:report.stock.move,categ_id:0
 msgid "Product Category"
-msgstr ""
+msgstr "Ürün Kategorisi"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_change_product_qty.py:88
 #, python-format
 msgid "INV: %s"
-msgstr ""
+msgstr "INV: %s"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
@@ -3268,15 +3512,15 @@ msgid "Reporting"
 msgstr "Raporlama"
 
 #. module: stock
-#: code:addons/stock/stock.py:1316
+#: code:addons/stock/stock.py:1313
 #, python-format
 msgid " for the "
-msgstr ""
+msgstr " için "
 
 #. module: stock
 #: view:stock.split.into:0
 msgid "Quantity to leave in the current pack"
-msgstr ""
+msgstr "Mevcut pakette bırakılacak miktar"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
@@ -3293,7 +3537,7 @@ msgstr "Ayarlar"
 #: field:stock.inventory.line.split,use_exist:0
 #: field:stock.move.split,use_exist:0
 msgid "Existing Lots"
-msgstr ""
+msgstr "Mevcut Lotlar"
 
 #. module: stock
 #: field:product.product,location_id:0
@@ -3310,17 +3554,21 @@ msgid ""
 "If cost price is decreased, stock variation account will be creadited and "
 "stock input account will be debited."
 msgstr ""
+"Maliyet tutarı artarsa, stok varyasyon hesabı borçlandırılacak ve stok çıkış "
+"hesabı şu değerde alacaklandırılacaktır = (tutar farkı * mevcut miktar).\n"
+"Maliyet tutarı azalırsa, stok varyasyon hesabı alacaklandırılacak ve stok "
+"giriş hesabı borçlandırılacaktır."
 
 #. module: stock
 #: field:stock.location,chained_journal_id:0
 msgid "Chaining Journal"
-msgstr ""
+msgstr "Zincirleme Defteri"
 
 #. module: stock
-#: code:addons/stock/stock.py:729
+#: code:addons/stock/stock.py:732
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
-msgstr ""
+msgstr "Yeterli stok yok, ürünler rezerve edilemiyor."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_customers
@@ -3328,10 +3576,10 @@ msgid "Customers"
 msgstr "Müşteriler"
 
 #. module: stock
-#: code:addons/stock/stock.py:1320
+#: code:addons/stock/stock.py:1317
 #, python-format
 msgid "is cancelled."
-msgstr ""
+msgstr "iptal edildi."
 
 #. module: stock
 #: view:stock.inventory.line:0
@@ -3339,33 +3587,33 @@ msgid "Stock Inventory Lines"
 msgstr "Stok Envanter Kalemleri"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:74
+#: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "Process Document"
-msgstr ""
+msgstr "İşlem Belgesi"
 
 #. module: stock
-#: code:addons/stock/product.py:365
+#: code:addons/stock/product.py:368
 #, python-format
 msgid "Future Deliveries"
-msgstr ""
+msgstr "Sonraki Teslimatlar"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional info"
-msgstr ""
+msgstr "Ek bilgi"
 
 #. module: stock
 #: view:stock.move:0
 #: field:stock.move,tracking_id:0
 msgid "Pack"
-msgstr ""
+msgstr "Paket"
 
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Date Expected"
-msgstr ""
+msgstr "Beklenen Tarih"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree4
@@ -3375,26 +3623,29 @@ msgid ""
 "according to the original purchase order. You can validate the shipment "
 "totally or partially."
 msgstr ""
+"Gelen Sevkiyatlar, tedarikçiden alacağınız tüm siparişlerin listesidir. Bir "
+"gelen sevkiyat orijinal satınalma siparişine göre alınacak ürünlerin "
+"listesini içerir. Sevkiyatı tamamen veya kısmen onaylayabilirsiniz."
 
 #. module: stock
 #: field:stock.move,auto_validate:0
 msgid "Auto Validate"
-msgstr ""
+msgstr "Otomatik Onaylama"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Weight"
-msgstr ""
+msgstr "Ağırlık"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Ürün Şablonu"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "December"
-msgstr ""
+msgstr "Aralık"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -3408,16 +3659,19 @@ msgid ""
 "specific product. You can filter on the product to see all the past or "
 "future movements for the product."
 msgstr ""
+"Bu menü size belirli bir üründe envanter operasyonlarının tam "
+"izlenebilirliğini sunar. Ürünün önceki ve sonraki hareketlerinin tümünü "
+"görmek için, üründe filtreleme yapabilirsiniz."
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Return Products"
-msgstr ""
+msgstr "Ürünleri İade Et"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Validate Inventory"
-msgstr ""
+msgstr "Envanteri Onayla"
 
 #. module: stock
 #: help:stock.move,price_currency_id:0
@@ -3425,11 +3679,14 @@ msgid ""
 "Technical field used to record the currency chosen by the user during a "
 "picking confirmation (when average price costing method is used)"
 msgstr ""
+"Bir alım onayı sırasında kullanıcı tarafından belirlenen para birimini "
+"kaydetmek için kullanılan teknik alan (ortalama fiyat maliyet metodu "
+"kullanılırken)"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
 msgid "Products Moves"
-msgstr ""
+msgstr "Ürün Hareketleri"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -3439,27 +3696,27 @@ msgstr "Faturalandı"
 #. module: stock
 #: field:stock.move,address_id:0
 msgid "Destination Address"
-msgstr ""
+msgstr "Hedef Adres"
 
 #. module: stock
 #: field:stock.picking,max_date:0
 msgid "Max. Expected Date"
-msgstr ""
+msgstr "Mak. Beklenen Tarih"
 
 #. module: stock
 #: field:stock.picking,auto_picking:0
 msgid "Auto-Picking"
-msgstr ""
+msgstr "Otomatik Alım"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
 msgid "Shop 2"
-msgstr ""
+msgstr "Alım 2"
 
 #. module: stock
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Hata! İlgili üyeler için yineleme gerçekleştiremezsiniz."
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -3484,7 +3741,7 @@ msgstr "Taslak"
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
 #: report:stock.inventory.move:0
 msgid "Stock Inventory"
-msgstr ""
+msgstr "Stok Envnteri"
 
 #. module: stock
 #: help:report.stock.inventory,state:0
@@ -3495,22 +3752,27 @@ msgid ""
 " When the picking it done the state is 'Done'.              \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
+"Stok hareketi oluşturulduğunda, 'Taslak' durumundadır.\n"
+" Daha sonra 'Onaylandı' durumuna ayarlanır.\n"
+" Stok mevcut durumda ise 'Mevcut' olarak ayarlanır.\n"
+" Alım gerçekleştirildiğinde, durum 'Gerçekleştirildi' olur.              \n"
+"Hareket bir başka hareketi bekliyorsa, durum 'Beklemede' olur."
 
 #. module: stock
 #: view:board.board:0
 msgid "Outgoing Products Delay"
-msgstr ""
+msgstr "Giden Ürün Gecikmesi"
 
 #. module: stock
 #: field:stock.move.split.lines,use_exist:0
 msgid "Existing Lot"
-msgstr ""
+msgstr "Mevcut Lot"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:204
+#: code:addons/stock/wizard/stock_return_picking.py:194
 #, python-format
 msgid "Please specify at least one non-zero quantity!"
-msgstr ""
+msgstr "En az bir tane sıfır olmayan miktar belirtin!"
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
@@ -3518,51 +3780,54 @@ msgid ""
 "For the current product, this stock location will be used, instead of the "
 "default one, as the source location for stock moves generated by procurements"
 msgstr ""
+"Mevcut ürün için, satınalmalar tarafından oluşturulan stok hareketleri için "
+"kaynak konum olarak, varsayılan yerine bu stok lokasyonu kullanılacaktır"
 
 #. module: stock
-#: code:addons/stock/stock.py:1319
+#: code:addons/stock/stock.py:1316
 #, python-format
 msgid "is ready to process."
-msgstr ""
+msgstr "işleme hazır."
 
 #. module: stock
 #: help:stock.picking,origin:0
 msgid "Reference of the document that produced this picking."
-msgstr ""
+msgstr "Bu alımı oluşturan belge referansı."
 
 #. module: stock
 #: field:stock.fill.inventory,set_stock_zero:0
 msgid "Set to zero"
-msgstr ""
+msgstr "Sıfırla"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:87
 #, python-format
 msgid "None of these picking lists require invoicing."
-msgstr ""
+msgstr "Bu alım listelerinin hiçbiri faturalandırma gerektirmiyor."
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "November"
-msgstr ""
+msgstr "Kasım"
 
 #. module: stock
 #: code:addons/stock/product.py:101
-#: code:addons/stock/stock.py:1987
+#: code:addons/stock/stock.py:2018
 #, python-format
 msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
 msgstr ""
+"Ürün kategorisinde tanımlanan hiçbir defter mevcut değil: \"%s\" (id: %d)"
 
 #. module: stock
-#: code:addons/stock/product.py:379
+#: code:addons/stock/product.py:382
 #, python-format
 msgid "Unplanned Qty"
-msgstr ""
+msgstr "Planlanmayan Miktar"
 
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
-msgstr ""
+msgstr "Zincirlenen Firma"
 
 #. module: stock
 #: view:stock.picking:0
@@ -3572,7 +3837,7 @@ msgstr "Kullanılırlığını Kontrol Et"
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "January"
-msgstr ""
+msgstr "Ocak"
 
 #. module: stock
 #: help:product.product,track_incoming:0
@@ -3580,6 +3845,8 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "coming from a Supplier Location"
 msgstr ""
+"Bir Tedarikçi Lokasyonundan gelen ve bu üründe kapsanan tüm hareketler için "
+"bir Üretim Lotu belirlemeye zorlar"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
@@ -3589,32 +3856,32 @@ msgstr "Gelecekteki Stok Hareketleri"
 #. module: stock
 #: field:stock.move,move_history_ids2:0
 msgid "Move History (parent moves)"
-msgstr ""
+msgstr "Hareket Geçmşi (üst hareketler)"
 
 #. module: stock
-#: code:addons/stock/product.py:361
+#: code:addons/stock/product.py:364
 #, python-format
 msgid "Future Stock"
-msgstr ""
+msgstr "Sonraki Stok"
 
 #. module: stock
-#: code:addons/stock/stock.py:510
-#: code:addons/stock/stock.py:1127
-#: code:addons/stock/stock.py:1135
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:113
+#: code:addons/stock/stock.py:512
+#: code:addons/stock/stock.py:1120
+#: code:addons/stock/stock.py:1128
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:101
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Hata"
 
 #. module: stock
 #: field:stock.ups.final,xmlfile:0
 msgid "XML File"
-msgstr ""
+msgstr "XML Dosyası"
 
 #. module: stock
 #: view:stock.change.product.qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Miktarı Seç"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_tree
@@ -3623,6 +3890,9 @@ msgid ""
 "click on a location to get the list of the products and their stock level in "
 "this particular location and all its children."
 msgstr ""
+"Bu, firmanızın depo ve lokasyonlarının yapısıdır. Ürünlerin listesini, "
+"ürünlerin bu belirlenen lokasyonundaki stok seviyesini ve tüm alt öğelerini "
+"almak için bir lokasyona tıklayabilirsiniz."
 
 #. module: stock
 #: model:res.request.link,name:stock.req_link_tracking
@@ -3650,7 +3920,7 @@ msgstr "İzlenebilirlik / Takip Sistemi"
 #. module: stock
 #: view:stock.picking:0
 msgid "To invoice"
-msgstr ""
+msgstr "Faturalandırılacak"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
@@ -3667,7 +3937,7 @@ msgstr "Genel Bilgiler"
 #. module: stock
 #: field:stock.production.lot,prefix:0
 msgid "Prefix"
-msgstr ""
+msgstr "Önek"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3676,6 +3946,8 @@ msgid ""
 "Total quantity after split exceeds the quantity to split for this product: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Ayrıldıktan sonraki toplam tutar bu ürün için ayrılacak miktarı aşıyor: "
+"\"%s\" (id: %d)"
 
 #. module: stock
 #: view:stock.move:0
@@ -3697,29 +3969,29 @@ msgstr "Hedef Lokasyon"
 #: help:stock.move,product_packaging:0
 msgid ""
 "It specifies attributes of packaging like type, quantity of packaging,etc."
-msgstr ""
+msgstr "Paketlemenin türü ve miktarı gibi özelliklerini belirtir."
 
 #. module: stock
 #: code:addons/stock/stock.py:2386
 #, python-format
 msgid "Product  '%s' is consumed with '%s' quantity."
-msgstr ""
+msgstr "'%s' ürünü '%s' kadar tüketilmiştir."
 
 #. module: stock
 #: code:addons/stock/stock.py:2595
 #, python-format
 msgid "Inventory '%s' is done."
-msgstr ""
+msgstr "'%s' stoğu yapılmıştır."
 
 #. module: stock
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Bu ürün için bir üretim lotu atamanız gerekir"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Expected"
-msgstr ""
+msgstr "Beklenen"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -3731,25 +4003,27 @@ msgstr "Üretim"
 #. module: stock
 #: view:stock.split.into:0
 msgid "Split Move"
-msgstr ""
+msgstr "Hareketi Ayır"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:97
+#: code:addons/stock/wizard/stock_return_picking.py:92
 #, python-format
 msgid ""
 "There are no products to return (only lines in Done state and not fully "
 "returned yet can be returned)!"
 msgstr ""
+"İade edilecek ürün yok (sadece Gerçekleştirildi durumundaki kalemler ve "
+"henüz tamamen iade edilmemiş olan ürünler iade edilebilir)!"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split
 msgid "Split in Production lots"
-msgstr ""
+msgstr "Üreitm lotlarına ayır"
 
 #. module: stock
 #: view:report.stock.inventory:0
 msgid "Real"
-msgstr ""
+msgstr "Gerçek"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -3761,13 +4035,13 @@ msgstr "Açıklama"
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayıs"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:133
 #, python-format
 msgid "Deliver"
-msgstr ""
+msgstr "Teslim Et"
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
@@ -3776,28 +4050,33 @@ msgid ""
 "outgoing stock moves will be posted in this account. If not set on the "
 "product, the one from the product category is used."
 msgstr ""
+"Gerçek zamanlı envanter değerlendirmesi yaparken, tüm giden stok hareketleri "
+"için muadil Defter Öğeleri bu hesaba gönderilecektir. Ürün üzerinde "
+"ayarlanmazsa, ürün kategorisinde olan kullanılır."
 
 #. module: stock
+#: model:ir.actions.act_window,name:stock.action5
 #: view:stock.tracking:0
 msgid "Upstream traceability"
-msgstr ""
+msgstr "Giriş izlenebilirliği"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
 #: report:lot.stock.overview_all:0
 msgid "Location Content"
-msgstr ""
+msgstr "Lokasyon İçeriği"
 
 #. module: stock
-#: code:addons/stock/product.py:385
+#: code:addons/stock/product.py:388
 #, python-format
 msgid "Produced Qty"
-msgstr ""
+msgstr "Üretilen Miktar"
 
 #. module: stock
 #: field:product.category,property_stock_account_output_categ:0
 #: field:product.template,property_stock_account_output:0
 #: field:stock.change.standard.price,stock_account_output:0
+#: field:stock.location,valuation_out_account_id:0
 msgid "Stock Output Account"
 msgstr "Stok Çıkış Hes."
 
@@ -3821,45 +4100,46 @@ msgstr "Müşteri"
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "February"
-msgstr ""
+msgstr "Şubat"
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Production Lot Identification"
-msgstr ""
+msgstr "Üretim Lotu Tanımlaması"
 
 #. module: stock
 #: field:stock.location,scrap_location:0
 #: view:stock.move.scrap:0
 msgid "Scrap Location"
-msgstr ""
+msgstr "Iskarta Lokasyonu"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "April"
-msgstr ""
+msgstr "Nisan"
 
 #. module: stock
 #: view:report.stock.inventory:0
 #: view:stock.move:0
 msgid "Future"
-msgstr ""
+msgstr "Sonraki"
 
 #. module: stock
 #: field:stock.invoice.onshipping,invoice_date:0
 msgid "Invoiced date"
-msgstr ""
+msgstr "Faturalandırma Tarihi"
 
 #. module: stock
-#: code:addons/stock/stock.py:729
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:83
+#: code:addons/stock/stock.py:732
+#: code:addons/stock/wizard/stock_fill_inventory.py:106
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:85
-#: code:addons/stock/wizard/stock_return_picking.py:79
-#: code:addons/stock/wizard/stock_return_picking.py:97
-#: code:addons/stock/wizard/stock_return_picking.py:204
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:87
+#: code:addons/stock/wizard/stock_return_picking.py:77
+#: code:addons/stock/wizard/stock_return_picking.py:92
+#: code:addons/stock/wizard/stock_return_picking.py:194
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Uyarı!"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
@@ -3869,23 +4149,23 @@ msgstr "Çıkış"
 #. module: stock
 #: selection:stock.move.split.lines,action:0
 msgid "Keep in one lot"
-msgstr ""
+msgstr "Tek lotta sakla"
 
 #. module: stock
 #: view:product.product:0
 msgid "Cost Price:"
-msgstr ""
+msgstr "Maliyet Tutarı:"
 
 #. module: stock
 #: help:stock.move,move_dest_id:0
 msgid "Optional: next stock move when chaining them"
-msgstr ""
+msgstr "Opsiyonel: zincirlerken sonraki stok hareketi"
 
 #. module: stock
 #: view:report.stock.move:0
 #: field:report.stock.move,year:0
 msgid "Year"
-msgstr ""
+msgstr "Yıl"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations
@@ -3895,14 +4175,14 @@ msgstr "Fiziksel Lokasyon"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move
 msgid "Partial Move"
-msgstr ""
+msgstr "Kısmi Hareket"
 
 #. module: stock
 #: help:stock.location,posx:0
 #: help:stock.location,posy:0
 #: help:stock.location,posz:0
 msgid "Optional localization details, for information purpose only"
-msgstr ""
+msgstr "Opsiyonel lokalizasyon ayrıntıları, sadece bilgi amaçlı"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
@@ -4509,3 +4789,23 @@ msgstr ""
 
 #~ msgid "Tracking Number"
 #~ msgstr "İzleme Numarası"
+
+#, python-format
+#~ msgid "is consumed with"
+#~ msgstr "ile tüketildi"
+
+#, python-format
+#~ msgid "Product "
+#~ msgstr "Ürün "
+
+#, python-format
+#~ msgid "INV: "
+#~ msgstr "FAT: "
+
+#, python-format
+#~ msgid "is scheduled"
+#~ msgstr "planlandı."
+
+#, python-format
+#~ msgid "quantity."
+#~ msgstr "miktar."
diff --git a/addons/stock/partner.py b/addons/stock/partner.py
index 7a7ac058936..6cce00cf75c 100644
--- a/addons/stock/partner.py
+++ b/addons/stock/partner.py
@@ -29,7 +29,6 @@ class res_partner(osv.osv):
           type='many2one',
           relation='stock.location',
           string="Customer Location",
-          method=True,
           view_load=True,
           help="This stock location will be used, instead of the default one, as the destination location for goods you send to this partner"),
 
@@ -38,7 +37,6 @@ class res_partner(osv.osv):
           type='many2one',
           relation='stock.location',
           string="Supplier Location",
-          method=True,
           view_load=True,
           help="This stock location will be used, instead of the default one, as the source location for goods you receive from the current partner"),
     }
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 7e54ff19840..70925a82d10 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -330,10 +330,10 @@ class product_product(osv.osv):
         return res
 
     _columns = {
-        'qty_available': fields.function(_product_available, method=True, type='float', string='Real Stock', help="Current quantities of products in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
-        'virtual_available': fields.function(_product_available, method=True, type='float', string='Virtual Stock', help="Future stock for this product according to the selected locations or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
-        'incoming_qty': fields.function(_product_available, method=True, type='float', string='Incoming', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
-        'outgoing_qty': fields.function(_product_available, method=True, type='float', string='Outgoing', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
+        'qty_available': fields.function(_product_available, type='float', string='Real Stock', help="Current quantities of products in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
+        'virtual_available': fields.function(_product_available, type='float', string='Virtual Stock', help="Future stock for this product according to the selected locations or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
+        'incoming_qty': fields.function(_product_available, type='float', string='Incoming', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
+        'outgoing_qty': fields.function(_product_available, type='float', string='Outgoing', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
         'track_production': fields.boolean('Track Manufacturing Lots' , help="Forces to specify a Production Lot for all moves containing this product and generated by a Manufacturing Order"),
         'track_incoming': fields.boolean('Track Incoming Lots', help="Forces to specify a Production Lot for all moves containing this product and coming from a Supplier Location"),
         'track_outgoing': fields.boolean('Track Outgoing Lots', help="Forces to specify a Production Lot for all moves containing this product and going to a Customer Location"),
@@ -404,7 +404,6 @@ class product_template(osv.osv):
             type='many2one',
             relation='stock.location',
             string="Procurement Location",
-            method=True,
             view_load=True,
             domain=[('usage','like','procurement')],
             help="For the current product, this stock location will be used, instead of the default one, as the source location for stock moves generated by procurements"),
@@ -413,7 +412,6 @@ class product_template(osv.osv):
             type='many2one',
             relation='stock.location',
             string="Production Location",
-            method=True,
             view_load=True,
             domain=[('usage','like','production')],
             help="For the current product, this stock location will be used, instead of the default one, as the source location for stock moves generated by production orders"),
@@ -422,17 +420,16 @@ class product_template(osv.osv):
             type='many2one',
             relation='stock.location',
             string="Inventory Location",
-            method=True,
             view_load=True,
             domain=[('usage','like','inventory')],
             help="For the current product, this stock location will be used, instead of the default one, as the source location for stock moves generated when you do an inventory"),
         'property_stock_account_input': fields.property('account.account',
             type='many2one', relation='account.account',
-            string='Stock Input Account', method=True, view_load=True,
+            string='Stock Input Account', view_load=True,
             help='When doing real-time inventory valuation, counterpart Journal Items for all incoming stock moves will be posted in this account. If not set on the product, the one from the product category is used.'),
         'property_stock_account_output': fields.property('account.account',
             type='many2one', relation='account.account',
-            string='Stock Output Account', method=True, view_load=True,
+            string='Stock Output Account', view_load=True,
             help='When doing real-time inventory valuation, counterpart Journal Items for all outgoing stock moves will be posted in this account. If not set on the product, the one from the product category is used.'),
     }
 
@@ -444,21 +441,21 @@ class product_category(osv.osv):
     _columns = {
         'property_stock_journal': fields.property('account.journal',
             relation='account.journal', type='many2one',
-            string='Stock journal', method=True, view_load=True,
+            string='Stock journal', view_load=True,
             help="When doing real-time inventory valuation, this is the Accounting Journal in which entries will be automatically posted when stock moves are processed."),
         'property_stock_account_input_categ': fields.property('account.account',
             type='many2one', relation='account.account',
-            string='Stock Input Account', method=True, view_load=True,
+            string='Stock Input Account', view_load=True,
             help='When doing real-time inventory valuation, counterpart Journal Items for all incoming stock moves will be posted in this account. This is the default value for all products in this category, it can also directly be set on each product.'),
         'property_stock_account_output_categ': fields.property('account.account',
             type='many2one', relation='account.account',
-            string='Stock Output Account', method=True, view_load=True,
+            string='Stock Output Account', view_load=True,
             help='When doing real-time inventory valuation, counterpart Journal Items for all outgoing stock moves will be posted in this account. This is the default value for all products in this category, it can also directly be set on each product.'),
         'property_stock_variation': fields.property('account.account',
             type='many2one',
             relation='account.account',
             string="Stock Variation Account",
-            method=True, view_load=True,
+            view_load=True,
             help="When real-time inventory valuation is enabled on a product, this account will hold the current value of the products.",),
     }
 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 2d516f1a8a5..1907397be67 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -113,6 +113,9 @@ class stock_location(osv.osv):
         """
         prod_id = context and context.get('product_id', False)
 
+        if not prod_id:
+            return dict([(i, {}.fromkeys(field_names, 0.0)) for i in ids])
+
         product_product_obj = self.pool.get('product.product')
 
         cr.execute('select distinct product_id, location_id from stock_move where location_id in %s', (tuple(ids), ))
@@ -164,10 +167,10 @@ 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, method=True, type='char', size=100, string="Location Name"),
+        'complete_name': fields.function(_complete_name, type='char', size=100, string="Location Name"),
 
-        'stock_real': fields.function(_product_value, method=True, type='float', string='Real Stock', multi="stock"),
-        'stock_virtual': fields.function(_product_value, method=True, type='float', string='Virtual Stock', multi="stock"),
+        '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"),
 
         'location_id': fields.many2one('stock.location', 'Parent Location', select=True, ondelete='cascade'),
         'child_ids': fields.one2many('stock.location', 'location_id', 'Contains'),
@@ -204,8 +207,8 @@ class stock_location(osv.osv):
 
         'parent_left': fields.integer('Left Parent', select=1),
         'parent_right': fields.integer('Right Parent', select=1),
-        'stock_real_value': fields.function(_product_value, method=True, type='float', string='Real Stock Value', multi="stock", digits_compute=dp.get_precision('Account')),
-        'stock_virtual_value': fields.function(_product_value, method=True, type='float', string='Virtual Stock Value', multi="stock", digits_compute=dp.get_precision('Account')),
+        'stock_real_value': fields.function(_product_value, type='float', string='Real Stock Value', multi="stock", digits_compute=dp.get_precision('Account')),
+        'stock_virtual_value': fields.function(_product_value, type='float', string='Virtual Stock Value', multi="stock", digits_compute=dp.get_precision('Account')),
         'company_id': fields.many2one('res.company', 'Company', select=1, help='Let this field empty if this location is shared between all companies'),
         'scrap_location': fields.boolean('Scrap Location', help='Check this box to allow using this location to put scrapped/damaged goods.'),
         'valuation_in_account_id': fields.many2one('account.account', 'Stock Input Account',domain = [('type','=','other')], help='This account will be used to value stock moves that have this location as destination, instead of the stock output account from the product.'),
@@ -621,8 +624,8 @@ class stock_picking(osv.osv):
         'state': fields.selection([
             ('draft', 'Draft'),
             ('auto', 'Waiting'),
-            ('confirmed', 'Confirmed'),
-            ('assigned', 'Available'),
+            ('confirmed', 'Waiting Availability'),
+            ('assigned', 'Ready to Process'),
             ('done', 'Done'),
             ('cancel', 'Cancelled'),
             ], 'State', readonly=True, select=True,
@@ -633,11 +636,11 @@ class stock_picking(osv.osv):
                  "* Done: has been processed, can't be modified or cancelled anymore\n"\
                  "* Cancelled: has been cancelled, can't be confirmed anymore"),
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
-                 method=True, store=True, type='datetime', string='Expected Date', select=1, help="Expected date for the picking to be processed"),
+                 store=True, type='datetime', string='Expected Date', select=1, help="Expected date for the picking to be processed"),
         'date': fields.datetime('Order Date', help="Date of Order", select=True),
         'date_done': fields.datetime('Date Done', help="Date of Completion"),
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
-                 method=True, store=True, type='datetime', string='Max. Expected Date', select=2),
+                 store=True, type='datetime', string='Max. Expected Date', select=2),
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Internal Moves', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
         'auto_picking': fields.boolean('Auto-Picking'),
         'address_id': fields.many2one('res.partner.address', 'Address', help="Address of partner"),
@@ -1126,7 +1129,7 @@ class stock_picking(osv.osv):
         for pick in self.browse(cr, uid, ids, context=context):
             if pick.state in ['done','cancel']:
                 raise osv.except_osv(_('Error'), _('You cannot remove the picking which is in %s state !')%(pick.state,))
-            elif pick.state in ['confirmed','assigned', 'draft']:
+            else:
                 ids2 = [move.id for move in pick.move_lines]
                 ctx = context.copy()
                 ctx.update({'call_unlink':True})
@@ -1315,7 +1318,8 @@ class stock_picking(osv.osv):
                 'assigned': _('is ready to process.'),
                 'cancel': _('is cancelled.'),
                 'done': _('is done.'),
-                'draft':_('is in draft state.'),
+                'auto': _('is waiting.'),
+                'draft': _('is in draft state.'),
             }
             res = data_obj.get_object_reference(cr, uid, 'stock', view_list.get(pick.type, 'view_picking_form'))
             context.update({'view_id': res and res[1] or False})
@@ -1395,7 +1399,7 @@ class stock_production_lot(osv.osv):
         'prefix': fields.char('Prefix', size=64, help="Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL [INT_REF]"),
         'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type', '<>', 'service')]),
         'date': fields.datetime('Creation Date', required=True),
-        'stock_available': fields.function(_get_stock, fnct_search=_stock_search, method=True, type="float", string="Available", select=True,
+        'stock_available': fields.function(_get_stock, fnct_search=_stock_search, type="float", string="Available", select=True,
             help="Current quantity of products with this Production Lot Number available in company warehouses",
             digits_compute=dp.get_precision('Product UoM')),
         'revisions': fields.one2many('stock.production.lot.revision', 'lot_id', 'Revisions'),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6dfd38c37b1..3957494955c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -57,7 +57,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock Inventory Lines">
-                    <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)" select="1" domain="[('type','&lt;&gt;','service')]"/>
+                    <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)" select="1" domain="[('type','&lt;&gt;','service')]"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
                     <field name="prod_lot_id" groups="base.group_extended"/>
@@ -117,7 +117,7 @@
                         <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 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 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"/>
                                 <field name="prod_lot_id" groups="base.group_extended"/>
@@ -129,7 +129,7 @@
                             <form string="Products ">
                                 <field domain="[('usage','=','internal')]" name="location_id"/>
                                 <newline/>
-                                <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 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"/>
                                 <group colspan="2" col="4">
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index f9ae8e2b642..83814e71069 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -85,6 +85,8 @@ class stock_change_product_qty(osv.osv_memory):
 
         res_original = prod_obj_pool.browse(cr, uid, rec_id, context=context)
         for data in self.browse(cr, uid, ids, context=context):
+            if data.new_quantity < 0:
+                raise osv.except_osv(_('Warning!'), _('Quantity cannot be negative.'))
             inventory_id = inventry_obj.create(cr , uid, {'name': _('INV: %s') % tools.ustr(res_original.name)}, context=context)
             line_data ={
                 'inventory_id' : inventory_id,
diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po
index 59ea3d11aa0..96a3382bed3 100644
--- a/addons/stock_location/i18n/tr.po
+++ b/addons/stock_location/i18n/tr.po
@@ -7,35 +7,35 @@ 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-09-09 07:16+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-06-27 18:21+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
 msgid "Sending Goods"
-msgstr ""
+msgstr "Mal Gönderme"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Pulled Paths"
-msgstr ""
+msgstr "Çekilen Rotalar"
 
 #. module: stock_location
 #: selection:product.pulled.flow,type_proc:0
 msgid "Move"
-msgstr ""
+msgstr "Hareket"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location_path
 msgid "Pushed Flows"
-msgstr ""
+msgstr "İtilen Akışlar"
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
@@ -45,39 +45,39 @@ msgstr "Otomatik No Adımı Eklendi"
 #. module: stock_location
 #: view:product.product:0
 msgid "Parameters"
-msgstr ""
+msgstr "Katsayılar"
 
 #. module: stock_location
 #: field:stock.location.path,location_from_id:0
 msgid "Source Location"
-msgstr "Kaynak Lokasyon"
+msgstr "Kaynak Konumu"
 
 #. module: stock_location
 #: help:product.pulled.flow,cancel_cascade:0
 msgid "Allow you to cancel moves related to the product pull flow"
-msgstr ""
+msgstr "Ürün çekme akışına ilişkin hareketleri iptal etmenizi sağlar"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_product_pulled_flow
 #: field:product.product,flow_pull_ids:0
 msgid "Pulled Flows"
-msgstr ""
+msgstr "Çekilen Akışlar"
 
 #. module: stock_location
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Bu ürün için bir üretim partisi girmeniz gerekir"
 
 #. module: stock_location
 #: help:product.pulled.flow,location_src_id:0
 msgid "Location used by Destination Location to supply"
-msgstr ""
+msgstr "Gönderilecek Hedef Konumu tarafından kullanılan konum"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
 msgid "Internal"
-msgstr ""
+msgstr "Dahili"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:98
@@ -86,22 +86,24 @@ msgid ""
 "Pulled procurement coming from original location %s, pull rule %s, via "
 "original Procurement %s (#%d)"
 msgstr ""
+"Çekilir tedarik %s başlangıç konumundan, %s çekme kuralından, başlangıç %s "
+"Tedariki (#%d) yolundan gelir."
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location
 msgid "Location"
-msgstr ""
+msgstr "Konum"
 
 #. module: stock_location
 #: field:product.pulled.flow,invoice_state:0
 #: field:stock.location.path,invoice_state:0
 msgid "Invoice Status"
-msgstr ""
+msgstr "Fatura Durumu"
 
 #. module: stock_location
 #: help:product.pulled.flow,name:0
 msgid "This field will fill the packing Origin and the name of its moves"
-msgstr ""
+msgstr "Bu alana paketleme Orijini ve hareket adları doldurulacaktır"
 
 #. module: stock_location
 #: help:stock.location.path,auto:0
@@ -113,103 +115,110 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
+"Bu, konum ağacında ürünün izlemesi gereken rotaları belirtmek için "
+"kullanılır.\n"
+"'Otomatik Hareket' değeri, otomatik olarak onaylanacak olan geçerli birinden "
+"bir stok hareketi oluşturacaktır. 'Manual Operasyon' durumunda, stok "
+"hareketi bir çalışan tarafından onaylanmalıdır. 'Otomatik No Adımı Eklendi' "
+"durumunda, konum orijinal harekette değiştirilir."
 
 #. module: stock_location
 #: model:ir.module.module,shortdesc:stock_location.module_meta_information
 msgid "Warehouse Locations Paths"
-msgstr ""
+msgstr "Depo Konumu Rotaları"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Conditions"
-msgstr ""
+msgstr "Koşullar"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_pack_zone
 msgid "Pack Zone"
-msgstr ""
+msgstr "Paket Bölgesi"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_gate_b
 msgid "Gate B"
-msgstr ""
+msgstr "B Kapısı"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_gate_a
 msgid "Gate A"
-msgstr ""
+msgstr "A Kapısı"
 
 #. module: stock_location
 #: selection:product.pulled.flow,type_proc:0
 msgid "Buy"
-msgstr ""
+msgstr "Satın Al"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Pushed flows"
-msgstr ""
+msgstr "İtilen akışlar"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_dispatch_zone
 msgid "Dispatch Zone"
-msgstr ""
+msgstr "Sevk Etme Bölgesi"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Stok Hareketi"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Pulled flows"
-msgstr ""
+msgstr "Çekilen akışlar"
 
 #. module: stock_location
 #: field:product.pulled.flow,company_id:0
 #: field:stock.location.path,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Şirket"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Logistics Flows"
-msgstr ""
+msgstr "Lojistik Akışlar"
 
 #. module: stock_location
 #: help:stock.move,cancel_cascade:0
 msgid "If checked, when this move is cancelled, cancel the linked move too"
 msgstr ""
+"Kontrol edildiyse, bu hareket iptal edildiğinde, ilgi hareketi de iptal edin"
 
 #. module: stock_location
 #: selection:product.pulled.flow,type_proc:0
 msgid "Produce"
-msgstr ""
+msgstr "Oluştur"
 
 #. module: stock_location
 #: selection:product.pulled.flow,procure_method:0
 msgid "Make to Order"
-msgstr ""
+msgstr "Sipariş Ver"
 
 #. module: stock_location
 #: selection:product.pulled.flow,procure_method:0
 msgid "Make to Stock"
-msgstr ""
+msgstr "Stokla"
 
 #. module: stock_location
 #: field:product.pulled.flow,partner_address_id:0
 msgid "Partner Address"
-msgstr ""
+msgstr "Ortak Adresi"
 
 #. module: stock_location
 #: selection:product.pulled.flow,invoice_state:0
 #: selection:stock.location.path,invoice_state:0
 msgid "To Be Invoiced"
-msgstr ""
+msgstr "Faturalandırılacak"
 
 #. module: stock_location
 #: help:stock.location.path,delay:0
 msgid "Number of days to do this transition"
-msgstr ""
+msgstr "Bu geçişin yapılacağı gün sayısı"
 
 #. module: stock_location
 #: model:ir.module.module,description:stock_location.module_meta_information
@@ -298,27 +307,104 @@ msgid ""
 "from Gate A\n"
 "    "
 msgstr ""
+"\n"
+"Bu modül her bir ürün için destek sağlayarak Depo uygulamasını tamamlar\n"
+"konum rotaları, İletme ve Çekme envanteri etkili uygulaması.\n"
+"\n"
+"Genellikle şu amaçla kullanılır:\n"
+"* Ürün üretim zincirlerini yönetme\n"
+"* Her bir ürün için varsayılan konumları yönetme\n"
+"* Aşağıdaki işletme ihtiyaçlarına göre deponuzdaki rotaları belirleme:\n"
+"   - Kalite Kontrol\n"
+"   - Satış Sonrası Hizmetler\n"
+"   - Tedarikçi İadeleri\n"
+"* Kiralanan ürünler için otomatik iade hareketleri oluşturarak kiralama "
+"yönetimine yardımcı olma\n"
+"\n"
+"Bu modül kurulduğunda, ürün formunda İletme ve Çekme özelliklerini "
+"ekleyebileceğiniz\n"
+"ilave bir sekme belirir. İletme/çekme için CPU1 ürünü gösterim verileri:\n"
+"\n"
+"İletme akışları\n"
+"----------\n"
+"İletme akışları, belirli bir ürünün belirli bir lokasyona ulaşması, ilgili "
+"başka bir konuma hareket\n"
+"tarafından, isteğe bağlı olarak belirli bir gecikme süresinden sonra, daima "
+"izlenmesi gerektiğinde kullanışlıdır.\n"
+"Orijinal Depo uygulaması, Konumlardaki İletme akışı gibi özellikleri zaten "
+"destekler, ancak\n"
+"bunlar her ürün için tavsiye edilmez.\n"
+"\n"
+"Bir iletme akışı özelliği hangi konumun hangi konuma ve hangi parametrelere "
+"bağlandığını\n"
+"gösterir. Ürünün belirli bir miktarı kaynak konuma hareket ettiğinde, akış "
+"özelliğinde ayarlanan parametrelere göre\n"
+"bağlı bir hareket otomatik olarak öngörülür\n"
+"(hedef konum, gecikme süresi, hareket türü, seyir durumu vb.) Parametrelere "
+"bağlı olarak, yeni hareket\n"
+"otomatik olarak işlenir veya manuel bir onay gerekir.\n"
+"\n"
+"Çekme akışları\n"
+"----------\n"
+"Çekme akışları, ürün hareketlerinin işlenmesine ilişkin olmayıp, daha ziyade "
+"satınalma siparişlerinin işlenmesine\n"
+"ilişkin olması bakımından, İletme akışlarından biraz farklıdır.\n"
+"Çekilecek olan şey, doğrudan ürün değil, bir ihtiyaçtır.\n"
+"Satıcı firma tedarik işlemlerinden sorumlu air ana Firma ile\n"
+"bir Satıcı firmaya sahip olduğunuz durum klasik bir İletme akışı durumudur.\n"
+"\n"
+"  [ Müşteri ] <- A - [ Satıcı Firma ]  <- B -  [ Holding ] <~ C ~ [ "
+"Tedarikçi ]\n"
+"\n"
+"Yeni bir satınalma siparişi (A, örneğin bir Satış Siparişi onayından gelen)\n"
+"Satıcı firmaya ulaştığında, Holding tarafından talep edilen başka bir "
+"satınalmaya (B, 'hareket' tipi İletme akışıyla)\n"
+"dönüştürülür. Satınalma siparişi B Holding firma tarafından işlendiğinde ve\n"
+"ürün stokta yoksa, Tedarikçiden bir Satınalma Siparişine (C) dönüştürülür\n"
+"(Satınalma tipi İletme akışı). Sonuç olarak satınalma siparişi, ihtiyaç, her "
+"türlü\n"
+"Müşteri ve Tedarikçi arasında iletilir.\n"
+"\n"
+"Teknik olarak, Çekma akışları satınalma siparişlerinin sadece ele alınan "
+"ürüne göre değil\n"
+"ürün için \"ihtiyaç\" duyulan konuma göre de farklı olarak işlenmesine "
+"olanak sağlar\n"
+"(örn. satınalma siparişinin gönderileceği hedef konum).\n"
+"\n"
+"Kullanım-Durumu\n"
+"--------\n"
+"\n"
+"Gösterim verilerini aşağıdaki gibi kullanabilirsiniz:\n"
+"  CPU1: Mağaza 1'den bir miktar CPU1 satın ve zamanlayıcıyı çalıştırın\n"
+"     - Depo: teslimat siparişi, Mağaza 1: resepsiyon\n"
+"  CPU3:\n"
+"     - Ürünü alırken, Kalite Kontrol konumuna gider ve ardından raf 2'ye "
+"saklanır.\n"
+"     - Müşteriye teslim edilirken: Alım Listesi -> Paketleme -> A Kapısından "
+"Teslimat Siparişi\n"
+"    "
 
 #. module: stock_location
 #: field:product.pulled.flow,type_proc:0
 msgid "Type of Procurement"
-msgstr ""
+msgstr "Satınalma Tipi"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
 msgid "Is used to know to which company belong packings and moves"
 msgstr ""
+"Paketleme ve hareketleri gerçekleştiren firmayı öğrenmek için kullanılır"
 
 #. module: stock_location
 #: field:product.pulled.flow,name:0
 msgid "Name"
-msgstr ""
+msgstr "Ad"
 
 #. module: stock_location
 #: help:product.product,path_ids:0
 msgid ""
 "These rules set the right path of the product in the whole location tree."
-msgstr ""
+msgstr "Bu kurallar, tüm konum ağacı boyunca doğru ürün rotasını ayarlar."
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
@@ -329,18 +415,18 @@ msgstr "Manuel Operasyon"
 #: model:ir.model,name:stock_location.model_product_product
 #: field:product.pulled.flow,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Ürün"
 
 #. module: stock_location
 #: field:product.pulled.flow,procure_method:0
 msgid "Procure Method"
-msgstr ""
+msgstr "Satınalma Metodu"
 
 #. module: stock_location
 #: field:product.pulled.flow,picking_type:0
 #: field:stock.location.path,picking_type:0
 msgid "Shipping Type"
-msgstr ""
+msgstr "Sevkıyat Türü"
 
 #. module: stock_location
 #: help:product.pulled.flow,procure_method:0
@@ -349,11 +435,14 @@ msgid ""
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
 msgstr ""
+"'Stokla': Gerektiğinde stoktan alın ya da tekrar tedarik edilinceye kadar "
+"bekleyin. 'Sipariş Ver': Gerektiğinde, satın alın ya da satınalma talebi "
+"oluşturun."
 
 #. module: stock_location
 #: help:product.pulled.flow,location_id:0
 msgid "Is the destination location that needs supplying"
-msgstr ""
+msgstr "Tedarik işleminin yapılacağı hedef konumdur"
 
 #. module: stock_location
 #: field:stock.location.path,product_id:0
@@ -364,18 +453,18 @@ msgstr "Stok Kartları"
 #: code:addons/stock_location/procurement_pull.py:118
 #, python-format
 msgid "Pulled from another location via procurement %d"
-msgstr ""
+msgstr "Satınalma %d aracılığıyla başka bir konumdan çekilir"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.stock_location_qualitytest0
 msgid "Quality Control"
-msgstr ""
+msgstr "Kalite Kontrol"
 
 #. module: stock_location
 #: selection:product.pulled.flow,invoice_state:0
 #: selection:stock.location.path,invoice_state:0
 msgid "Not Applicable"
-msgstr ""
+msgstr "Uygun Değil"
 
 #. module: stock_location
 #: field:stock.location.path,delay:0
@@ -389,11 +478,13 @@ msgid ""
 "Picking for pulled procurement coming from original location %s, pull rule "
 "%s, via original Procurement %s (#%d)"
 msgstr ""
+"Orijinal konumdan %s çekilen satınalma için alım, çekme kuralı %s, orijinal "
+"Satınalma %s (#%d) aracılığıyla"
 
 #. module: stock_location
 #: field:product.product,path_ids:0
 msgid "Pushed Flow"
-msgstr ""
+msgstr "İletilen Akış"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:89
@@ -402,21 +493,23 @@ msgid ""
 "Move for pulled procurement coming from original location %s, pull rule %s, "
 "via original Procurement %s (#%d)"
 msgstr ""
+"Orijinal konumdan %s iletilen satınalma için hareket, çekme kuralı %s, "
+"orijinal Satınalma %s (#%d) aracılığıyla"
 
 #. module: stock_location
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Aynı üründen olmayan bir grup atamaya çalışıyorsunuz"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "Satınalma"
 
 #. module: stock_location
 #: field:stock.location.path,location_dest_id:0
 msgid "Destination Location"
-msgstr "Hedef Lokasyon"
+msgstr "Varış Konumu"
 
 #. module: stock_location
 #: field:stock.location.path,auto:0
@@ -428,17 +521,17 @@ msgstr "Otomatik Hareket"
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
 msgid "Getting Goods"
-msgstr ""
+msgstr "Mal Alımı"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Action Type"
-msgstr ""
+msgstr "İşlem Tipi"
 
 #. module: stock_location
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz kazanç kodu"
 
 #. module: stock_location
 #: help:product.pulled.flow,picking_type:0
@@ -446,12 +539,12 @@ msgstr ""
 msgid ""
 "Depending on the company, choose whatever you want to receive or send "
 "products"
-msgstr ""
+msgstr "Firmaya göre, göndermek veya almak istediğiniz ürünleri seçin"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_order
 msgid "Order Processing"
-msgstr ""
+msgstr "Sipariş İşleme"
 
 #. module: stock_location
 #: field:stock.location.path,name:0
@@ -463,25 +556,25 @@ msgstr "Operasyon"
 #: field:product.product,path_ids:0
 #: view:stock.location.path:0
 msgid "Location Paths"
-msgstr "Lokasyon Rotası"
+msgstr "Konum Rotası"
 
 #. module: stock_location
 #: field:product.pulled.flow,journal_id:0
 #: field:stock.location.path,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Yevmiye defteri"
 
 #. module: stock_location
 #: field:product.pulled.flow,cancel_cascade:0
 #: field:stock.move,cancel_cascade:0
 msgid "Cancel Cascade"
-msgstr ""
+msgstr "Basamağı İptal Et"
 
 #. module: stock_location
 #: selection:product.pulled.flow,invoice_state:0
 #: selection:stock.location.path,invoice_state:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Faturalandırıldı"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index a90f4f81623..f34d34da4ab 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -41,7 +41,7 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Logistics Flows">
-                        <field name="flow_pull_ids" editable="bottom" colspan="4" nolabel="1">
+                        <field name="flow_pull_ids" colspan="4" nolabel="1">
                             <tree string="Pulled flows">
                                 <field name="name"/>
                                 <field name="location_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
@@ -69,7 +69,7 @@
                                 </group>
                             </form>
                         </field>
-                        <field name="path_ids" editable="bottom" colspan="4" nolabel="1">
+                        <field name="path_ids" colspan="4" nolabel="1">
                         <field name="name"/>
                             <tree string="Pushed flows">
                                 <field name="location_from_id"/>
diff --git a/addons/stock_no_autopicking/i18n/fi.po b/addons/stock_no_autopicking/i18n/fi.po
new file mode 100644
index 00000000000..36344c33350
--- /dev/null
+++ b/addons/stock_no_autopicking/i18n/fi.po
@@ -0,0 +1,70 @@
+# Finnish 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:58+0000\n"
+"PO-Revision-Date: 2011-06-08 10:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_product_product
+msgid "Product"
+msgstr "Tuote"
+
+#. module: stock_no_autopicking
+#: model:ir.module.module,description:stock_no_autopicking.module_meta_information
+msgid ""
+"\n"
+"    This module allows an intermediate picking process to provide raw "
+"materials\n"
+"    to production orders.\n"
+"\n"
+"    One example of usage of this module is to manage production made by "
+"your\n"
+"    suppliers (sub-contracting). To achieve this, set the assembled product\n"
+"    which is sub-contracted to \"No Auto-Picking\" and put the location of "
+"the\n"
+"    supplier in the routing of the assembly operation.\n"
+"    "
+msgstr ""
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Valmistustilaus"
+
+#. module: stock_no_autopicking
+#: field:product.product,auto_pick:0
+msgid "Auto Picking"
+msgstr "Automaattikeräily"
+
+#. module: stock_no_autopicking
+#: help:product.product,auto_pick:0
+msgid "Auto picking for raw materials of production orders."
+msgstr "Automaatikeräily tuotannon raaka-ainetilauksille"
+
+#. module: stock_no_autopicking
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Virhe: Väärä EAN-koodi"
+
+#. module: stock_no_autopicking
+#: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
+msgid "Stock No Auto-Picking"
+msgstr "Ei automaattista varastokeräilyä"
+
+#. module: stock_no_autopicking
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "Tilattu määrä ei voi olle negatiivinen tai nolla !"
diff --git a/addons/stock_no_autopicking/i18n/tr.po b/addons/stock_no_autopicking/i18n/tr.po
index 93acbf0f34c..d8e5d470883 100644
--- a/addons/stock_no_autopicking/i18n/tr.po
+++ b/addons/stock_no_autopicking/i18n/tr.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-09-09 07:11+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-06-27 18:34+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Ürün"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,description:stock_no_autopicking.module_meta_information
@@ -37,11 +37,23 @@ msgid ""
 "    supplier in the routing of the assembly operation.\n"
 "    "
 msgstr ""
+"\n"
+"    Bu Modül, üretim siparişlerine hammadde temin edilmesi için bir ara "
+"toplama işlemi\n"
+"    yapılmasını sağlar.\n"
+"\n"
+"    Bu modülün kullanımına bir örnek, tedarikçileriniz (taşeronlar) "
+"tarafından yapılan\n"
+"    üretimleri kullanmaktır. Bunu başarmak için, taşeron tarafından "
+"yapılarak monte edilen\n"
+"    ürününü \"Otomatik-Toplama değil\" e ayarlayın ve tedarikçinin konumunu "
+"montaj işlemine yönlendirin.\n"
+"    "
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Üretim Emri"
 
 #. module: stock_no_autopicking
 #: field:product.product,auto_pick:0
@@ -56,17 +68,17 @@ msgstr "Üretim emirlerinin yarı mamülleri için otomatik toplama."
 #. module: stock_no_autopicking
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz EAN kodu"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
 msgid "Stock No Auto-Picking"
-msgstr ""
+msgstr "Stok Otomatik Toplama Değil"
 
 #. module: stock_no_autopicking
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Sipariş miktarı negatif veya sıfır olamaz!"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/stock_planning/i18n/fi.po b/addons/stock_planning/i18n/fi.po
new file mode 100644
index 00000000000..db20057def9
--- /dev/null
+++ b/addons/stock_planning/i18n/fi.po
@@ -0,0 +1,1541 @@
+# Finnish 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-06-15 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-16 04:39+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
+#, python-format
+msgid ""
+"No forecasts for selected period or no products in selected category !"
+msgstr ""
+"Ei ennusteita valitulle ajanjaksolle tai ei tuotteita valitussa kategoriassa "
+"!"
+
+#. module: stock_planning
+#: help:stock.planning,stock_only:0
+msgid ""
+"Check to calculate stock location of selected warehouse only. If not "
+"selected calculation is made for input, stock and output location of "
+"warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,maximum_op:0
+msgid "Maximum Rule"
+msgstr "Maksimisääntä"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_company:0
+msgid "This Copmany Period1"
+msgstr "Yrityksen jakso 1"
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Group By..."
+msgstr "Ryhmittely.."
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_amt:0
+msgid ""
+"Forecast value which will be converted to Product Quantity according to "
+"prices."
+msgstr "Ennustemäärä joka muutetaan tuotemääriksi hintojen mukaan"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:621
+#: code:addons/stock_planning/stock_planning.py:663
+#, python-format
+msgid "Incoming Left must be greater than 0 !"
+msgstr "Jäljelläolevan vastaanoton määrä tulee olla yli 0 !"
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_before:0
+msgid ""
+"Planned Out in periods before calculated. Between start date of current "
+"period and one day before start of calculated period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
+#, python-format
+msgid "No products in selected category !"
+msgstr "Ei tuotteita valitussa kategoriassa !"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,warehouse_id:0
+msgid ""
+"Warehouse which forecasts will concern. If during stock planning you will "
+"need sales forecast for all warehouses choose any warehouse now."
+msgstr ""
+"Varasto, jota ennusteet koskevat. Jos varastonsuunnittelun aikana tarvitset "
+"myyntiennustetta kaikille varastoille valitse mikä tahansa varasto nyt"
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_left:0
+msgid "Expected Out"
+msgstr "Odotettu lähtö"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid " "
+msgstr " "
+
+#. module: stock_planning
+#: field:stock.planning,incoming_left:0
+msgid "Incoming Left"
+msgstr "Jäljelläolevat saapuvat"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Requisition history"
+msgstr "Pyyntöhistoria"
+
+#. module: stock_planning
+#: view:stock.sale.forecast.createlines:0
+msgid "Create Forecasts Lines"
+msgstr "Luo ennusterivit"
+
+#. module: stock_planning
+#: help:stock.planning,outgoing:0
+msgid "Quantity of all confirmed outgoing moves in calculated Period."
+msgstr ""
+"Kaikkien vahvistettujen lähtevien siirtojen määrä lasketulla ajanjaksolla."
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Daily Periods"
+msgstr "Luo päivittäiset jaksot"
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,company_id:0
+#: field:stock.planning.createlines,company_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,company_id:0
+#: field:stock.sale.forecast.createlines,company_id:0
+msgid "Company"
+msgstr "Yritys"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:640
+#: code:addons/stock_planning/stock_planning.py:682
+#, python-format
+msgid ""
+"\n"
+" Initial Stock: "
+msgstr ""
+"\n"
+" Alkuvarasto: "
+
+#. module: stock_planning
+#: help:stock.planning,warehouse_forecast:0
+msgid ""
+"All sales forecasts for selected Warehouse of selected Product during "
+"selected Period."
+msgstr ""
+"Kaikki myyntiennusteet valitulle varastolle tai valitulle tuotteelle "
+"valittuna ajanjaksona."
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
+msgid "Create Stock and Sales Periods"
+msgstr "Luo varasto ja myynti jaksot"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Minimum Stock Rule Indicators"
+msgstr "Minimivaraston sääntöjen indikaattorit"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,period_id:0
+msgid "Period which forecasts will concern."
+msgstr "Jakso jota ennusteet koskevat."
+
+#. module: stock_planning
+#: field:stock.planning,stock_only:0
+msgid "Stock Location Only"
+msgstr "Vain varastopaikka"
+
+#. module: stock_planning
+#: help:stock.planning,already_out:0
+msgid ""
+"Quantity which is already dispatched out of this warehouse in current period."
+msgstr ""
+"Määrä joka on jo lähetetty ulos tästä varastosta nykyisellä jaksolla."
+
+#. module: stock_planning
+#: help:stock.planning,procure_to_stock:0
+msgid ""
+"Chect to make procurement to stock location of selected warehouse. If not "
+"selected procurement will be made into input location of warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Current Period Situation"
+msgstr "Nykyisen jakson tilanne"
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Monthly Periods"
+msgstr "Luo kuukausijaksot"
+
+#. module: stock_planning
+#: help:stock.planning,supply_warehouse_id:0
+msgid ""
+"Warehouse used as source in supply pick move created by 'Supply from Another "
+"Warhouse'."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period_createlines
+msgid "stock.period.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_before:0
+msgid "Planned Out Before"
+msgstr "Suunniteltu lähtö ennen"
+
+#. module: stock_planning
+#: field:stock.planning.createlines,forecasted_products:0
+msgid "All Products with Forecast"
+msgstr "Kaikki tuotteet joilla ennuste"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Periods :"
+msgstr "Jaksot :"
+
+#. module: stock_planning
+#: help:stock.planning,already_in:0
+msgid ""
+"Quantity which is already picked up to this warehouse in current period."
+msgstr "Määrä joka on jo keräilty tästä varastosta nykyisellä jaksolla."
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:644
+#: code:addons/stock_planning/stock_planning.py:686
+#, python-format
+msgid "    Confirmed In Before: "
+msgstr "    Vahvistettu saapumeinen ennen: "
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Stock and Sales Forecast"
+msgstr "Varasto ja myyntiennuste"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast
+msgid "stock.sale.forecast"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_dept_id:0
+msgid "This Department"
+msgstr "Tämä osasto"
+
+#. module: stock_planning
+#: field:stock.planning,to_procure:0
+msgid "Planned In"
+msgstr "Suunniteltu saapuminen"
+
+#. module: stock_planning
+#: field:stock.planning,stock_simulation:0
+msgid "Stock Simulation"
+msgstr "Varastosimulaatio"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning_createlines
+msgid "stock.planning.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming_before:0
+msgid ""
+"Confirmed incoming in periods before calculated (Including Already In). "
+"Between start date of current period and one day before start of calculated "
+"period."
+msgstr ""
+"Vahvistetut saapumisjaksot ennen laskettua (mukana myös jo saapuneet). "
+"Nykyisen jakson alkupäivän ja laskettu jakso -1 päivää välillä."
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Search  Sales Forecast"
+msgstr "Etsi myyntiennuste"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_user:0
+msgid "This User Period5"
+msgstr "Käyttäjän jakso 5"
+
+#. module: stock_planning
+#: help:stock.planning,history:0
+msgid "History of procurement or internal supply of this planning line."
+msgstr "Hankintahistoria tai sisäinen toimitus tälle suunnittelulinjalle."
+
+#. module: stock_planning
+#: help:stock.planning,company_forecast:0
+msgid ""
+"All sales forecasts for whole company (for all Warehouses) of selected "
+"Product during selected Period."
+msgstr ""
+"Kaikki myyntiennusteet kokok yritykselle (kaikille varastoille) valitulle "
+"tuotteelle valittuna jaksona."
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_user:0
+msgid "This User Period1"
+msgstr "Käyttäjän jakso 1"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_user:0
+msgid "This User Period3"
+msgstr "Käyttäjän jakso 3"
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_main
+#: view:stock.planning:0
+msgid "Stock Planning"
+msgstr "Varaston suunnittelu"
+
+#. module: stock_planning
+#: field:stock.planning,minimum_op:0
+msgid "Minimum Rule"
+msgstr "Minimisääntö"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Procure Incoming Left"
+msgstr "Hanki loput saapuvat"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:646
+#: code:addons/stock_planning/stock_planning.py:688
+#, python-format
+msgid "    Incoming Left: "
+msgstr "    Saapuvia jäljellä: "
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:719
+#, python-format
+msgid "%s Pick List %s (%s,  %s) %s %s \n"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Create"
+msgstr "Luo"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
+#: model:ir.module.module,shortdesc:stock_planning.module_meta_information
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
+#: view:stock.planning:0
+msgid "Master Procurement Schedule"
+msgstr "Päähankintaaikataulu"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:636
+#: code:addons/stock_planning/stock_planning.py:678
+#, python-format
+msgid "  Creation Date: "
+msgstr "  Luontipäivä: "
+
+#. module: stock_planning
+#: field:stock.planning,period_id:0
+#: field:stock.planning.createlines,period_id:0
+#: field:stock.sale.forecast,period_id:0
+#: field:stock.sale.forecast.createlines,period_id:0
+msgid "Period"
+msgstr "Jakso"
+
+#. module: stock_planning
+#: view:stock.period:0
+#: field:stock.period,state:0
+#: field:stock.planning,state:0
+#: field:stock.sale.forecast,state:0
+msgid "State"
+msgstr "Tila"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category of products which created forecasts will concern."
+msgstr "Tuotekategoria tuotteille jota luotu ennuste koskee"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period
+msgid "stock period"
+msgstr "Varastojakso"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
+msgid "stock.sale.forecast.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_id:0
+#: field:stock.planning.createlines,warehouse_id:0
+#: field:stock.sale.forecast,warehouse_id:0
+#: field:stock.sale.forecast.createlines,warehouse_id:0
+msgid "Warehouse"
+msgstr "Varasto"
+
+#. module: stock_planning
+#: help:stock.planning,stock_simulation:0
+msgid ""
+"Stock simulation at the end of selected Period.\n"
+" For current period it is: \n"
+"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
+"For periods ahead it is: \n"
+"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
+"In."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,analyze_company:0
+msgid "Check this box to see the sales for whole company."
+msgstr "Valitse tämä nähdäksesi myynnin koko yrityksessä"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,name:0
+msgid "Name"
+msgstr "Nimi"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Search Stock Planning"
+msgstr "Hae varastosuunnitelma"
+
+#. module: stock_planning
+#: field:stock.planning,incoming_before:0
+msgid "Incoming Before"
+msgstr "Sapuu ennen"
+
+#. module: stock_planning
+#: field:stock.planning.createlines,product_categ_id:0
+#: field:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category"
+msgstr "Tuotteen kategoria"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:621
+#: code:addons/stock_planning/stock_planning.py:663
+#: code:addons/stock_planning/stock_planning.py:665
+#: code:addons/stock_planning/stock_planning.py:667
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
+#, python-format
+msgid "Error !"
+msgstr "Virhe !"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:626
+#, python-format
+msgid "Manual planning for %s"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_user_id:0
+msgid "This User"
+msgstr "Tämä käyttäjä"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:643
+#: code:addons/stock_planning/stock_planning.py:685
+#, python-format
+msgid ""
+"\n"
+" Confirmed Out: "
+msgstr ""
+"\n"
+" Vahvistettu lähtö: "
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecasts"
+msgstr "Ennusteet"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Supply from Another Warehouse"
+msgstr "Hanki toisesta varastosta"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculate Planning"
+msgstr "Laske suunnitelmat"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:636
+#, python-format
+msgid ""
+" Procurement created in MPS by user: %s   Creation Date: %s                  "
+"                       \n"
+" For period: %s                                         \n"
+" according to state:                                         \n"
+" Warehouse Forecast: %s                                         \n"
+" Initial Stock: %s                                         \n"
+" Planned Out: %s    Planned In: %s                                         \n"
+" Already Out: %s    Already In: %s                                         \n"
+" Confirmed Out: %s    Confirmed In: %s                                       "
+"  \n"
+" Planned Out Before: %s    Confirmed In Before: %s                           "
+"              \n"
+" Expected Out: %s    Incoming Left: %s                                       "
+"  \n"
+" Stock Simulation: %s    Minimum stock: %s"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:140
+#, python-format
+msgid "Invalid action !"
+msgstr "Virheellinen toiminto!"
+
+#. module: stock_planning
+#: help:stock.planning,stock_start:0
+msgid "Stock quantity one day before current period."
+msgstr "Varaston määrä päivää ennen nykyistä jaksoa"
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Weekly Periods"
+msgstr "Luo viikottaiset jaksot"
+
+#. module: stock_planning
+#: help:stock.planning,maximum_op:0
+msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
+msgstr "Maksimimäärä asetettu minimivarasto säännöissä tälle varastolle"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:665
+#, python-format
+msgid "You must specify a Source Warehouse !"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+msgid "Creates planning lines for selected period and warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_user:0
+msgid "This User Period4"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Note: Doesn't duplicate existing lines created by you."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Stock and Sales Period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,company_forecast:0
+msgid "Company Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,product_uom:0
+#: help:stock.sale.forecast,product_uom:0
+msgid ""
+"Unit of Measure used to show the quanities of stock calculation.You can use "
+"units form default category or from second category (UoS category)."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per User :"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
+#: view:stock.sale.forecast:0
+msgid "Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,name:0
+#: field:stock.period.createlines,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,user_id:0
+msgid "Created/Validated by"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Internal Supply"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_company:0
+msgid "This Company Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_company:0
+msgid "This Company Period5"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_company:0
+msgid "This Company Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_company:0
+msgid "This Company Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_start:0
+#: field:stock.period.createlines,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:642
+#: code:addons/stock_planning/stock_planning.py:684
+#, python-format
+msgid ""
+"\n"
+" Already Out: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,confirmed_forecasts_only:0
+msgid "Validated Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,product_categ_id:0
+msgid ""
+"Planning will be created for products from Product Category selected by this "
+"field. This field is ignored when you check \"All Forecasted Product\" box."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,planned_outgoing:0
+msgid "Planned Out"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Department :"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.period,state:0
+#: selection:stock.planning,state:0
+#: selection:stock.sale.forecast,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Closed"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Warehouse "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:646
+#: code:addons/stock_planning/stock_planning.py:688
+#, python-format
+msgid ""
+"\n"
+" Expected Out: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create periods for Stock and Sales Planning"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,planned_outgoing:0
+msgid ""
+"Enter planned outgoing quantity from selected Warehouse during the selected "
+"Period of selected Product. To plan this value look at Confirmed Out or "
+"Sales Forecasts. This value should be equal or greater than Confirmed Out."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.module.module,description:stock_planning.module_meta_information
+msgid ""
+"\n"
+"This module is based on original OpenERP SA module stock_planning version "
+"1.0 of the same name Master Procurement Schedule.\n"
+"\n"
+"Purpose of MPS is to allow create a manual procurement (requisition) apart "
+"of MRP scheduler (which works automatically on minimum stock rules).\n"
+"\n"
+"Terms used in the module:\n"
+"- Stock and Sales Period - is the time (between Start Date and End Date) for "
+"which you plan Stock and Sales Forecast and make Procurement Planning. \n"
+"- Stock and Sales Forecast - is the quantity of products you plan to sell in "
+"the Period.\n"
+"- Stock Planning - is the quantity of products you plan to purchase or "
+"produce for the Period.\n"
+"\n"
+"Because we have another module sale_forecast which uses terms \"Sales "
+"Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
+"Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
+"values. \n"
+"\n"
+"Activity with this module is divided to three steps:\n"
+"- Creating Periods. Mandatory step.\n"
+"- Creating Sale Forecasts and entering quantities to them. Optional step but "
+"useful for further planning.\n"
+"- Creating Planning lines, entering quantities to them and making "
+"Procurement. Making procurement is the final step for the Period.\n"
+"\n"
+"Periods\n"
+"=======\n"
+"You have two menu items for Periods in \"Sales Management - Configuration\". "
+"There are:\n"
+"- \"Create Sales Periods\" - Which automates creating daily, weekly or "
+"monthly periods.\n"
+"- \"Stock and sales Periods\" - Which allows to create any type of periods, "
+"change the dates and change the State of period.\n"
+"\n"
+"Creating periods is the first step you have to do to use modules features. "
+"You can create custom periods using \"New\" button in \"Stock and Sales "
+"Periods\" form or view but it is recommended to use automating tool.\n"
+"\n"
+"Remarks:\n"
+"- These periods (officially Stock and Sales Periods) are separated of "
+"Financial or other periods in the system.\n"
+"- Periods are not assigned to companies (when you use multicompany feature "
+"at all). Module suppose that you use the same periods across companies. If "
+"you wish to use different periods for different companies define them as you "
+"wish (they can overlap). Later on in this text will be indications how to "
+"use such periods.\n"
+"- When periods are created automatically their start and finish dates are "
+"with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
+"periods they will have start date 31.01.2010 00:00:00 and end date "
+"31.01.2010 23:59:00. It works only in automatic creation of periods. When "
+"you create periods manually you have to take care about hours because you "
+"can have incorrect values form sales or stock. \n"
+"- If you use overlapping periods for the same product, warehouse and company "
+"results can be unpredictable.\n"
+"- If current date doesn't belong to any period or you have holes between "
+"periods results can be unpredictable.\n"
+"\n"
+"Sales Forecasts\n"
+"===============\n"
+"You have few menus for Sales forecast in \"Sales Management - Sales "
+"Forecasts\".\n"
+"- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
+"forecasts lines according to some parameters.\n"
+"- \"Sales Forecasts\" - few menus for working with forecasts lists and "
+"forms.\n"
+"\n"
+"Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
+"products from selected Category, for selected Period and for selected "
+"Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
+"settings of period before this one to created one.\n"
+"\n"
+"Remarks:\n"
+"- This tool doesn't create lines, if relevant lines (for the same Product, "
+"Period, Warehouse and validated or created by you) already exists. If you "
+"wish to create another forecast, if relevant lines exists you have to do it "
+"manually using menus described bellow.\n"
+"- When created lines are validated by someone else you can use this tool to "
+"create another lines for the same Period, Product and Warehouse. \n"
+"- When you choose \"Copy Last Forecast\" created line takes quantity and "
+"some settings from your (validated by you or created by you if not validated "
+"yet) forecast which is for last period before period of created forecast. If "
+"there are few your forecasts for period before this one (it is possible) "
+"system takes one of them (no rule which of them).\n"
+"\n"
+"\n"
+"Menus \"Sales Forecasts\"\n"
+"On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
+"\"Product Quantity\". Further calculation can work for draft forecasts. But "
+"validation can save your data against any accidental changes. You can click "
+"\"Validate\" button but it is not mandatory.\n"
+"\n"
+"Instead of forecast quantity you can enter amount of forecast sales in field "
+"\"Product Amount\". System will count quantity from amount according to Sale "
+"price of the Product.\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form. "
+"You can select one of unit of measure from default category or from second "
+"category. When you change unit of measure the quanities will be recalculated "
+"according to new UoM: editable values (blue fields) immediately, non edited "
+"fields after clicking of \"Calculate Planning\" button.\n"
+"\n"
+"To find proper value for Sale Forecast you can use \"Sales History\" table "
+"for this product. You have to enter parameters to the top and left of this "
+"table and system will count sale quantities according to these parameters. "
+"So you can select fe. your department (at the top) then (to the left): last "
+"period, period before last and period year ago.\n"
+"\n"
+"Remarks:\n"
+"\n"
+"\n"
+"Procurement Planning\n"
+"====================\n"
+"Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
+"- \"Create Stock Planning Lines\" - allows you to automate creating planning "
+"lines according to some parameters.\n"
+"- \"Master Procurement Scheduler\" - is the most important menu of the "
+"module which allows to create procurement.\n"
+"\n"
+"As Sales forecast is phase of planning sales. The Procurement Planning "
+"(Planning) is the phase of scheduling Purchasing or Producing. You can "
+"create Procurement Planning quickly using tool from menu \"Create Stock "
+"Planning Lines\", then you can review created planning and make procurement "
+"using menu \"Master Procurement Schedule\".\n"
+"\n"
+"Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
+"lines for products from selected Category, for selected Period, and for "
+"selected Warehouse. When you check option \"All Products with Forecast\" "
+"system creates lines for all products having forecast for selected Period "
+"and Warehouse. Selected Category will be ignored in this case.\n"
+"\n"
+"Under menu \"Master Procurement Scheduler\" you can generally change the "
+"values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
+"Simulation\" and decide if this value would be accurate for end of the "
+"Period. \n"
+"\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
+"all forecasts for Period and Warehouse. But your planning can be based on "
+"any other information you have. It is not necessary to have any forecast. \n"
+"\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
+"is the quantity to be procured to make stock as indicated in \"Stock "
+"Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
+"quantity to minimum stock rules visible on the form. But you can plan "
+"different quantity than in Minimum Stock Rules. Calculation is made for "
+"whole Warehouse by default. But if you want to see values for Stock location "
+"of calculated warehouse you can use check box \"Stock Location Only\".\n"
+"\n"
+"If after few tries you decide that you found correct quantities for "
+"\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
+"stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
+"Left\" button to procure quantity of field \"Incoming Left\" into the "
+"Warehouse. System creates appropriate Procurement Order. You can decide if "
+"procurement will be made to Stock or Input location of calculated Warehouse. "
+"\n"
+"\n"
+"If you don't want to Produce or Buy the product but just pick calculated "
+"quantity from another warehouse you can click \"Supply from Another "
+"Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
+"with move from selected source Warehouse to calculated Warehouse (as "
+"destination). You can also decide if this pick should be done from Stock or "
+"Output location of source warehouse. Destination location (Stock or Input) "
+"of destination warehouse will be used as set for \"Procure Incoming Left\". "
+"\n"
+"\n"
+"To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
+"\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
+"have to click button \"Calculate Planning\".\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form. "
+"You can select one of unit of measure from default category or from second "
+"category. When you change unit of measure the quanities will be recalculated "
+"according to new UoM: editable values (blue fields) immediately, non edited "
+"fields after clicking of \"Calculate Planning\" button.\n"
+"\n"
+"How Stock Simulation field is calculated:\n"
+"Generally Stock Simulation shows the stock for end of the calculated period "
+"according to some planned or confirmed stock moves. Calculation always "
+"starts with quantity of real stock of beginning of current period. Then "
+"calculation adds or subtracts quantities of calculated period or periods "
+"before calculated.\n"
+"When you are in the same period (current period is the same as calculated) "
+"Stock Simulation is calculated as follows:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out \n"
+"\t+ Planned In\n"
+"\n"
+"When you calculate period next to current:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out of current Period \n"
+"\t+ Confirmed In of current Period  (incl. Already In)\n"
+"\t- Planned Out of calculated Period \n"
+"\t+ Planned In of calculated Period .\n"
+"\n"
+"As you see calculated Period is taken the same way like in case above. But "
+"calculation of current Period are made a little bit different. First you "
+"should note that system takes for current Period only Confirmed In moves. It "
+"means that you have to make planning and procurement for current Period "
+"before this calculation (for Period next to current). \n"
+"\n"
+"When you calculate Period ahead:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period \n"
+"\t- Sum of Planned Out of Periods before calculated \n"
+"\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
+"\t- Planned Out of calculated Period \n"
+"\t+ Planned In of calculated Period.\n"
+"\n"
+"Periods before calculated means periods starting from current till period "
+"before calculated.\n"
+"\n"
+"Remarks:\n"
+"- Remember to make planning for all periods before calculated because "
+"omitting these quantities and procurements can cause wrong suggestions for "
+"procurements few periods ahead.\n"
+"- If you made planning few periods ahead and you find that real Confirmed "
+"Out is bigger than Planned Out in some periods before you can repeat "
+"Planning and make another procurement. You should do it in the same planning "
+"line. If you create another planning line the suggestions can be wrong.\n"
+"- When you wish to work with different periods for some part of products "
+"define two kinds of periods (fe. Weekly and Monthly) and use them for "
+"different products. Example: If you use always Weekly periods for Products "
+"A, and Monthly periods for Products B your all calculations will work "
+"correctly. You can also use different kind of periods for the same products "
+"from different warehouse or companies. But you cannot use overlapping "
+"periods for the same product, warehouse and company because results can be "
+"unpredictable. The same apply to Forecasts lines.\n"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:140
+#, python-format
+msgid "Cannot delete Validated Sale Forecasts !"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:641
+#: code:addons/stock_planning/stock_planning.py:683
+#, python-format
+msgid ""
+"\n"
+" Planned Out: "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:667
+#, python-format
+msgid ""
+"You must specify a Source Warehouse different than calculated (destination) "
+"Warehouse !"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
+msgid "Create Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast.createlines:0
+msgid "Creates forecast lines for selected warehouse and period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:656
+#, python-format
+msgid "%s Requisition (%s,  %s) %s %s \n"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:655
+#, python-format
+msgid "Requisition ("
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_left:0
+msgid ""
+"Quantity expected to go out in selected period. As a difference between "
+"Planned Out and Confirmed Out. For current period Already Out is also "
+"calculated"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_id:0
+msgid "Period4"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:642
+#: code:addons/stock_planning/stock_planning.py:684
+#, python-format
+msgid "    Already In: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_id:0
+msgid "Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_id:0
+msgid "Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_id:0
+msgid "Period1"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:647
+#: code:addons/stock_planning/stock_planning.py:689
+#, python-format
+msgid "    Minimum stock: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,active_uom:0
+#: field:stock.sale.forecast,active_uom:0
+msgid "Active UoM"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
+#: view:stock.planning.createlines:0
+msgid "Create Stock Planning Lines"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "General Info"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
+msgid "Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Planning and Situation for Calculated Period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
+msgid "This Warehouse Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_forecast:0
+msgid "Warehouse Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:643
+#: code:addons/stock_planning/stock_planning.py:685
+#, python-format
+msgid "    Confirmed In: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Sales history"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,supply_warehouse_id:0
+msgid "Source Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_qty:0
+msgid "Forecasted quantity."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Stock"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_supply_location:0
+msgid "Stock Supply Location"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_stop:0
+msgid "Ending date for planning period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_user:0
+msgid "This User Period2"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,forecasted_products:0
+msgid ""
+"Check this box to create planning for all products having any forecast for "
+"selected Warehouse and Period. Product Category field will be ignored."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,already_in:0
+msgid "Already In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_uom_categ:0
+#: field:stock.planning,product_uos_categ:0
+#: field:stock.sale.forecast,product_uom_categ:0
+msgid "Product UoM Category"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming:0
+msgid "Confirmed In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,line_time:0
+msgid "Past/Future"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uos_categ:0
+msgid "Product UoS Category"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_qty:0
+msgid "Product Quantity"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy Last Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_id:0
+msgid "Shows which product this forecast concerns."
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.planning,state:0
+msgid "Done"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period.createlines,period_ids:0
+msgid "Periods"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:638
+#: code:addons/stock_planning/stock_planning.py:680
+#, python-format
+msgid " according to state:"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Cancel"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Close"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+#: selection:stock.sale.forecast,state:0
+msgid "Validated"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+msgid "Open"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy quantities from last Stock and Sale Forecast."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_dept:0
+msgid "This Dept Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_dept:0
+msgid "This Dept Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_dept:0
+msgid "This Dept Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_dept:0
+msgid "This Dept Period5"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_dept:0
+msgid "This Dept Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
+msgid "This Warehouse Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
+msgid "This Warehouse Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing:0
+msgid "Confirmed Out"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,create_uid:0
+msgid "Responsible"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Default UOM"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
+msgid "This Warehouse Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
+msgid "This Warehouse Period5"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Current"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning
+msgid "stock.planning"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,warehouse_id:0
+msgid ""
+"Shows which warehouse this forecast concerns. If during stock planning you "
+"will need sales forecast for all warehouses choose any warehouse now."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,warehouse_id:0
+msgid "Warehouse which planning will concern."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:647
+#: code:addons/stock_planning/stock_planning.py:689
+#, python-format
+msgid ""
+"\n"
+" Stock Simulation: "
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,to_procure:0
+msgid ""
+"Enter quantity which (by your plan) should come in. Change this value and "
+"observe Stock simulation. This value should be equal or greater than "
+"Confirmed In."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,period_id:0
+msgid "Period which planning will concern."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,already_out:0
+msgid "Already Out"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,product_id:0
+msgid "Product which this planning is created for."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Warehouse :"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:639
+#: code:addons/stock_planning/stock_planning.py:681
+#, python-format
+msgid ""
+"\n"
+" Warehouse Forecast: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,history:0
+msgid "Procurement History"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_start:0
+msgid "Starting date for planning period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:641
+#: code:addons/stock_planning/stock_planning.py:683
+#, python-format
+msgid "    Planned In: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyze_company:0
+msgid "Per Company"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming_left:0
+msgid ""
+"Quantity left to Planned incoming quantity. This is calculated difference "
+"between Planned In and Confirmed In. For current period Already In is also "
+"calculated. This value is used to create procurement for lacking quantity."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming:0
+msgid "Quantity of all confirmed incoming moves in calculated Period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_stop:0
+#: field:stock.period.createlines,date_stop:0
+msgid "End Date"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_supply_location:0
+msgid ""
+"Check to supply from Stock location of Supply Warehouse. If not checked "
+"supply will be made from Output location of Supply Warehouse. Used in "
+"'Supply from Another Warhouse' with Supply Warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "No Requisition"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,minimum_op:0
+msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,period_id:0
+msgid "Shows which period this forecast concerns."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_uom:0
+msgid "UoM"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculated Period Simulation"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,product_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:638
+#: code:addons/stock_planning/stock_planning.py:680
+#, python-format
+msgid ""
+"\n"
+"For period: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:627
+#: code:addons/stock_planning/stock_planning.py:673
+#: code:addons/stock_planning/stock_planning.py:697
+#, python-format
+msgid "MPS(%s) %s"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:627
+#: code:addons/stock_planning/stock_planning.py:671
+#: code:addons/stock_planning/stock_planning.py:693
+#, python-format
+msgid "MPS("
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:680
+#, python-format
+msgid ""
+"Pick created from MPS by user: %s   Creation Date: %s                        "
+"             \n"
+"For period: %s   according to state:                                     \n"
+" Warehouse Forecast: %s                                     \n"
+" Initial Stock: %s                                     \n"
+" Planned Out: %s  Planned In: %s                                     \n"
+" Already Out: %s  Already In: %s                                     \n"
+" Confirmed Out: %s   Confirmed In: %s                                     \n"
+" Planned Out Before: %s   Confirmed In Before: %s                            "
+"         \n"
+" Expected Out: %s   Incoming Left: %s                                     \n"
+" Stock Simulation: %s   Minimum stock: %s "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,procure_to_stock:0
+msgid "Procure To Stock Location"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Approve"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,period_id:0
+msgid ""
+"Period for this planning. Requisition will be created for beginning of the "
+"period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Calculate Sales History"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_amt:0
+msgid "Product Amount"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,confirmed_forecasts_only:0
+msgid ""
+"Check to take validated forecasts only. If not checked system takes "
+"validated and draft forecasts."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_id:0
+msgid "Period5"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
+msgid "Stock and Sales Planning Periods"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_warehouse_id:0
+msgid "This Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
+#: view:stock.period:0
+#: view:stock.period.createlines:0
+msgid "Stock and Sales Periods"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,user_id:0
+msgid "Shows who created this forecast, or who validated."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:644
+#: code:addons/stock_planning/stock_planning.py:686
+#, python-format
+msgid ""
+"\n"
+" Planned Out Before: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_start:0
+msgid "Initial Stock"
+msgstr ""
+
+#, python-format
+#~ msgid "Pick List "
+#~ msgstr "Keräilylista "
+
+#, python-format
+#~ msgid "Manual planning for "
+#~ msgstr "Käsin tehty suunnitelma "
+
+#, python-format
+#~ msgid "Procurement created in MPS by user: "
+#~ msgstr "Hankinta luotu MPS:ssä käyttäjän toimesta: "
diff --git a/addons/stock_planning/i18n/gl.po b/addons/stock_planning/i18n/gl.po
new file mode 100644
index 00000000000..e7bde8b441d
--- /dev/null
+++ b/addons/stock_planning/i18n/gl.po
@@ -0,0 +1,1792 @@
+# Galician 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-06-08 08:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@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-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
+#, python-format
+msgid ""
+"No forecasts for selected period or no products in selected category !"
+msgstr ""
+"Non hai previsións para o período seleccionado ou non hai produtos na "
+"categoría seleccionada!"
+
+#. module: stock_planning
+#: help:stock.planning,stock_only:0
+msgid ""
+"Check to calculate stock location of selected warehouse only. If not "
+"selected calculation is made for input, stock and output location of "
+"warehouse."
+msgstr ""
+"Marque esta opción para calcular o stock só do lugar stock do almacén "
+"seleccionado. Se non se marca, o cálculo se realiza para os lugares de "
+"entrada, stock e saída do almacén."
+
+#. module: stock_planning
+#: field:stock.planning,maximum_op:0
+msgid "Maximum Rule"
+msgstr "Regra máximo"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_company:0
+msgid "This Copmany Period1"
+msgstr "Esta compañía período1"
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_amt:0
+msgid ""
+"Forecast value which will be converted to Product Quantity according to "
+"prices."
+msgstr ""
+"Valor da previsión que se converterá en cantidade de produto en función dos "
+"prezos."
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:621
+#: code:addons/stock_planning/stock_planning.py:663
+#, python-format
+msgid "Incoming Left must be greater than 0 !"
+msgstr "Entradas restantes debe ser maior que 0!"
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_before:0
+msgid ""
+"Planned Out in periods before calculated. Between start date of current "
+"period and one day before start of calculated period."
+msgstr ""
+"Saídas planificadas en períodos anteriores ó calculado. Entre a data de "
+"inicio do período actual e un día antes do comezo do período calculado."
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
+#, python-format
+msgid "No products in selected category !"
+msgstr "Non hai produtos na categoría seleccionada!"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,warehouse_id:0
+msgid ""
+"Warehouse which forecasts will concern. If during stock planning you will "
+"need sales forecast for all warehouses choose any warehouse now."
+msgstr ""
+"Almacén ó que concernen as previsións. Se durante a planificación de stock "
+"precisa previsións de vendas para tódolos almacéns escolla agora un almacén "
+"calquera."
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_left:0
+msgid "Expected Out"
+msgstr "Saídas previstas"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid " "
+msgstr " "
+
+#. module: stock_planning
+#: field:stock.planning,incoming_left:0
+msgid "Incoming Left"
+msgstr "Entradas restantes"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Requisition history"
+msgstr "Historial demandas"
+
+#. module: stock_planning
+#: view:stock.sale.forecast.createlines:0
+msgid "Create Forecasts Lines"
+msgstr "Crear liñas de previsións"
+
+#. module: stock_planning
+#: help:stock.planning,outgoing:0
+msgid "Quantity of all confirmed outgoing moves in calculated Period."
+msgstr "Cantidades de tódalas saídas confirmadas no período calculado."
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Daily Periods"
+msgstr "Crear períodos diarios"
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,company_id:0
+#: field:stock.planning.createlines,company_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,company_id:0
+#: field:stock.sale.forecast.createlines,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:640
+#: code:addons/stock_planning/stock_planning.py:682
+#, python-format
+msgid ""
+"\n"
+" Initial Stock: "
+msgstr ""
+"\n"
+" Stock inicial: "
+
+#. module: stock_planning
+#: help:stock.planning,warehouse_forecast:0
+msgid ""
+"All sales forecasts for selected Warehouse of selected Product during "
+"selected Period."
+msgstr ""
+"Tódalas previsións de vendas para o almacén seleccionado do produto "
+"seleccionado durante o periodo seleccionado."
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
+msgid "Create Stock and Sales Periods"
+msgstr "Crear períodos de stock e vendas"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Minimum Stock Rule Indicators"
+msgstr "Indicadores de regras de stock mínimo"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,period_id:0
+msgid "Period which forecasts will concern."
+msgstr "Período ó que concernen as previsións."
+
+#. module: stock_planning
+#: field:stock.planning,stock_only:0
+msgid "Stock Location Only"
+msgstr "Só lugares de stock"
+
+#. module: stock_planning
+#: help:stock.planning,already_out:0
+msgid ""
+"Quantity which is already dispatched out of this warehouse in current period."
+msgstr "Cantidades que xa se enviaron fóra deste almacén no período actual."
+
+#. module: stock_planning
+#: help:stock.planning,procure_to_stock:0
+msgid ""
+"Chect to make procurement to stock location of selected warehouse. If not "
+"selected procurement will be made into input location of warehouse."
+msgstr ""
+"Marque esta opción para realizar os abastecementos no lugar de stock do "
+"almacén seleccionado. Se non se marca, realizarase o abastecemento no lugar "
+"de entrada do almacén."
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Current Period Situation"
+msgstr "Situación do período actual"
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Monthly Periods"
+msgstr "Crear períodos mensuais"
+
+#. module: stock_planning
+#: help:stock.planning,supply_warehouse_id:0
+msgid ""
+"Warehouse used as source in supply pick move created by 'Supply from Another "
+"Warhouse'."
+msgstr ""
+"Almacén usado como orixe no movemento do subministro creado por "
+"'Subministrar desde outro almacén'."
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period_createlines
+msgid "stock.period.createlines"
+msgstr "stock.período.crearliñas"
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_before:0
+msgid "Planned Out Before"
+msgstr "Saídas planificadas antes"
+
+#. module: stock_planning
+#: field:stock.planning.createlines,forecasted_products:0
+msgid "All Products with Forecast"
+msgstr "Tódolos produtos con previsión"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Periods :"
+msgstr "Períodos:"
+
+#. module: stock_planning
+#: help:stock.planning,already_in:0
+msgid ""
+"Quantity which is already picked up to this warehouse in current period."
+msgstr "Cantidades que xa foron recollidas neste almacén no período actual."
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:644
+#: code:addons/stock_planning/stock_planning.py:686
+#, python-format
+msgid "    Confirmed In Before: "
+msgstr "    Entradas confirmadas antes: "
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Stock and Sales Forecast"
+msgstr "Previsións de stock e vendas"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast
+msgid "stock.sale.forecast"
+msgstr "stock.vendas.previsión"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_dept_id:0
+msgid "This Department"
+msgstr "Este departamento"
+
+#. module: stock_planning
+#: field:stock.planning,to_procure:0
+msgid "Planned In"
+msgstr "Entradas planificadas"
+
+#. module: stock_planning
+#: field:stock.planning,stock_simulation:0
+msgid "Stock Simulation"
+msgstr "Simulación de stock"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning_createlines
+msgid "stock.planning.createlines"
+msgstr "stock.planificación.crearliñas"
+
+#. module: stock_planning
+#: help:stock.planning,incoming_before:0
+msgid ""
+"Confirmed incoming in periods before calculated (Including Already In). "
+"Between start date of current period and one day before start of calculated "
+"period."
+msgstr ""
+"Entradas confirmadas en períodos anteriores ó calculado (incluíndo as "
+"entradas realizadas). Entre a data de inicio do período actual e un día "
+"antes do comezo do período calculado."
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Search  Sales Forecast"
+msgstr "Buscar previsións de vendas"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_user:0
+msgid "This User Period5"
+msgstr "O período deste usuario5"
+
+#. module: stock_planning
+#: help:stock.planning,history:0
+msgid "History of procurement or internal supply of this planning line."
+msgstr ""
+"Historial do abastecemento ou subministración interna desta liña de "
+"planificación."
+
+#. module: stock_planning
+#: help:stock.planning,company_forecast:0
+msgid ""
+"All sales forecasts for whole company (for all Warehouses) of selected "
+"Product during selected Period."
+msgstr ""
+"Tódalas previsións para a compañía enteira (para tódolos almacéns) do "
+"produto seleccionado durante o período seleccionado."
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_user:0
+msgid "This User Period1"
+msgstr "O período deste usuario1"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_user:0
+msgid "This User Period3"
+msgstr "O período deste usuario3"
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_main
+#: view:stock.planning:0
+msgid "Stock Planning"
+msgstr "Planificación de stock"
+
+#. module: stock_planning
+#: field:stock.planning,minimum_op:0
+msgid "Minimum Rule"
+msgstr "Regra de mínimos"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Procure Incoming Left"
+msgstr "Entradas abastecemento restante"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:646
+#: code:addons/stock_planning/stock_planning.py:688
+#, python-format
+msgid "    Incoming Left: "
+msgstr "    Entrada restante: "
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:719
+#, python-format
+msgid "%s Pick List %s (%s,  %s) %s %s \n"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Create"
+msgstr "Crear"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
+#: model:ir.module.module,shortdesc:stock_planning.module_meta_information
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
+#: view:stock.planning:0
+msgid "Master Procurement Schedule"
+msgstr "Plan mestre de abastecemento"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:636
+#: code:addons/stock_planning/stock_planning.py:678
+#, python-format
+msgid "  Creation Date: "
+msgstr "  Data de creación: "
+
+#. module: stock_planning
+#: field:stock.planning,period_id:0
+#: field:stock.planning.createlines,period_id:0
+#: field:stock.sale.forecast,period_id:0
+#: field:stock.sale.forecast.createlines,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: stock_planning
+#: view:stock.period:0
+#: field:stock.period,state:0
+#: field:stock.planning,state:0
+#: field:stock.sale.forecast,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category of products which created forecasts will concern."
+msgstr "Categoría dos produtos cuxas previsións se crearán."
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period
+msgid "stock period"
+msgstr "período stock"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
+msgid "stock.sale.forecast.createlines"
+msgstr "stock.venda.previsión.crearliñas"
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_id:0
+#: field:stock.planning.createlines,warehouse_id:0
+#: field:stock.sale.forecast,warehouse_id:0
+#: field:stock.sale.forecast.createlines,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: stock_planning
+#: help:stock.planning,stock_simulation:0
+msgid ""
+"Stock simulation at the end of selected Period.\n"
+" For current period it is: \n"
+"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
+"For periods ahead it is: \n"
+"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
+"In."
+msgstr ""
+"Simulación de stock ó final do período seleccionado. Para o período actual "
+"é: Stock inicial – saídas + entradas – saídas previstas + entradas "
+"esperadas. Para os seguintes períodos é: Stock inicial – saídas previstas "
+"anteriores + entradas anteriores – saídas previstas + entradas previstas."
+
+#. module: stock_planning
+#: help:stock.sale.forecast,analyze_company:0
+msgid "Check this box to see the sales for whole company."
+msgstr "Seleccione esta casa para ver as vendas de toda a compañía."
+
+#. module: stock_planning
+#: field:stock.sale.forecast,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Search Stock Planning"
+msgstr "Buscar planificación de stock"
+
+#. module: stock_planning
+#: field:stock.planning,incoming_before:0
+msgid "Incoming Before"
+msgstr "Entradas antes"
+
+#. module: stock_planning
+#: field:stock.planning.createlines,product_categ_id:0
+#: field:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category"
+msgstr "Categoría de Produto"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:621
+#: code:addons/stock_planning/stock_planning.py:663
+#: code:addons/stock_planning/stock_planning.py:665
+#: code:addons/stock_planning/stock_planning.py:667
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
+#, python-format
+msgid "Error !"
+msgstr "Erro!"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:626
+#, python-format
+msgid "Manual planning for %s"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_user_id:0
+msgid "This User"
+msgstr "Este usuario"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:643
+#: code:addons/stock_planning/stock_planning.py:685
+#, python-format
+msgid ""
+"\n"
+" Confirmed Out: "
+msgstr ""
+"\n"
+" Saídas confirmadas: "
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecasts"
+msgstr "Previsións"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Supply from Another Warehouse"
+msgstr "Abastecer desde outro almacen"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculate Planning"
+msgstr "Calcular planificación"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:636
+#, python-format
+msgid ""
+" Procurement created in MPS by user: %s   Creation Date: %s                  "
+"                       \n"
+" For period: %s                                         \n"
+" according to state:                                         \n"
+" Warehouse Forecast: %s                                         \n"
+" Initial Stock: %s                                         \n"
+" Planned Out: %s    Planned In: %s                                         \n"
+" Already Out: %s    Already In: %s                                         \n"
+" Confirmed Out: %s    Confirmed In: %s                                       "
+"  \n"
+" Planned Out Before: %s    Confirmed In Before: %s                           "
+"              \n"
+" Expected Out: %s    Incoming Left: %s                                       "
+"  \n"
+" Stock Simulation: %s    Minimum stock: %s"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:140
+#, python-format
+msgid "Invalid action !"
+msgstr "Acción non válida!"
+
+#. module: stock_planning
+#: help:stock.planning,stock_start:0
+msgid "Stock quantity one day before current period."
+msgstr "Cantidade do stock un día antes do período actual."
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Weekly Periods"
+msgstr "Crear períodos semanais"
+
+#. module: stock_planning
+#: help:stock.planning,maximum_op:0
+msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
+msgstr ""
+"Cantidade máxima establecida nas regras de stock mínimo para este almacén."
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:665
+#, python-format
+msgid "You must specify a Source Warehouse !"
+msgstr "Debe especificar un almacén de orixe!"
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+msgid "Creates planning lines for selected period and warehouse."
+msgstr "Crea liñas de planificación para o período e almacén seleccionados."
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_user:0
+msgid "This User Period4"
+msgstr "Este período de usuario4"
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Note: Doesn't duplicate existing lines created by you."
+msgstr "Nota: Non duplica as liñas creadas por vostede."
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Stock and Sales Period"
+msgstr "Período de stock e vendas"
+
+#. module: stock_planning
+#: field:stock.planning,company_forecast:0
+msgid "Company Forecast"
+msgstr "Previsión da compañía"
+
+#. module: stock_planning
+#: help:stock.planning,product_uom:0
+#: help:stock.sale.forecast,product_uom:0
+msgid ""
+"Unit of Measure used to show the quanities of stock calculation.You can use "
+"units form default category or from second category (UoS category)."
+msgstr ""
+"Unidade de medida utilizada para amosar as cantidades calculadas de stock. "
+"Pode utilizar as unidades da categoría por defecto ou as da segunda "
+"categoría (categoría UdV)."
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per User :"
+msgstr "Por usuario:"
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
+#: view:stock.sale.forecast:0
+msgid "Sales Forecasts"
+msgstr "Previsións de vendas"
+
+#. module: stock_planning
+#: field:stock.period,name:0
+#: field:stock.period.createlines,name:0
+msgid "Period Name"
+msgstr "Nome do Período"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,user_id:0
+msgid "Created/Validated by"
+msgstr "Creado/Validado por"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Internal Supply"
+msgstr "Subministración interna"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_company:0
+msgid "This Company Period4"
+msgstr "O período desta compañía4"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_company:0
+msgid "This Company Period5"
+msgstr "O período desta compañía5"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_company:0
+msgid "This Company Period2"
+msgstr "O período desta compañía2"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_company:0
+msgid "This Company Period3"
+msgstr "O período desta compañía3"
+
+#. module: stock_planning
+#: field:stock.period,date_start:0
+#: field:stock.period.createlines,date_start:0
+msgid "Start Date"
+msgstr "Data de comezo"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:642
+#: code:addons/stock_planning/stock_planning.py:684
+#, python-format
+msgid ""
+"\n"
+" Already Out: "
+msgstr ""
+"\n"
+" Saídas realizadas: "
+
+#. module: stock_planning
+#: field:stock.planning,confirmed_forecasts_only:0
+msgid "Validated Forecasts"
+msgstr "Previsións validadas"
+
+#. module: stock_planning
+#: help:stock.planning.createlines,product_categ_id:0
+msgid ""
+"Planning will be created for products from Product Category selected by this "
+"field. This field is ignored when you check \"All Forecasted Product\" box."
+msgstr ""
+"Crearase a planificación para os produtos da categoría de produtos "
+"seleccionada con este campo. Cando se marca a opción \"Tódalas previsións de "
+"produtos\", ignórase este campo."
+
+#. module: stock_planning
+#: field:stock.planning,planned_outgoing:0
+msgid "Planned Out"
+msgstr "Saídas planificadas"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Department :"
+msgstr "Por departamento:"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecast"
+msgstr "Previsión"
+
+#. module: stock_planning
+#: selection:stock.period,state:0
+#: selection:stock.planning,state:0
+#: selection:stock.sale.forecast,state:0
+msgid "Draft"
+msgstr "Proxecto"
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Closed"
+msgstr "Pechado"
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Warehouse "
+msgstr "Almacén "
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:646
+#: code:addons/stock_planning/stock_planning.py:688
+#, python-format
+msgid ""
+"\n"
+" Expected Out: "
+msgstr ""
+"\n"
+" Saídas previstas: "
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create periods for Stock and Sales Planning"
+msgstr "Crear períodos para planificación de stock e vendas"
+
+#. module: stock_planning
+#: help:stock.planning,planned_outgoing:0
+msgid ""
+"Enter planned outgoing quantity from selected Warehouse during the selected "
+"Period of selected Product. To plan this value look at Confirmed Out or "
+"Sales Forecasts. This value should be equal or greater than Confirmed Out."
+msgstr ""
+"Introduza a cantidade saínte planificada para o almacén seleccionado durante "
+"o período seleccionado e para o produto seleccionado. Para planificar este "
+"valor, pódese fixar nas saídas confirmadas ou nas previsións de vendas. Este "
+"valor debería ser igual ou superior ás saídas confirmadas."
+
+#. module: stock_planning
+#: model:ir.module.module,description:stock_planning.module_meta_information
+msgid ""
+"\n"
+"This module is based on original OpenERP SA module stock_planning version "
+"1.0 of the same name Master Procurement Schedule.\n"
+"\n"
+"Purpose of MPS is to allow create a manual procurement (requisition) apart "
+"of MRP scheduler (which works automatically on minimum stock rules).\n"
+"\n"
+"Terms used in the module:\n"
+"- Stock and Sales Period - is the time (between Start Date and End Date) for "
+"which you plan Stock and Sales Forecast and make Procurement Planning. \n"
+"- Stock and Sales Forecast - is the quantity of products you plan to sell in "
+"the Period.\n"
+"- Stock Planning - is the quantity of products you plan to purchase or "
+"produce for the Period.\n"
+"\n"
+"Because we have another module sale_forecast which uses terms \"Sales "
+"Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
+"Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
+"values. \n"
+"\n"
+"Activity with this module is divided to three steps:\n"
+"- Creating Periods. Mandatory step.\n"
+"- Creating Sale Forecasts and entering quantities to them. Optional step but "
+"useful for further planning.\n"
+"- Creating Planning lines, entering quantities to them and making "
+"Procurement. Making procurement is the final step for the Period.\n"
+"\n"
+"Periods\n"
+"=======\n"
+"You have two menu items for Periods in \"Sales Management - Configuration\". "
+"There are:\n"
+"- \"Create Sales Periods\" - Which automates creating daily, weekly or "
+"monthly periods.\n"
+"- \"Stock and sales Periods\" - Which allows to create any type of periods, "
+"change the dates and change the State of period.\n"
+"\n"
+"Creating periods is the first step you have to do to use modules features. "
+"You can create custom periods using \"New\" button in \"Stock and Sales "
+"Periods\" form or view but it is recommended to use automating tool.\n"
+"\n"
+"Remarks:\n"
+"- These periods (officially Stock and Sales Periods) are separated of "
+"Financial or other periods in the system.\n"
+"- Periods are not assigned to companies (when you use multicompany feature "
+"at all). Module suppose that you use the same periods across companies. If "
+"you wish to use different periods for different companies define them as you "
+"wish (they can overlap). Later on in this text will be indications how to "
+"use such periods.\n"
+"- When periods are created automatically their start and finish dates are "
+"with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
+"periods they will have start date 31.01.2010 00:00:00 and end date "
+"31.01.2010 23:59:00. It works only in automatic creation of periods. When "
+"you create periods manually you have to take care about hours because you "
+"can have incorrect values form sales or stock. \n"
+"- If you use overlapping periods for the same product, warehouse and company "
+"results can be unpredictable.\n"
+"- If current date doesn't belong to any period or you have holes between "
+"periods results can be unpredictable.\n"
+"\n"
+"Sales Forecasts\n"
+"===============\n"
+"You have few menus for Sales forecast in \"Sales Management - Sales "
+"Forecasts\".\n"
+"- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
+"forecasts lines according to some parameters.\n"
+"- \"Sales Forecasts\" - few menus for working with forecasts lists and "
+"forms.\n"
+"\n"
+"Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
+"products from selected Category, for selected Period and for selected "
+"Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
+"settings of period before this one to created one.\n"
+"\n"
+"Remarks:\n"
+"- This tool doesn't create lines, if relevant lines (for the same Product, "
+"Period, Warehouse and validated or created by you) already exists. If you "
+"wish to create another forecast, if relevant lines exists you have to do it "
+"manually using menus described bellow.\n"
+"- When created lines are validated by someone else you can use this tool to "
+"create another lines for the same Period, Product and Warehouse. \n"
+"- When you choose \"Copy Last Forecast\" created line takes quantity and "
+"some settings from your (validated by you or created by you if not validated "
+"yet) forecast which is for last period before period of created forecast. If "
+"there are few your forecasts for period before this one (it is possible) "
+"system takes one of them (no rule which of them).\n"
+"\n"
+"\n"
+"Menus \"Sales Forecasts\"\n"
+"On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
+"\"Product Quantity\". Further calculation can work for draft forecasts. But "
+"validation can save your data against any accidental changes. You can click "
+"\"Validate\" button but it is not mandatory.\n"
+"\n"
+"Instead of forecast quantity you can enter amount of forecast sales in field "
+"\"Product Amount\". System will count quantity from amount according to Sale "
+"price of the Product.\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form. "
+"You can select one of unit of measure from default category or from second "
+"category. When you change unit of measure the quanities will be recalculated "
+"according to new UoM: editable values (blue fields) immediately, non edited "
+"fields after clicking of \"Calculate Planning\" button.\n"
+"\n"
+"To find proper value for Sale Forecast you can use \"Sales History\" table "
+"for this product. You have to enter parameters to the top and left of this "
+"table and system will count sale quantities according to these parameters. "
+"So you can select fe. your department (at the top) then (to the left): last "
+"period, period before last and period year ago.\n"
+"\n"
+"Remarks:\n"
+"\n"
+"\n"
+"Procurement Planning\n"
+"====================\n"
+"Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
+"- \"Create Stock Planning Lines\" - allows you to automate creating planning "
+"lines according to some parameters.\n"
+"- \"Master Procurement Scheduler\" - is the most important menu of the "
+"module which allows to create procurement.\n"
+"\n"
+"As Sales forecast is phase of planning sales. The Procurement Planning "
+"(Planning) is the phase of scheduling Purchasing or Producing. You can "
+"create Procurement Planning quickly using tool from menu \"Create Stock "
+"Planning Lines\", then you can review created planning and make procurement "
+"using menu \"Master Procurement Schedule\".\n"
+"\n"
+"Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
+"lines for products from selected Category, for selected Period, and for "
+"selected Warehouse. When you check option \"All Products with Forecast\" "
+"system creates lines for all products having forecast for selected Period "
+"and Warehouse. Selected Category will be ignored in this case.\n"
+"\n"
+"Under menu \"Master Procurement Scheduler\" you can generally change the "
+"values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
+"Simulation\" and decide if this value would be accurate for end of the "
+"Period. \n"
+"\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
+"all forecasts for Period and Warehouse. But your planning can be based on "
+"any other information you have. It is not necessary to have any forecast. \n"
+"\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
+"is the quantity to be procured to make stock as indicated in \"Stock "
+"Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
+"quantity to minimum stock rules visible on the form. But you can plan "
+"different quantity than in Minimum Stock Rules. Calculation is made for "
+"whole Warehouse by default. But if you want to see values for Stock location "
+"of calculated warehouse you can use check box \"Stock Location Only\".\n"
+"\n"
+"If after few tries you decide that you found correct quantities for "
+"\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
+"stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
+"Left\" button to procure quantity of field \"Incoming Left\" into the "
+"Warehouse. System creates appropriate Procurement Order. You can decide if "
+"procurement will be made to Stock or Input location of calculated Warehouse. "
+"\n"
+"\n"
+"If you don't want to Produce or Buy the product but just pick calculated "
+"quantity from another warehouse you can click \"Supply from Another "
+"Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
+"with move from selected source Warehouse to calculated Warehouse (as "
+"destination). You can also decide if this pick should be done from Stock or "
+"Output location of source warehouse. Destination location (Stock or Input) "
+"of destination warehouse will be used as set for \"Procure Incoming Left\". "
+"\n"
+"\n"
+"To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
+"\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
+"have to click button \"Calculate Planning\".\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form. "
+"You can select one of unit of measure from default category or from second "
+"category. When you change unit of measure the quanities will be recalculated "
+"according to new UoM: editable values (blue fields) immediately, non edited "
+"fields after clicking of \"Calculate Planning\" button.\n"
+"\n"
+"How Stock Simulation field is calculated:\n"
+"Generally Stock Simulation shows the stock for end of the calculated period "
+"according to some planned or confirmed stock moves. Calculation always "
+"starts with quantity of real stock of beginning of current period. Then "
+"calculation adds or subtracts quantities of calculated period or periods "
+"before calculated.\n"
+"When you are in the same period (current period is the same as calculated) "
+"Stock Simulation is calculated as follows:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out \n"
+"\t+ Planned In\n"
+"\n"
+"When you calculate period next to current:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out of current Period \n"
+"\t+ Confirmed In of current Period  (incl. Already In)\n"
+"\t- Planned Out of calculated Period \n"
+"\t+ Planned In of calculated Period .\n"
+"\n"
+"As you see calculated Period is taken the same way like in case above. But "
+"calculation of current Period are made a little bit different. First you "
+"should note that system takes for current Period only Confirmed In moves. It "
+"means that you have to make planning and procurement for current Period "
+"before this calculation (for Period next to current). \n"
+"\n"
+"When you calculate Period ahead:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period \n"
+"\t- Sum of Planned Out of Periods before calculated \n"
+"\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
+"\t- Planned Out of calculated Period \n"
+"\t+ Planned In of calculated Period.\n"
+"\n"
+"Periods before calculated means periods starting from current till period "
+"before calculated.\n"
+"\n"
+"Remarks:\n"
+"- Remember to make planning for all periods before calculated because "
+"omitting these quantities and procurements can cause wrong suggestions for "
+"procurements few periods ahead.\n"
+"- If you made planning few periods ahead and you find that real Confirmed "
+"Out is bigger than Planned Out in some periods before you can repeat "
+"Planning and make another procurement. You should do it in the same planning "
+"line. If you create another planning line the suggestions can be wrong.\n"
+"- When you wish to work with different periods for some part of products "
+"define two kinds of periods (fe. Weekly and Monthly) and use them for "
+"different products. Example: If you use always Weekly periods for Products "
+"A, and Monthly periods for Products B your all calculations will work "
+"correctly. You can also use different kind of periods for the same products "
+"from different warehouse or companies. But you cannot use overlapping "
+"periods for the same product, warehouse and company because results can be "
+"unpredictable. The same apply to Forecasts lines.\n"
+msgstr ""
+"\n"
+"Este módulo baséase na versión orixinal de OpenERP stock_planning SA módulo "
+"1.0 do mesmo nome Programador de Compras Mestras. O propósito da MPS é "
+"permitir crear un manual de contratación (solicitude), á parte do "
+"programador MRP (que funciona automaticamente, baseándose en regras de "
+"existencias mínimas). Os termos utilizados no módulo:- Stock e Período de "
+"vendas – é o tempo (entre a Data de comezo e a Data de remate) para o que "
+"planifica o Stock e a Previsión de Vendas e fai a Planificación das Compras.-"
+" Stock e prognóstico de vendas – é a cantidade de produtos que planea vender "
+"no Período.- Planificación de Stock – é a cantidade de produtos que planea "
+"mercar ou producir para o Período. Porque temos outro módulo sale_forecast "
+"que utiliza os termos \"Prognóstico de Vendas\" e \"Planificación\" como "
+"valores de cantidade, utilizaremos termos \"Stock e Prognóstico de Vendas\" "
+"e \"Planificación do Stock\" para salientar que usamos os valores de "
+"cantidade. A actividade con este módulo divídese en tres pasos:- Creación de "
+"Períodos. Paso obrigatorio.- Creación de Prognósticos de Venda e introdución "
+"das súas cantidades. Un paso opcional pero útil para unha maior "
+"planificación.- Creación de liñas de Planificación, introdución das súas "
+"cantidades e facer Adquisicións. Facer compras é o paso final para o "
+"Período. Períodos=========Ten dúas opcións de menú para Períodos en "
+"\"Xestión de Vendas - Configuración\". Son as seguintes:- \"Crear os "
+"Períodos de Vendas\" - Que automatiza a creación de períodos diarios, "
+"semanais ou mensuais.- \"Stock e Períodos de vendas\" - Que permite crear "
+"calquera tipo de períodos, o cambio das datas e o cambio do Estado do "
+"período. Creación de períodos é o primeiro paso para utilizar as funcións "
+"dos módulos. Pode crear períodos personalizados mediante o botón \"Novo\" no "
+"formulario ou vista de \"Stock e Períodos de Vendas\", pero recoméndase "
+"utilizar a ferramenta automática. Observacións:- Estes períodos (Stock "
+"oficial e Períodos de Vendas) separan de Finanzas ou doutros períodos no "
+"sistema.- Os Períodos non se asignan ás compañías (en ningún caso cando se "
+"utiliza a función multicompañía). O módulo supón que utiliza os mesmos "
+"períodos a través das compañías. Se desexa utilizar períodos diferentes para "
+"diferentes compañías, defínaos ó seu gusto (pódense solapar). Máis adiante "
+"neste texto indícase cómo utilizar eses períodos.- Cando os períodos se "
+"crean automaticamente, as súas datas de comezo e final comezan coa hora "
+"00:00:00 e 23:59:00 como hora final. Ex. Cando cree períodos diarios, terán "
+"como data de inicio 01.31.2010 00:00:00 e  como data de remate 01.31.2010 "
+"23:59:00. Só funciona na creación automática dos períodos. Cando cree "
+"períodos manualmente hai que ter coidado coas horas, xa que pode ter valores "
+"incorrectos en vendas e stock.- Se utiliza períodos solapados para o mesmo "
+"produto, almacén e compañía, se cadra os resultados non se poden predicir.- "
+"Se a data actual non pertence a ningún período ou se ten baleiros entre os "
+"períodos, se cadra os resultados non se poden predicir. Previsión de "
+"vendas====================Ten menús poucas vendas previsto en \"Xestión de "
+"Vendas - Prognósticos de Vendas\".- \"Creación de Prognósticos de Vendas "
+"para os Períodos de Vendas\" - que automatiza a creación de liñas de "
+"previsións de acordo con algúns parámetros.- \"As Previsións de Vendas\" - "
+"algúns menús para traballar con listas das previsións e as formas. Menú "
+"\"Crear Prognósticos de Vendas para Períodos de Vendas\" crea Prognósticos "
+"para os produtos da Categoría seleccionada, para o Período e Almacén "
+"seleccionado. É unha opción \"Copia do Último Prognóstico\" para copiar "
+"previsións e outros axustes do período anterior a este para crear un. "
+"Observacións:- Esta ferramenta non crea liñas, se as liñas oportunas (para o "
+"mesmo Produto, Período e Almacén, e validado ou creado por vostede) xa "
+"existen. Se desexa crear outro prognóstico, se as liñas pertinentes existen "
+"ten que facelo manualmente usando os menús que se describen a continuación.- "
+"Cando se crean as liñas, son validadas por outra persoa que pode utilizar "
+"esta ferramenta para crear outras liñas para o mesmo Período, Produto e "
+"Almacén.- Cando se elixe \"Copiar Último Prognóstico\" a liña creada ten a "
+"cantidade e algúns axustes do seu (validado ou creadas por vostede, se aínda "
+"non se validou) prognóstico que para o último período anterior ó período da "
+"previsión creada. Se hai poucos prognósticos para o período anterior a este "
+"(é posible) o sistema toma unha deles (non existe regra sobre cal). Menús "
+"\"Previsión de Vendas \"No formulario \"Prognóstico de Vendas\" "
+"principalmente ten que introducir unha cantidade prevista na \"Cantidade de "
+"Produto\". Ademais do cálculo pode funcionar para as previsións borrador. "
+"Porén, a validación pode gardar os seus datos contra calquera cambio "
+"accidental. Pode facer clic no botón \"Validar\", pero non é obrigatorio. No "
+"lugar da cantidade prevista pódese introducir a cantidade de previsión de "
+"vendas no campo \"Cantidade de Produto\". O sistema contará a cantidade en "
+"función do Prezo de Venda do Produto. Tódolos valores do formulario "
+"exprésanse na unidade de medida seleccionada no formulario. Vostede pode "
+"seleccionar un na unidade de medida da categoría por defecto ou de segunda "
+"categoría. Cando se cambia a unidade de medida as cantidades volveranse a "
+"calcular de acordo coa nova UoM: os valores editables (campos azuis) "
+"inmediatamente, os campos non editables despois de facer clic no botón "
+"\"Calcular Planificación\". Para atopar o valor axeitado para o Prognóstico "
+"de Venda, pódese utilizar a táboa \"Historial de vendas\" para este produto. "
+"Tes que introducir os parámetros na parte superior esquerda desta táboa e o "
+"sistema contará as cantidades de venda de acordo con estes parámetros. Así "
+"que vostede pode seleccionar, por exemplo do seu departamento (na parte "
+"superior) e logo (á esquerda): o último período, o período anterior ó último "
+"e o período de fai un ano. Observacións: Planificación das "
+"compras====================Menú para a Planificación do que podes atopar en "
+"\"Almacén - Planificación do Stock\".- \"Crear arquivo de Planificación "
+"Lines\" - permítelle automatizar a creación de liñas de planificación de "
+"acordo con algúns parámetros.- \"Programador Mestre de Adquisicións\" – é o "
+"menú máis importante do módulo que permite a creación da contratación. Con "
+"arranxo ás previsións de vendas, é a fase de planificación de vendas. A "
+"Planificación de compras (planificación) é a fase de programación de compras "
+"ou de produción. Vostede pode crear a planificación das compras rapidamente "
+"coa ferramenta do menú \"Crear Liñas de Planificación de Stock\", entón pode "
+"revisar a planificación creada e facer compras usando o menú \"Lista Mestre "
+"de Adquisicións\". Menú \"Crear Liñas de Planificación de Stock\" permítelle "
+"crear rapidamente as Liñas de Planificación de produtos da categoría "
+"seleccionada, en determinados períodos, e para o almacén seleccionado. Ó "
+"marcar a opción \"Tódolos produtos con Prognóstico\"o sistema crea as liñas "
+"para tódolos produtos que ten previsto para o Período seleccionado e "
+"Almacén. A Categoría seleccionada terase en conta neste caso. Debaixo do "
+"menú \"Programador Mestre de Adquisicións\" polo xeral, pode cambiar os "
+"valores \"Saídas planificadas\" e \"Entradas planificadas\" para observar o "
+"campo \"Simulación de Stock\" e decidir se este valor é exacto para o final "
+"do período. \"Planeado\" pódese basear no \"Prognóstico de Almacén\", que é "
+"a suma de tódalas previsións para o período e Almacén. Pero a planificación "
+"pódese basear en calquera outra información que vostede teña. Non cómpre ter "
+"ningún prognóstico.\"Entradas planificadas\" utilízase a cantidade para "
+"calcular o campo \"Entradas Restantes\" que é a cantidade que falta por "
+"adquirir para acadar o stock, como se indica na \"Simulación de Stock\" ó "
+"final do período. Vostede pode comparar a \"Simulación de Stock\" coas "
+"normas de cantidade mínima de existencias visibles no formulario. Pero pode "
+"planear unha cantidade diferente ó das Regras Mínimas de Stock. O cálculo "
+"está feito para todo o almacén por defecto. Pero se vostede quere ver os "
+"valores do lugar do stock do almacén calculado, pode utilizar a casa \"Só "
+"lugar do Stock\". Se despois de varios intentos decide que as cantidades son "
+"correctas para  \"Saídas planificadas\" e \"Entradas planificadas\" e que "
+"está satisfeito co final de existencias do período calculado na \"Simulación "
+"do Stock\" pode facer clic en \"Adquirir Entradas Restantes\" para obter a "
+"cantidade do campo \"Entradas Restantes\" no Almacén. O sistema crea a "
+"correspondente Orde de Compras. Vostede pode decidir se a contratación se "
+"fará para o stock ou para o lugar de entrada do Almacén calculado. Se non "
+"queres Producir ou Comprar o produto, pero só debes elixir a cantidade "
+"calculada, desde outro almacén pode facer clic en \"Subministración desde "
+"Outro Almacén\" (en lugar de \"Adquirir Entradas Restantes\"). O sistema "
+"crea a lista de selección desde o Almacén de orixe seleccionado ata o "
+"Almacén calculado (como destino). Tamén pode decidir se se debe facer esta "
+"selección de almacén ou o lugar de saída do almacén de orixe. O lugar de "
+"destino (almacén ou entrada) do almacén de destino, utilizarase como "
+"establecido para \"Adquirir Entradas Restantes\". Para ver as cantidades "
+"axeitadas nos campos \"Entrada Confirmada\", \"Saída Confirmada\", \"Entrada "
+"Confirmada Antes\", \"Saídas planificadas antes\" e \"Simulación de Stock\" "
+"ten que facer clic no botón \"Calcular Planificación\".Tódolos valores no "
+"formulario exprésanse na unidade de medida seleccionada no formulario. "
+"Vostede pode seleccionar un da unidade de medida da categoría por defecto ou "
+"dunha segunda categoría. Cando se cambia a unidade de medida as cantidades "
+"volveranse a calcular de acordo con UoM: os valores editables inmediatamente "
+"(campos azuis), os campos non editables despois de facer clic no botón "
+"\"Calcular Planificación\".Cómo se calcula o campo Simulación do Stock: "
+"Xeralmente a Simulación do Stock amosa o stock ó final período calculado de "
+"acordo con algúns movementos de stock previsto ou confirmado. Iníciase o "
+"cálculo sempre coa cantidade de stock real do inicio do período actual. "
+"Calcúlase logo a suma ou resta das cantidades do período ou períodos antes "
+"calculados. Cando está no mesmo período (período actual é o mesmo có "
+"calculado) a Simulación do Stock calcúlase como sigue: Simulación de Stock = "
+"\t Stock inicial do período actual\t - Saídas planificadas \t + Entradas "
+"planificadas Cando se calcula o período seguinte ó actual: Simulación do "
+"Stock = \t Stock inicial do período actual \t - Planificación de Saídas do "
+"Período actual\t + Entradas Confirmadas no Período actual (incl. as Entradas "
+"xa existentes)\t - Saídas planificadas do Período calculado \t + Entradas "
+"planificadas no Período calculado.Como pode ver o período calculado tómase "
+"da mesma forma que no caso anterior. Porén, o cálculo do período actual "
+"faise de xeito un pouco diferente. En primeiro lugar debe ter en conta que o "
+"sistema ten para o Período actual só Confirmados os movementos de entrada. "
+"Isto significa que ten que facer a planificación e a compra para Período "
+"actual antes deste cálculo (para o Próximo período ó actual). Cando se "
+"calcula o período seguinte: Colección de simulación = \t Stock inicial do "
+"Período actual \t - Suma de Planificación de saída dos períodos antes "
+"calculados \t + Suma de Confirmados En períodos anteriores calculados (incl. "
+"as entradas xa existentes) \t - Saídas Planificadas do Período calculado \t "
+"+ Entradas Planificadas do Período calculado. Os períodos anteriores "
+"calculados, significa que os períodos comezados no actual ata o período "
+"antes calculado. Observacións:- Lembre facer a planificación para tódolos "
+"períodos antes calculados, omitir estas cantidades e as adquisicións poden "
+"causar suxestións erróneas para as compras dalgúns períodos posteriores. - "
+"Se realizou a planificación duns poucos períodos posteriores e atopa que as "
+"Saídas Confirmadas reais son maiores co previsto nalgúns períodos antes de "
+"que se poida repetir a Planificación e realizar outra adquisición. Debe "
+"facelo na mesma liña da planificación. Se se crea outra liña de "
+"planificación de suxestións pode estar equivocada.- Cando desexa traballar "
+"con diferentes períodos para unha parte dos produtos, defina dous tipos de "
+"períodos (Ex. semanal e mensual) e utilíceos para os diferentes produtos. "
+"Exemplo: se utiliza sempre os períodos semanais para os produtos A, e os "
+"períodos mensuais dos produtos B tódolos seus cálculos funcionarán "
+"correctamente. Tamén pode utilizar diferentes tipos de períodos para os "
+"mesmos produtos de diferentes almacéns de diferentes compañías. Pero non se "
+"poden utilizar períodos solapados para o mesmo produto dun almacén, e "
+"compañía porque se cadra non se poden predicir os resultados. Aplícase o "
+"mesmo ás liñas de Previsións.\n"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:140
+#, python-format
+msgid "Cannot delete Validated Sale Forecasts !"
+msgstr "Non se poden borrar as previsións de vendas validadas!"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:641
+#: code:addons/stock_planning/stock_planning.py:683
+#, python-format
+msgid ""
+"\n"
+" Planned Out: "
+msgstr ""
+"\n"
+" Saídas planificadas: "
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:667
+#, python-format
+msgid ""
+"You must specify a Source Warehouse different than calculated (destination) "
+"Warehouse !"
+msgstr ""
+"Debe especificar un almacén de orixe diferente do almacén calculado (de "
+"destino)!"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
+msgid "Create Sales Forecasts"
+msgstr "Crear previsións de vendas"
+
+#. module: stock_planning
+#: view:stock.sale.forecast.createlines:0
+msgid "Creates forecast lines for selected warehouse and period."
+msgstr "Crear liñas de previsión para o almacén e período seleccionados."
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:656
+#, python-format
+msgid "%s Requisition (%s,  %s) %s %s \n"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:655
+#, python-format
+msgid "Requisition ("
+msgstr "Solicitude ("
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_left:0
+msgid ""
+"Quantity expected to go out in selected period. As a difference between "
+"Planned Out and Confirmed Out. For current period Already Out is also "
+"calculated"
+msgstr ""
+"Cantidade prevista para saír no período seleccionado. Diferenza entre as "
+"saídas previstas e as saídas confirmadas. Para o período actual tamén se "
+"calculan as saídas realizadas."
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_id:0
+msgid "Period4"
+msgstr "Período4"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:642
+#: code:addons/stock_planning/stock_planning.py:684
+#, python-format
+msgid "    Already In: "
+msgstr "    Entradas realizadas: "
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_id:0
+msgid "Period2"
+msgstr "Período2"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_id:0
+msgid "Period3"
+msgstr "Período3"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_id:0
+msgid "Period1"
+msgstr "Período1"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:647
+#: code:addons/stock_planning/stock_planning.py:689
+#, python-format
+msgid "    Minimum stock: "
+msgstr "    Stock mínimo: "
+
+#. module: stock_planning
+#: field:stock.planning,active_uom:0
+#: field:stock.sale.forecast,active_uom:0
+msgid "Active UoM"
+msgstr "UdM activa"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
+#: view:stock.planning.createlines:0
+msgid "Create Stock Planning Lines"
+msgstr "Crear liñas de planificación do stock"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "General Info"
+msgstr "Información xeral"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
+msgid "Sales Forecast"
+msgstr "Previsión de vendas"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Planning and Situation for Calculated Period"
+msgstr "Planificación e situación para o período calculado"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
+msgid "This Warehouse Period1"
+msgstr "Período deste almacén1"
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_forecast:0
+msgid "Warehouse Forecast"
+msgstr "Previsión almacén"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:643
+#: code:addons/stock_planning/stock_planning.py:685
+#, python-format
+msgid "    Confirmed In: "
+msgstr "    Entradas confirmadas: "
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Sales history"
+msgstr "Histórico de vendas"
+
+#. module: stock_planning
+#: field:stock.planning,supply_warehouse_id:0
+msgid "Source Warehouse"
+msgstr "Almacén orixe"
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_qty:0
+msgid "Forecasted quantity."
+msgstr "Cantidade prevista."
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Stock"
+msgstr "Stock"
+
+#. module: stock_planning
+#: field:stock.planning,stock_supply_location:0
+msgid "Stock Supply Location"
+msgstr "Lugar de subministración do stock"
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_stop:0
+msgid "Ending date for planning period."
+msgstr "Data de fin para o período planificado."
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_user:0
+msgid "This User Period2"
+msgstr "O período deste usuario2"
+
+#. module: stock_planning
+#: help:stock.planning.createlines,forecasted_products:0
+msgid ""
+"Check this box to create planning for all products having any forecast for "
+"selected Warehouse and Period. Product Category field will be ignored."
+msgstr ""
+"Para crear a planificación de tódolos produtos que teñan calquera previsión "
+"no almacén e período seleccionado, marque esta opción. Ignorarase o campo "
+"categoría de produto."
+
+#. module: stock_planning
+#: field:stock.planning,already_in:0
+msgid "Already In"
+msgstr "Entradas realizadas"
+
+#. module: stock_planning
+#: field:stock.planning,product_uom_categ:0
+#: field:stock.planning,product_uos_categ:0
+#: field:stock.sale.forecast,product_uom_categ:0
+msgid "Product UoM Category"
+msgstr "Categoría UdM produto"
+
+#. module: stock_planning
+#: field:stock.planning,incoming:0
+msgid "Confirmed In"
+msgstr "Entradas confirmadas"
+
+#. module: stock_planning
+#: field:stock.planning,line_time:0
+msgid "Past/Future"
+msgstr "Pasado/Futuro"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uos_categ:0
+msgid "Product UoS Category"
+msgstr "Categoría UdV produto"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_qty:0
+msgid "Product Quantity"
+msgstr "Cantidad de produto"
+
+#. module: stock_planning
+#: field:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy Last Forecast"
+msgstr "Copiar última previsión"
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_id:0
+msgid "Shows which product this forecast concerns."
+msgstr "Amosa a que produto atangue esta previsión"
+
+#. module: stock_planning
+#: selection:stock.planning,state:0
+msgid "Done"
+msgstr "Feito"
+
+#. module: stock_planning
+#: field:stock.period.createlines,period_ids:0
+msgid "Periods"
+msgstr "Períodos"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:638
+#: code:addons/stock_planning/stock_planning.py:680
+#, python-format
+msgid " according to state:"
+msgstr " segundo o estado:"
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Cancel"
+msgstr "Anular"
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Close"
+msgstr "Pechar"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+#: selection:stock.sale.forecast,state:0
+msgid "Validated"
+msgstr "Validado"
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+msgid "Open"
+msgstr "Aberto"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy quantities from last Stock and Sale Forecast."
+msgstr "Copiar cantidades desde o stock pasado e previsión de vendas"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_dept:0
+msgid "This Dept Period1"
+msgstr "O período deste Dpto.1"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_dept:0
+msgid "This Dept Period3"
+msgstr "O período deste Dpto.3"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_dept:0
+msgid "This Dept Period2"
+msgstr "O período deste Dpto.2"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_dept:0
+msgid "This Dept Period5"
+msgstr "O período deste Dpto.5"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_dept:0
+msgid "This Dept Period4"
+msgstr "O período deste Dpto.4"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
+msgid "This Warehouse Period2"
+msgstr "O período deste almacén2"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
+msgid "This Warehouse Period3"
+msgstr "O período deste almacén3"
+
+#. module: stock_planning
+#: field:stock.planning,outgoing:0
+msgid "Confirmed Out"
+msgstr "Saídas confirmadas"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,create_uid:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Default UOM"
+msgstr "UdM por defecto"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
+msgid "This Warehouse Period4"
+msgstr "O período deste almacén4"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
+msgid "This Warehouse Period5"
+msgstr "O período deste almacén5"
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Current"
+msgstr "Corrente"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning
+msgid "stock.planning"
+msgstr "stock.planificación"
+
+#. module: stock_planning
+#: help:stock.sale.forecast,warehouse_id:0
+msgid ""
+"Shows which warehouse this forecast concerns. If during stock planning you "
+"will need sales forecast for all warehouses choose any warehouse now."
+msgstr ""
+"Amosa a que almacén concirne esta previsión. Se durante a planificación de "
+"stock precisa previsións de vendas para tódolos almacéns, escolla agora un "
+"almacén calquera."
+
+#. module: stock_planning
+#: help:stock.planning.createlines,warehouse_id:0
+msgid "Warehouse which planning will concern."
+msgstr "Almacén ó cal se referirá a planificación"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:647
+#: code:addons/stock_planning/stock_planning.py:689
+#, python-format
+msgid ""
+"\n"
+" Stock Simulation: "
+msgstr ""
+"\n"
+" Simulación de stock: "
+
+#. module: stock_planning
+#: help:stock.planning,to_procure:0
+msgid ""
+"Enter quantity which (by your plan) should come in. Change this value and "
+"observe Stock simulation. This value should be equal or greater than "
+"Confirmed In."
+msgstr ""
+"Introducir a cantidade que (polo seu plan) debe entrar. Cambie este valor e "
+"observe a simulación do stock. Este valor debería ser igual ou superior ás "
+"entradas confirmadas."
+
+#. module: stock_planning
+#: help:stock.planning.createlines,period_id:0
+msgid "Period which planning will concern."
+msgstr "Período ó cal atangue a planificación"
+
+#. module: stock_planning
+#: field:stock.planning,already_out:0
+msgid "Already Out"
+msgstr "Saídas realizadas"
+
+#. module: stock_planning
+#: help:stock.planning,product_id:0
+msgid "Product which this planning is created for."
+msgstr "Produto para o que foi creada esta planificación."
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Warehouse :"
+msgstr "Por almacén:"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:639
+#: code:addons/stock_planning/stock_planning.py:681
+#, python-format
+msgid ""
+"\n"
+" Warehouse Forecast: "
+msgstr ""
+"\n"
+" Previsión almacén: "
+
+#. module: stock_planning
+#: field:stock.planning,history:0
+msgid "Procurement History"
+msgstr "Histórico abastecementos"
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_start:0
+msgid "Starting date for planning period."
+msgstr "Data inicial para o período planificado."
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:641
+#: code:addons/stock_planning/stock_planning.py:683
+#, python-format
+msgid "    Planned In: "
+msgstr "    Entradas planificadas: "
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyze_company:0
+msgid "Per Company"
+msgstr "Por compañía"
+
+#. module: stock_planning
+#: help:stock.planning,incoming_left:0
+msgid ""
+"Quantity left to Planned incoming quantity. This is calculated difference "
+"between Planned In and Confirmed In. For current period Already In is also "
+"calculated. This value is used to create procurement for lacking quantity."
+msgstr ""
+"Cantidade restante da cantidade entrante planificada. Calcúlase mediante a "
+"diferenza entre as entradas planificadas e as confirmadas. Para o período "
+"actual tamén se calculan as entradas realizadas. Este valor úsase para crear "
+"abastecementos para a cantidade que falta."
+
+#. module: stock_planning
+#: help:stock.planning,incoming:0
+msgid "Quantity of all confirmed incoming moves in calculated Period."
+msgstr "Cantidades de tódalas entradas confirmadas no período calculado."
+
+#. module: stock_planning
+#: field:stock.period,date_stop:0
+#: field:stock.period.createlines,date_stop:0
+msgid "End Date"
+msgstr "Data de remate"
+
+#. module: stock_planning
+#: help:stock.planning,stock_supply_location:0
+msgid ""
+"Check to supply from Stock location of Supply Warehouse. If not checked "
+"supply will be made from Output location of Supply Warehouse. Used in "
+"'Supply from Another Warhouse' with Supply Warehouse."
+msgstr ""
+"Marque esta opción para subministrar desde o lugar do stock do almacén de "
+"subministración. Se non se marca, realizarase a subministración desde o "
+"lugar de saída do almacén de subministración. Utilizado en 'Subministrar "
+"desde outro almacén' cun almacén de subministración."
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "No Requisition"
+msgstr "Nº solicitude"
+
+#. module: stock_planning
+#: help:stock.planning,minimum_op:0
+msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
+msgstr ""
+"Cantidade mínima establecida nas regras de stock mínimo para este almacén."
+
+#. module: stock_planning
+#: help:stock.sale.forecast,period_id:0
+msgid "Shows which period this forecast concerns."
+msgstr "Amosa a que período atangue esta previsión."
+
+#. module: stock_planning
+#: field:stock.planning,product_uom:0
+msgid "UoM"
+msgstr "UoM"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculated Period Simulation"
+msgstr "Simulación calculada do período"
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,product_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,product_id:0
+msgid "Product"
+msgstr "Produto"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:638
+#: code:addons/stock_planning/stock_planning.py:680
+#, python-format
+msgid ""
+"\n"
+"For period: "
+msgstr ""
+"\n"
+"Por período: "
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uom:0
+msgid "Product UoM"
+msgstr "UdM do produto"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:627
+#: code:addons/stock_planning/stock_planning.py:673
+#: code:addons/stock_planning/stock_planning.py:697
+#, python-format
+msgid "MPS(%s) %s"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:627
+#: code:addons/stock_planning/stock_planning.py:671
+#: code:addons/stock_planning/stock_planning.py:693
+#, python-format
+msgid "MPS("
+msgstr "MPS("
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:680
+#, python-format
+msgid ""
+"Pick created from MPS by user: %s   Creation Date: %s                        "
+"             \n"
+"For period: %s   according to state:                                     \n"
+" Warehouse Forecast: %s                                     \n"
+" Initial Stock: %s                                     \n"
+" Planned Out: %s  Planned In: %s                                     \n"
+" Already Out: %s  Already In: %s                                     \n"
+" Confirmed Out: %s   Confirmed In: %s                                     \n"
+" Planned Out Before: %s   Confirmed In Before: %s                            "
+"         \n"
+" Expected Out: %s   Incoming Left: %s                                     \n"
+" Stock Simulation: %s   Minimum stock: %s "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,procure_to_stock:0
+msgid "Procure To Stock Location"
+msgstr "Abastecemento ó lugar do stock"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: stock_planning
+#: help:stock.planning,period_id:0
+msgid ""
+"Period for this planning. Requisition will be created for beginning of the "
+"period."
+msgstr ""
+"Período para esta planificación. Crearase unha solicitude ó principio do "
+"período."
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Calculate Sales History"
+msgstr "Calcular historial de vendas"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_amt:0
+msgid "Product Amount"
+msgstr "Cantidade de produto"
+
+#. module: stock_planning
+#: help:stock.planning,confirmed_forecasts_only:0
+msgid ""
+"Check to take validated forecasts only. If not checked system takes "
+"validated and draft forecasts."
+msgstr ""
+"Marcar para usar só as previsións validadas. Se non se marca, o sistema usa "
+"as previsións validadas e o borrador."
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_id:0
+msgid "Period5"
+msgstr "Período5"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
+msgid "Stock and Sales Planning Periods"
+msgstr "Períodos de planificación de stock e vendas"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_warehouse_id:0
+msgid "This Warehouse"
+msgstr "Este almacén"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
+#: view:stock.period:0
+#: view:stock.period.createlines:0
+msgid "Stock and Sales Periods"
+msgstr "Períodos de stock e vendas"
+
+#. module: stock_planning
+#: help:stock.sale.forecast,user_id:0
+msgid "Shows who created this forecast, or who validated."
+msgstr "Amosa quen creou esta previsión, ou quen a validou."
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:644
+#: code:addons/stock_planning/stock_planning.py:686
+#, python-format
+msgid ""
+"\n"
+" Planned Out Before: "
+msgstr ""
+"\n"
+" Saídas planificadas antes: "
+
+#. module: stock_planning
+#: field:stock.planning,stock_start:0
+msgid "Initial Stock"
+msgstr "Stock inicial"
+
+#, python-format
+#~ msgid "Pick List "
+#~ msgstr "Lista de recollida "
+
+#, python-format
+#~ msgid "Manual planning for "
+#~ msgstr "Planificación manual para "
+
+#, python-format
+#~ msgid "Procurement created in MPS by user: "
+#~ msgstr "Abastecemento creado en MPS polo usuario: "
+
+#, python-format
+#~ msgid "Pick created from MPS by user: "
+#~ msgstr "Albará creado desde MPS polo usuario: "
diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
index 160ce6a3c20..7e9342292b9 100644
--- a/addons/stock_planning/stock_planning.py
+++ b/addons/stock_planning/stock_planning.py
@@ -459,9 +459,9 @@ class stock_planning(osv.osv):
         'planned_outgoing': fields.float('Planned Out', required=True,  \
                 help = 'Enter planned outgoing quantity from selected Warehouse during the selected Period of selected Product. '\
                         'To plan this value look at Confirmed Out or Sales Forecasts. This value should be equal or greater than Confirmed Out.'),
-        'company_forecast': fields.function(_get_forecast, method=True, string ='Company Forecast', multi = 'company', \
+        'company_forecast': fields.function(_get_forecast, string ='Company Forecast', multi = 'company', \
                 help = 'All sales forecasts for whole company (for all Warehouses) of selected Product during selected Period.'),
-        'warehouse_forecast': fields.function(_get_forecast, method=True, string ='Warehouse Forecast',  multi = 'warehouse',\
+        'warehouse_forecast': fields.function(_get_forecast, string ='Warehouse Forecast',  multi = 'warehouse',\
                 help = 'All sales forecasts for selected Warehouse of selected Product during selected Period.'),
         'stock_simulation': fields.float('Stock Simulation', readonly =True, \
                 help = 'Stock simulation at the end of selected Period.\n For current period it is: \n' \
@@ -480,10 +480,10 @@ class stock_planning(osv.osv):
         'to_procure': fields.float(string='Planned In', required=True, \
                 help = 'Enter quantity which (by your plan) should come in. Change this value and observe Stock simulation. ' \
                         'This value should be equal or greater than Confirmed In.'),
-        'line_time': fields.function(_get_past_future, method=True,type='char', string='Past/Future'),
-        'minimum_op': fields.function(_get_op, method=True, type='float', string = 'Minimum Rule', multi= 'minimum', \
+        'line_time': fields.function(_get_past_future,type='char', string='Past/Future'),
+        'minimum_op': fields.function(_get_op, type='float', string = 'Minimum Rule', multi= 'minimum', \
                             help = 'Minimum quantity set in Minimum Stock Rules for this Warhouse'),
-        'maximum_op': fields.function(_get_op, method=True, type='float', string = 'Maximum Rule', multi= 'maximum', \
+        'maximum_op': fields.function(_get_op, type='float', string = 'Maximum Rule', multi= 'maximum', \
                             help = 'Maximum quantity set in Minimum Stock Rules for this Warhouse'),
         'outgoing_before': fields.float('Planned Out Before', readonly=True, \
                             help= 'Planned Out in periods before calculated. '\
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index a36f8a1ffa6..74d15382670 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -98,6 +98,7 @@ class survey(osv.osv):
         current_rec = self.read(cr, uid, ids, context=context)
         title = current_rec.get('title') + ' (Copy)'
         vals.update({'title':title})
+        vals.update({'history':[],'tot_start_survey':0,'tot_comp_survey':0})
         return super(survey, self).copy(cr, uid, ids, vals, context=context)
 
     def action_print_survey(self, cr, uid, ids, context=None):
@@ -246,7 +247,7 @@ class survey_question(osv.osv):
         'req_error_msg': fields.text('Error Message'),
         'allow_comment': fields.boolean('Allow Comment Field'),
         'sequence': fields.integer('Sequence'),
-        'tot_resp': fields.function(_calc_response, method=True, string="Total Answer"),
+        'tot_resp': fields.function(_calc_response, string="Total Answer"),
         'survey': fields.related('page_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
         'descriptive_text': fields.text('Descriptive Text', size=255),
         'column_heading_ids': fields.one2many('survey.question.column.heading', 'question_id',' Column heading'),
@@ -585,8 +586,8 @@ class survey_answer(osv.osv):
         'question_id': fields.many2one('survey.question', 'Question', ondelete='cascade'),
         'answer': fields.char('Answer', size=128, required=1),
         'sequence': fields.integer('Sequence'),
-        'response': fields.function(_calc_response_avg, method=True, string="#Answer", multi='sums'),
-        'average': fields.function(_calc_response_avg, method=True, string="#Avg", multi='sums'),
+        'response': fields.function(_calc_response_avg, string="#Answer", multi='sums'),
+        'average': fields.function(_calc_response_avg, string="#Avg", multi='sums'),
         'type': fields.selection([('char','Character'),('date','Date'),('datetime','Date & Time'),\
             ('integer','Integer'),('float','Float'),('selection','Selection'),\
             ('email','Email')], "Type of Answer",required=1),
diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index b1bef814a86..1798a7c418c 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -21,7 +21,6 @@
 
 from osv import osv
 from osv import fields
-from tools.translate import _
 
 class survey_browse_answer(osv.osv_memory):
     _name = 'survey.browse.answer'
@@ -64,7 +63,7 @@ class survey_browse_answer(osv.osv_memory):
         record = self.read(cr, uid, ids, [])
         record = record and record[0] or {} 
         if record['response_id']:
-            res_id = [(record['response_id'][0])]
+            res_id = [(record.get('response_id') and record['response_id'][0])]
         else:
             sur_response_obj = self.pool.get('survey.response')
             res_id = sur_response_obj.search(cr, uid, [('survey_id', '=',int(record['survey_id']))])
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index 6bc1502e355..49cbac82b46 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -167,6 +167,10 @@ class survey_send_invitation(osv.osv_memory):
                             res_user+= "- %s (Login: %s,  Password: %s)\n" % \
                                  (user_email.name, user_email.login, user_email.password)
                     continue
+                else:
+                    error += "- No User found linked to email address '%s'.\n Impossible to send a reminder to a partner never invited before \n"%(addr.email)
+                    continue
+
                 passwd= self.genpasswd()
                 out+= addr.email + ',' + passwd + '\n'
                 mail= record['mail'] % {'login' : addr.email, 'passwd' : passwd, 'name' : addr.name}
diff --git a/addons/survey/wizard/survey_send_invitation.xml b/addons/survey/wizard/survey_send_invitation.xml
index 8f82d816954..4992e1204ff 100644
--- a/addons/survey/wizard/survey_send_invitation.xml
+++ b/addons/survey/wizard/survey_send_invitation.xml
@@ -3,7 +3,7 @@
 	<data>
 	
 		<!-- Survey send invitation Form View -->
-				 
+
 		<record id="view_survey_send_invitation" model="ir.ui.view">
 			<field name="name">Send Invitation</field>
 			<field name="model">survey.send.invitation</field>
@@ -11,21 +11,21 @@
 			<field name="arch" type="xml">
 				<form string="Send Invitation">
 				    <separator string="Select Partner" colspan="4"/>
-				    <field name="partner_ids" nolabel="1"  colspan="4"/> 
+				    <field name="partner_ids" nolabel="1"  colspan="4"/>
 				    <separator colspan="4" string="Send mail for new user"/>
 			        <field name="send_mail" nolabel="1"/>
 			        <field name="mail_subject" colspan="3"/>
 			        <separator colspan="4" string="Send reminder for existing user"/>
 			        <field name="send_mail_existing" nolabel="1"/>
-			        <field name="mail_subject_existing" colspan="3"/>    
+			        <field name="mail_subject_existing" colspan="3"/>
 				    <separator colspan="4"/>
 			        <field name="mail_from" colspan="4"/>
 				    <separator string="Message" colspan="4"/>
 				    <field name="mail" nolabel="1" colspan="4"/>
 					<separator colspan="4" />
 					<label align="0.0" colspan="2" string="" />
-					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
-					<button colspan="1" icon="gtk-go-forward" name="action_send" string="Send" type="object"/>
+					<button colspan="1" icon="gtk-cancel" special="cancel" string="_Cancel"/>
+					<button colspan="1" icon="gtk-go-forward" name="action_send" string="_Send" type="object"/>
 				</form>
 			</field>
 		</record>
@@ -46,7 +46,7 @@
     		view_mode="form" target="new" view_type="form" />
 
 		<!-- Survey send invitation Display Log Form View -->
-				 
+
 		<record id="view_survey_send_invitation_log" model="ir.ui.view">
 			<field name="name">survey send invitation log</field>
 			<field name="model">survey.send.invitation.log</field>
@@ -58,7 +58,7 @@
     				<separator string="" colspan="4"/>
     				<group col="4" colspan="4">
 						<label align="0.0" colspan="3" string="" />
-						<button colspan="1" icon="gtk-ok" special="cancel" string="Ok"/>
+						<button colspan="1" icon="gtk-ok" special="cancel" string="_Ok"/>
 					</group>
 				</form>
 			</field>
diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index 1eb898e527e..c506cf58b4f 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -24,6 +24,7 @@ import base64
 import email
 import tools
 import binascii
+import dateutil.parser
 class email_server_tools(osv.osv_memory):
     _inherit = "email.server.tools"
     def history_message(self, cr, uid, model, res_id, message, context=None):
@@ -73,7 +74,8 @@ class email_server_tools(osv.osv_memory):
             msg['reply'] = self._decode_header(msg_txt.get('Reply-To'))
 
         if 'Date' in fields:
-            msg['date'] = self._decode_header(msg_txt.get('Date'))
+            date = self._decode_header(msg_txt.get('Date'))
+            msg['date'] = dateutil.parser.parse(date).strftime("%Y-%m-%d %H:%M:%S")
 
         if 'Content-Transfer-Encoding' in fields:
             msg['encoding'] = msg_txt.get('Content-Transfer-Encoding')
diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index eaa1c2bd4c7..367a4faa049 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 98ebf9906f6..28b70611a25 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/exportTools.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/exportTools.js
index 7da3701b1f3..47eb2111c33 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/exportTools.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/exportTools.js
@@ -148,17 +148,10 @@ function getPredefinedFolder(type) {
 	// type 2 = selected messages
 
 	var use_dir = "mboximport.exportMSG.use_dir";
-
-	var dir_path="";
-	if(navigator.userAgent.indexOf('Linux')!= -1){
-		dir_path ="/tmp"
-	}
-	else if(navigator.userAgent.indexOf('Win')!= -1){
-		dir_path ="C:\\"
-	}
-	else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
-		dir_path ="/tmp"
-	} 
+    var dirService = Components.classes["@mozilla.org/file/directory_service;1"].
+    	getService(Components.interfaces.nsIProperties).get("Home", Components.interfaces.nsIFile);
+    var homeDir = dirService.path;
+    var dir_path = ((homeDir.search(/\\/) != -1) ? homeDir + "\\" : homeDir + "/")
 	try {
 		var localFile = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
 		localFile.initWithPath(dir_path);
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 598abb8fb61..fde29df4dbe 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
@@ -38,6 +38,10 @@ function searchmail()
         return true
     }
     var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
+    var dirService = Components.classes["@mozilla.org/file/directory_service;1"].
+    	getService(Components.interfaces.nsIProperties).get("Home", Components.interfaces.nsIFile);
+    var homeDir = dirService.path;
+    var path = ((homeDir.search(/\\/) != -1) ? homeDir + "\\" : homeDir + "/")
     var version_obj = prefService.getBranch("extensions.");
     version_obj.QueryInterface(Components.interfaces.nsIPrefBranch2);
     version = version_obj.getCharPref("lastAppVersion");
@@ -148,19 +152,7 @@ function searchmail()
             url[i] = currentAttachments[i].url;
             name[i] = currentAttachments[i].displayName;
             var obj = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
-            if(navigator.userAgent.indexOf('Linux')!= -1){
-                obj.initWithPath("/tmp/");
-            }
-            else if(navigator.userAgent.indexOf('Win')!= -1){
-                obj.initWithPath("c:\\");
-            }
-            else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
-                obj.initWithPath("/tmp/");
-            } 
-            else{
-                alert("Not Compatible for this Operating System");
-                false();
-            }
+            obj.initWithPath(path)
             //saving the attachment files in system's temp folder
             test[i] = messenger.saveAttachmentToFolder(contentType[i],url[i],name[i],uri,obj);
         }
@@ -335,15 +327,10 @@ var listDocumentHandler = {
 //function to archive the mail content through xmlrpc request
 function parse_eml(){
     var fpath =""
-    if(navigator.userAgent.indexOf('Linux')!= -1){
-        fpath ="/tmp/"
-    }
-    else if(navigator.userAgent.indexOf('Win')!= -1){
-        fpath ="C:\\"
-    }
-    else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
-        fpath ="/tmp/"
-    } 
+    var dirService = Components.classes["@mozilla.org/file/directory_service;1"].
+        getService(Components.interfaces.nsIProperties).get("Home", Components.interfaces.nsIFile);
+    var homeDir = dirService.path;
+    fpath = ((homeDir.search(/\\/) != -1) ? homeDir + "\\" : homeDir + "/")
     name = fpath + getPref().getCharPref('fname') +".eml"
     var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
     file.initWithPath( name );
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
index 963c379c453..4661478b31b 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
@@ -1434,34 +1434,6 @@ var listArchiveHandler = {
 }
 
 //function to archive the mail content through xmlrpc request
-
-function parse_eml(){
-    var fpath =""
-    if(navigator.userAgent.indexOf('Linux')!= -1){
-        fpath ="/tmp/"
-    }
-    else if(navigator.userAgent.indexOf('Win')!= -1){
-        fpath ="C:\\"
-    }
-    else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
-        fpath ="/tmp/"
-    } 
-
-    name = fpath + getFileName() +".eml"
-    var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
-    file.initWithPath( name );
-    if ( file.exists() == false ) {
-        return null;
-    } else {
-        var is = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance( Components.interfaces.nsIFileInputStream );
-        is.init( file,0x01, 00004, null);
-        var sis = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance( Components.interfaces.nsIScriptableInputStream );
-        sis.init( is );
-        var output = sis.read( sis.available() );
-        return output
-    }
-    
-}
 function upload_archivemail()
 {
     list_documents = document.getElementById('listSearchBox')
@@ -1484,6 +1456,7 @@ function upload_archivemail()
     strobj.data = 'thunderbird.partner';
     var resobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
 
+	
     for(i=0;i<cnt;i++)
     {   
         var object = list_documents.getSelectedItem(i);
@@ -1497,7 +1470,6 @@ function upload_archivemail()
     var a = ['ref_ids','message'];
     var b = [ref_ids, eml_string];
     var arrofarr = dictcontact(a,b);
-
     xmlRpcClient.asyncCall(listArchiveHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
      
 }
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index 0059cdfd8ab..ab57721bb8c 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -9,10 +9,10 @@
       <field name="arch" type="xml">
           <data>
               <form position="attributes">
-                  <attribute name="string">Thunderbird Plug-In Configuration</attribute>
+                  <attribute name="string">Load Thunderbird Plug-In</attribute>
               </form>
               <separator string="title" position="attributes">
-                   <attribute name="string">Thunderbird Plug-In</attribute>
+                   <attribute name="string">Load Thunderbird Plug-In</attribute>
               </separator>
               <xpath expr="//label[@string='description']" position="attributes">
                   <attribute name="string">This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
@@ -50,7 +50,7 @@
     </record>
 
     <record id="action_thunderbird_installer" model="ir.actions.act_window">
-      <field name="name">Thunderbird Plug-In Configuration</field>
+      <field name="name">Load Thunderbird Plug-In</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">thunderbird.installer</field>
       <field name="view_id" ref="view_thunderbird_installer"/>
@@ -61,13 +61,15 @@
 
     <record id="thunderbird_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_thunderbird_installer"/>
-        <field name="restart">always</field>
+        <field name="category_id" ref="base.category_sales_management_config"/>
+        <field name="type">normal</field>
+        <field name="state">skip</field>
         <field name="sequence">3</field>
     </record>
 
 
     <record id="action_thunderbird_wizard" model="ir.actions.act_window">
-      <field name="name">Thunderbird Plug-In Configuration</field>
+      <field name="name">Load Thunderbird Plug-In</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">thunderbird.installer</field>
       <field name="view_id" ref="view_thunderbird_installer"/>
@@ -78,7 +80,7 @@
     </record>
 
 	<menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10" />
-	<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Thunderbird Plug-In" parent="base.menu_base_config_plugins" sequence="10" />
+	<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Load Thunderbird Plug-In" parent="base.menu_base_config_plugins" sequence="10" />
 
   </data>
 </openerp>
diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py
index 71ed399c5da..ec70b03d9bf 100644
--- a/addons/users_ldap/__openerp__.py
+++ b/addons/users_ldap/__openerp__.py
@@ -20,26 +20,95 @@
 
 {
     "name" : "Authenticate users with LDAP server",
-    "version" : "0.1",
+    "version" : "1.0",
     "depends" : ["base"],
     "images" : ["images/ldap_configuration.jpeg"],
     "author" : "OpenERP SA",
     "description": """
 Adds support for authentication by LDAP server.
 ===============================================
+This module allows users to login with their LDAP username and
+password, and will automatically create OpenERP users for them
+on the fly.
+
+**Note**: This module only work on servers who have Python's
+``ldap`` module installed.
+
+Configuration
++++++++++++++
+After installing this module, you need to configure the LDAP
+parameters in the Configuration tab of the Company details.
+Different companies may have different LDAP servers, as long
+as they have unique usernames (usernames need to be unique in
+OpenERP, even across multiple companies).
+
+Anonymous LDAP binding is also supported (for LDAP servers
+that allow it), by simpling keeping the LDAP user and password
+empty in the LDAP configuration. This does **not** allow
+anonymous authentication for users, it is only for the master
+LDAP account that is used to verify if a user exists before
+attempting to authenticate it.
+
+Security Considerations
++++++++++++++++++++++++
+Users' LDAP passwords are never stored in the OpenERP database,
+the LDAP server is queried whenever a user needs to be
+authenticated. No duplication of the password occurs, and
+passwords are managed in one place only.
+
+OpenERP does not manage password changes in the LDAP, so
+any change of password should be conducted by other means
+in the LDAP directory directly (for LDAP users).
+
+It is also possible to have local OpenERP users in the
+database along with LDAP-authenticated users (the Administrator
+account is one obvious example).
+
+Here is how it works:
+
+  * The system first attempts to authenticate users against
+    the local OpenERP database ;
+  * if this authentication fails (for example because the
+    user has no local password), the system then attempts
+    to authenticate against LDAP ;
+
+As LDAP users have blank passwords by default in the local
+OpenERP database (which means no access), the first step
+always fails and the LDAP server is queried to do the
+authentication.
+
+User Template
++++++++++++++
+In the LDAP configuration on the Company form, it is possible to
+select a *User Template*. If set, this user will be used as
+template to create the local users whenever someone authenticates
+for the first time via LDAP authentication.
+This allows pre-setting the default groups and menus of the
+first-time users.
+
+**Warning**: if you set a password for the user template,
+this password will be assigned as local password for each new
+LDAP user, effectively setting a *master password* for these
+users (until manually changed). You usually do not want this.
+One easy way to setup a template user is to login once with
+a valid LDAP user, let OpenERP create a blank local user with the
+same login (and a blank password), then rename this new user
+to a username that does not exist in LDAP, and setup its
+groups the way you want.
+
+Interaction with base_crypt
++++++++++++++++++++++++++++
+The base_crypt module is not compatible with this module, and
+will disable LDAP authentication if installed at the same time.
 
-This module only works with Unix/Linux.
     """,
 
 
     "website" : "http://www.openerp.com",
     "category" : "Tools",
-    "init_xml" : [
-    ],
-    "demo_xml" : [
-    ],
-    "update_xml" : [
+    "data" : [
         "users_ldap_view.xml",
+        "user_ldap_installer.xml",
     ],
     "active": False,
     "installable": True,
diff --git a/addons/users_ldap/i18n/fi.po b/addons/users_ldap/i18n/fi.po
new file mode 100644
index 00000000000..16845d10533
--- /dev/null
+++ b/addons/users_ldap/i18n/fi.po
@@ -0,0 +1,128 @@
+# Finnish 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-06-13 09:14+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-14 04:40+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Virhe! Et voi luoda sisäkkäisiä yrityksiä."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Valittu yritys ei ole sallittu tälle käyttäjälle"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "LDAP parametrit"
+
+#. module: users_ldap
+#: view:res.company:0
+msgid "LDAP Configuration"
+msgstr "LDAP konfiguraatio"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Luo käyttäjä jos ei ole tietokannassa"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Mallikäyttäjä käyttäjän luontia varten"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Yritys"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "LDAP palvelimen osoite"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "LDAP palvelimen portti"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Yritykset"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "LDAP salasana"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.module.module,description:users_ldap.module_meta_information
+msgid "Adds support for authentication by ldap server"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Sekvenssi"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Kahdella eri käyttäjällä ei voi olla samaa käyttäjätunnusta!"
+
+#. module: users_ldap
+#: model:ir.module.module,shortdesc:users_ldap.module_meta_information
+msgid "Authenticate users with ldap server"
+msgstr "Autentikoi käyttäjät LDAP palvelimen kanssa"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Mallikäyttäjä"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "LDAP suodin"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Luo käyttäjä"
diff --git a/addons/users_ldap/user_ldap_installer.xml b/addons/users_ldap/user_ldap_installer.xml
new file mode 100644
index 00000000000..933ca83b107
--- /dev/null
+++ b/addons/users_ldap/user_ldap_installer.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- ldap installer Form View -->
+        <record model="ir.ui.view" id="view_ldap_installer_form">
+            <field name="name">ldap.installer.form</field>
+            <field name="model">res.company.ldap</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="LDAP Configuration">
+                    <group col="2" colspan="2">
+                          <separator string="Server Information" colspan="2"/>
+                          <field name="ldap_server"/>
+                          <field name="ldap_server_port"/>
+                    </group>
+                    <group col="2" colspan="2">
+                          <separator string="Login Information" colspan="2"/>
+                          <field name="ldap_binddn"/>
+                          <field name="ldap_password"/>
+                    </group>
+                    <group col="2" colspan="2">
+                         <separator string="Process Parameter" colspan="2"/>
+                         <field name="ldap_base"/>
+                         <field name="ldap_filter"/>
+                         <field name="sequence"/>
+                    </group>
+                    <group col="2" colspan="2">
+                         <separator string="User Information" colspan="2"/>
+                         <field name="create_user"/>
+                         <field name="user"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <!-- ldap installer  action -->
+        <record id="action_ldap_installer" model="ir.actions.act_window">
+             <field name="name">Setup your LDAP Server</field>
+             <field name="type">ir.actions.act_window</field>
+             <field name="res_model">res.company.ldap</field>
+             <field name="view_type">form</field>
+             <field name="view_mode">form</field>
+             <field name="view_id" ref="view_ldap_installer_form"/>
+        </record>
+
+        <record id="config_wizard_action_ldap_installer" model="ir.actions.todo">
+            <field name="action_id" ref="action_ldap_installer"/>
+            <field name="type">normal</field>
+            <field name="target">current</field>
+            <field name="state">skip</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/users_ldap/users_ldap.py b/addons/users_ldap/users_ldap.py
index e4fec6a391f..bddaaeed6ae 100644
--- a/addons/users_ldap/users_ldap.py
+++ b/addons/users_ldap/users_ldap.py
@@ -37,8 +37,12 @@ class CompanyLDAP(osv.osv):
             ondelete='cascade'),
         'ldap_server': fields.char('LDAP Server address', size=64, required=True),
         'ldap_server_port': fields.integer('LDAP Server port', required=True),
-        'ldap_binddn': fields.char('LDAP binddn', size=64, required=True),
-        'ldap_password': fields.char('LDAP password', size=64, required=True),
+        'ldap_binddn': fields.char('LDAP binddn', size=64,
+            help=("The user account on the LDAP server that is used to query "
+                  "the directory. Leave empty to connect anonymously.")),
+        'ldap_password': fields.char('LDAP password', size=64,
+            help=("The password of the user account on the LDAP server that is "
+                  "used to query the directory.")),
         'ldap_filter': fields.char('LDAP filter', size=64, required=True),
         'ldap_base': fields.char('LDAP base', size=64, required=True),
         'user': fields.many2one('res.users', 'Model User',
@@ -66,6 +70,11 @@ res_company()
 class users(osv.osv):
     _inherit = "res.users"
     def login(self, db, login, password):
+
+        if not password:
+            # empty passwords are disallowed for obvious security reasons
+            return False
+
         ret = super(users,self).login(db, login, password)
         if ret:
             return ret
@@ -77,12 +86,15 @@ class users(osv.osv):
             SELECT id, company, ldap_server, ldap_server_port, ldap_binddn, ldap_password,
                    ldap_filter, ldap_base, "user", create_user
             FROM res_company_ldap
-            WHERE ldap_server != '' and ldap_binddn != '' ORDER BY sequence""")
+            WHERE ldap_server != '' ORDER BY sequence""")
         for res_company_ldap in cr.dictfetchall():
             logger.debug(res_company_ldap)
             try:
                 l = ldap.open(res_company_ldap['ldap_server'], res_company_ldap['ldap_server_port'])
-                if l.simple_bind_s(res_company_ldap['ldap_binddn'], res_company_ldap['ldap_password']):
+                # An empty binddn means anonymous auth, so it should be replaced w/ an empty string
+                # See LDAP RFC 4513, Section 5.1.1
+                if l.simple_bind_s(res_company_ldap['ldap_binddn'] or '',
+                                   res_company_ldap['ldap_password'] or ''):
                     base = res_company_ldap['ldap_base']
                     scope = ldap.SCOPE_SUBTREE
                     filter = filter_format(res_company_ldap['ldap_filter'], (login,))
@@ -150,8 +162,10 @@ class users(osv.osv):
             for res_company_ldap in user.company_id.ldaps:
                 try:
                     l = ldap.open(res_company_ldap.ldap_server, res_company_ldap.ldap_server_port)
-                    if l.simple_bind_s(res_company_ldap.ldap_binddn,
-                            res_company_ldap.ldap_password):
+                    # An empty binddn means anonymous auth, so it should be replaced w/ an empty string
+                    # See LDAP RFC 4513, Section 5.1.1
+                    if l.simple_bind_s(res_company_ldap.ldap_binddn or '',
+                                       res_company_ldap.ldap_password or ''):
                         base = res_company_ldap.ldap_base
                         scope = ldap.SCOPE_SUBTREE
                         filter = filter_format(res_company_ldap.ldap_filter, (user.login,))
diff --git a/addons/warning/i18n/fi.po b/addons/warning/i18n/fi.po
new file mode 100644
index 00000000000..7743bb21985
--- /dev/null
+++ b/addons/warning/i18n/fi.po
@@ -0,0 +1,235 @@
+# Finnish 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-06-08 10:31+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order_line
+#: field:product.product,purchase_line_warn:0
+msgid "Purchase Order Line"
+msgstr "Ostotilauksen rivi"
+
+#. module: warning
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sale Order Line"
+msgstr "Vietsi myyntitilausriville"
+
+#. module: warning
+#: field:product.product,purchase_line_warn_msg:0
+msgid "Message for Purchase Order Line"
+msgstr "Viesti ostotilausriville"
+
+#. module: warning
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Virhe! Rekursiivisesti rinnastettuja jäseniä ei voi luoda."
+
+#. module: warning
+#: model:ir.model,name:warning.model_stock_picking
+msgid "Picking List"
+msgstr "Keräilylista"
+
+#. module: warning
+#: field:product.product,sale_line_warn:0
+msgid "Sale Order Line"
+msgstr "Myyntitilausrivi"
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Purchasing this Product"
+msgstr "Varoitus tätä tuotetta ostettaessa"
+
+#. module: warning
+#: model:ir.model,name:warning.model_product_product
+msgid "Product"
+msgstr "Tuote"
+
+#. module: warning
+#: sql_constraint:purchase.order:0
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Tilauksen viite tulee olla yksilöllinen!"
+
+#. module: warning
+#: view:product.product:0
+#: view:res.partner:0
+msgid "Warnings"
+msgstr "Varoitukset"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Warning"
+msgstr "Varoitus"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Blocking Message"
+msgstr "Estoviesti"
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Invoice"
+msgstr "Varoitus laskulle"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "No Message"
+msgstr "Ei viestiä"
+
+#. module: warning
+#: model:ir.model,name:warning.model_account_invoice
+#: field:res.partner,invoice_warn:0
+msgid "Invoice"
+msgstr "Lasku"
+
+#. module: warning
+#: model:ir.module.module,shortdesc:warning.module_meta_information
+msgid "Module for Warnings form onchange Event"
+msgstr ""
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Selling this Product"
+msgstr "Varoitus myytäessä tätä tuotetta"
+
+#. module: warning
+#: field:res.partner,sale_warn:0
+msgid "Sale Order"
+msgstr "Myyntitilaus"
+
+#. module: warning
+#: field:res.partner,picking_warn:0
+msgid "Stock Picking"
+msgstr "Varatokeräily"
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order
+#: field:res.partner,purchase_warn:0
+msgid "Purchase Order"
+msgstr "Ostotilaus"
+
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sale Order"
+msgstr "Viesti myyntitilaukselle"
+
+#. module: warning
+#: field:res.partner,purchase_warn_msg:0
+msgid "Message for Purchase Order"
+msgstr "Viesti ostotilaukselle"
+
+#. module: warning
+#: code:addons/warning/warning.py:32
+#: help:product.product,purchase_line_warn:0
+#: help:product.product,sale_line_warn:0
+#: help:res.partner,invoice_warn:0
+#: help:res.partner,picking_warn:0
+#: help:res.partner,purchase_warn:0
+#: help:res.partner,sale_warn:0
+#, python-format
+msgid ""
+"Selecting the \"Warning\" option will notify user with the message, "
+"Selecting \"Blocking Message\" will throw an exception with the message and "
+"block the flow. The Message has to be written in the next field."
+msgstr ""
+
+#. module: warning
+#: code:addons/warning/warning.py:67
+#: code:addons/warning/warning.py:96
+#: code:addons/warning/warning.py:132
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:213
+#: code:addons/warning/warning.py:246
+#, python-format
+msgid "Alert for %s !"
+msgstr "Varoita %s !"
+
+#. module: warning
+#: field:res.partner,invoice_warn_msg:0
+msgid "Message for Invoice"
+msgstr "Viesti laskulle"
+
+#. module: warning
+#: model:ir.module.module,description:warning.module_meta_information
+msgid "Module for Warnings form onchange Event."
+msgstr ""
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Picking"
+msgstr "Varoitus keräilyyn"
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Purchase Order"
+msgstr "Varoitus ostotilaukselle"
+
+#. module: warning
+#: code:addons/warning/warning.py:68
+#: code:addons/warning/warning.py:97
+#: code:addons/warning/warning.py:134
+#: code:addons/warning/warning.py:164
+#: code:addons/warning/warning.py:214
+#: code:addons/warning/warning.py:247
+#, python-format
+msgid "Warning for %s"
+msgstr "Varoitus %s"
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sale Order"
+msgstr "Varoitus ostotilaukselle"
+
+#. module: warning
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Virhe: Väärä EAN-koodi"
+
+#. module: warning
+#: field:res.partner,picking_warn_msg:0
+msgid "Message for Stock Picking"
+msgstr "Varoitus varastokeräilylle"
+
+#. module: warning
+#: model:ir.model,name:warning.model_res_partner
+msgid "Partner"
+msgstr "Kumppani"
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order
+msgid "Sales Order"
+msgstr "Myyntitilaus"
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Myyntitilauksen Rivi"
diff --git a/addons/web_livechat/i18n/fi.po b/addons/web_livechat/i18n/fi.po
new file mode 100644
index 00000000000..a50eb1041fd
--- /dev/null
+++ b/addons/web_livechat/i18n/fi.po
@@ -0,0 +1,39 @@
+# Finnish 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-06-08 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: web_livechat
+#: sql_constraint:publisher_warranty.contract:0
+msgid ""
+"Your publisher warranty contract is already subscribed in the system !"
+msgstr ""
+
+#. module: web_livechat
+#: model:ir.module.module,shortdesc:web_livechat.module_meta_information
+msgid "Live Chat Support"
+msgstr "Chatin tuki"
+
+#. module: web_livechat
+#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr ""
+
+#. module: web_livechat
+#: model:ir.module.module,description:web_livechat.module_meta_information
+msgid "Enable live chat support for whom have a maintenance contract"
+msgstr "Aloita chatti tuki ylläpitosopimuksen toimittajan kanssa"
diff --git a/addons/web_uservoice/i18n/fi.po b/addons/web_uservoice/i18n/fi.po
new file mode 100644
index 00000000000..5aef806a5b1
--- /dev/null
+++ b/addons/web_uservoice/i18n/fi.po
@@ -0,0 +1,29 @@
+# Finnish 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-12 16:15+0000\n"
+"PO-Revision-Date: 2011-06-08 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: web_uservoice
+#: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
+msgid "Add uservoice button in header"
+msgstr "Lisää käyttäjän ääni nappula alkuun"
+
+#. module: web_uservoice
+#: code:addons/web_uservoice/web/editors.py:72
+#, python-format
+msgid "feedback"
+msgstr "palaute"
diff --git a/addons/wiki_faq/i18n/fi.po b/addons/wiki_faq/i18n/fi.po
new file mode 100644
index 00000000000..17a86af7cd7
--- /dev/null
+++ b/addons/wiki_faq/i18n/fi.po
@@ -0,0 +1,32 @@
+# Finnish 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-06-29 07:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-30 04:34+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: wiki_faq
+#: model:ir.module.module,description:wiki_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Tämä moduuli sisältää wiki UKK (faq) pohjan\n"
+"    "
+
+#. module: wiki_faq
+#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
+msgid "Document Management - Wiki - FAQ"
+msgstr "Dokumenttienhallinta - Wiki UKK (FAQ)"
diff --git a/addons/wiki_quality_manual/i18n/fi.po b/addons/wiki_quality_manual/i18n/fi.po
new file mode 100644
index 00000000000..7ec2d238703
--- /dev/null
+++ b/addons/wiki_quality_manual/i18n/fi.po
@@ -0,0 +1,32 @@
+# Finnish 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-06-27 06:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
+msgid ""
+"Quality Manual Template\n"
+"    "
+msgstr ""
+"Laatukäsikirjan pohja\n"
+"    "
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
+msgid "Document Management - Wiki - Quality Manual"
+msgstr "Dokumenttienhallinta - Wiki - Laatukäsikirja"
diff --git a/addons/wiki_sale_faq/i18n/fi.po b/addons/wiki_sale_faq/i18n/fi.po
new file mode 100644
index 00000000000..1e035715d29
--- /dev/null
+++ b/addons/wiki_sale_faq/i18n/fi.po
@@ -0,0 +1,70 @@
+# Finnish 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-06-08 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-09 04:35+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
+msgid "Documents"
+msgstr "Asiakirjat"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
+msgid "Wiki Pages"
+msgstr "Wiki sivustot"
+
+#. module: wiki_sale_faq
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
+msgid "FAQ"
+msgstr "UKK"
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,description:wiki_sale_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Tämä moduuli sisältää wiki UKK (faq) pohjan\n"
+"    "
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
+msgid ""
+"Wiki pages allow you to share ideas and questions with coworkers. You can "
+"create a new document that can be linked to one or several applications "
+"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
+"used to easily tag wiki pages. You should use this application with the "
+"OpenERP web client interface."
+msgstr ""
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
+msgid "Wiki -Sale - FAQ"
+msgstr "Wiki -Myynti - UKK"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
+msgid ""
+"Documents give you access to all files attached to any record. It is a "
+"repository of all documents such as emails, project-related attachments or "
+"any other documents. From this view, you can search through the content of "
+"the documents. OpenERP automatically assign meta data based on the record "
+"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
+"and .PDF documents."
+msgstr ""
diff --git a/addons/wiki_sale_faq/i18n/tr.po b/addons/wiki_sale_faq/i18n/tr.po
new file mode 100644
index 00000000000..3e36156a8b2
--- /dev/null
+++ b/addons/wiki_sale_faq/i18n/tr.po
@@ -0,0 +1,81 @@
+# Turkish 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-06-07 20:16+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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-06-08 04:36+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
+msgid "Documents"
+msgstr "Dökümanlar"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
+msgid "Wiki Pages"
+msgstr "Wiki Sayfaları"
+
+#. module: wiki_sale_faq
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
+msgid "FAQ"
+msgstr "SSS"
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,description:wiki_sale_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Bu modül bir wiki Sıkça Sorulan Sorular Şablonu içerir\n"
+"    "
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
+msgid ""
+"Wiki pages allow you to share ideas and questions with coworkers. You can "
+"create a new document that can be linked to one or several applications "
+"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
+"used to easily tag wiki pages. You should use this application with the "
+"OpenERP web client interface."
+msgstr ""
+"Wiki sayfaları çalışma arkadaşlarınızla sorular ve fikirler paylaşmanıza "
+"yardım eder. Bir veya birden çok uygulamadan bağlantı verilebilecek yeni "
+"dökümanlar oluşturabilirsiniz. (Bir projenin özellikleri, Satış temsilcileri "
+"için SSS, vb. ) Wiki sayfalarını anahtar kelimelerle kolayca "
+"etiketleyebilirsiniz. Bu uygulamayı OpenERP web istemci arayüzü ile "
+"kullanmalısınız."
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
+msgid "Wiki -Sale - FAQ"
+msgstr "Wiki - Satış - SSS"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
+msgid ""
+"Documents give you access to all files attached to any record. It is a "
+"repository of all documents such as emails, project-related attachments or "
+"any other documents. From this view, you can search through the content of "
+"the documents. OpenERP automatically assign meta data based on the record "
+"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
+"and .PDF documents."
+msgstr ""
+"Dökümanlar size herhangi bir kayda eklenmiş bütün dosyalara erişim verir. "
+"Bütün dökümanları, mesela e-posta mesajları, proje-ilgili ekler vs gibi "
+"kapsayan bir depolama kabıdır. Bu görüntüden dökümanın içeriğinde arama "
+"yapabilirsiniz. OpenERP dökümanın meta-bilgilerini ilgili cari ve kaydedilen "
+"dökümanların içeriklerinde (.DOC, .ODT, .TXT, .SXW ve PDF) oluşturur."