diff --git a/addons/account/account.py b/addons/account/account.py
index 2a07154461c..fb5795002b4 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -401,9 +401,6 @@ 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),
-        'check_history': fields.boolean('Display History',
-            help="Check this box if you want to print all entries when printing the General Ledger, "\
-            "otherwise it will only print its balance."),
         'level': fields.function(_get_level, string='Level', method=True, store=True, type='integer'),
     }
 
@@ -411,7 +408,6 @@ class account_account(osv.osv):
         'type': lambda *a : 'view',
         'reconcile': lambda *a: False,
         'active': lambda *a: True,
-        'check_history': lambda *a: True,
         'currency_mode': lambda *a: 'current',
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
     }
@@ -599,7 +595,7 @@ class account_journal(osv.osv):
     _columns = {
         'name': fields.char('Journal Name', size=64, required=True, translate=True,help="Name of the journal"),
         'code': fields.char('Code', size=16,required=True,help="Code of the journal"),
-        'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'),('expense', 'Expense'), ('cash', 'Cash'), ('bank', 'Bank'), ('general', 'General'), ('situation', 'Situation')], 'Type', size=32, required=True,
+        'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'),('expense', 'Expense'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Situation')], 'Type', size=32, required=True,
                                  help="Select 'Sale' for Sale journal to be used at the time of making invoice."\
                                  " Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order."\
                                  " Select 'Cash' to be used at the time of making payment."\
diff --git a/addons/account/account_assert_test.xml b/addons/account/account_assert_test.xml
index ba5f9840ccc..88025514763 100644
--- a/addons/account/account_assert_test.xml
+++ b/addons/account/account_assert_test.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <assert model="account.move" search="[]" string="For all Ledger Postings, the state is valid implies that the sum of credits equals the sum of debits">
+        <assert model="account.move" search="[]" string="For all Journal Items, the state is valid implies that the sum of credits equals the sum of debits">
             <test expr="not len(line_id) or line_id[0].state != 'valid' or (sum([l.debit - l.credit for l in line_id]) &lt;= 0.00001)"/>
         </assert>
     </data>
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 8ae6b24f7d0..270384a1d9f 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -338,7 +338,7 @@ class account_bank_statement(osv.osv):
                         context=context):
                     if line.state <> 'valid':
                         raise osv.except_osv(_('Error !'),
-                                _('Ledger Posting line "%s" is not valid') % line.name)
+                                _('Journal Item "%s" is not valid') % line.name)
 
                 if move.reconcile_id and move.reconcile_id.line_ids:
                     ## Search if move has already a partial reconciliation
@@ -687,4 +687,4 @@ class account_bank_statement_line(osv.osv):
 
 account_bank_statement_line()
 
-# 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/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 8bf75a8dd03..42837ad1fb7 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -482,7 +482,7 @@ class account_cash_statement(osv.osv):
                         context=context):
                     if line.state <> 'valid':
                         raise osv.except_osv(_('Error !'),
-                                _('Ledger Posting line "%s" is not valid') % line.name)
+                                _('Journal Item "%s" is not valid') % line.name)
 
                 if move.reconcile_id and move.reconcile_id.line_ids:
                     torec += map(lambda x: x.id, move.reconcile_id.line_ids)
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index dee0eacc085..9df1880f61a 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -302,13 +302,14 @@
                                 <field name="state"/>
                                 <field name="residual"/>
                                 <group col="7" colspan="4" groups="base.group_user">
-                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-check" groups="account.group_account_user"/>
-                                    <button name="invoice_open" states="draft,proforma2" string="Create" icon="terp-document-new"/>
+                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
+                                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
+
+                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
+                                    <button name="invoice_open" states="draft,proforma2" string="Create" icon="terp-camera_test"/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
                                     <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="terp-dolar_ok!"/>
                                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
-                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
-                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                 </group>
                             </group>
                         </page>
@@ -354,15 +355,15 @@
                 <search string="Search Invoice">
                    <group col="10" colspan="4">
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
-                        <filter icon="terp-check" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
-                        <filter icon="terp-check" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Invoices"/>
+                        <filter icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
+                        <filter icon="terp-camera_test" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Invoices"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
                         <field name="number"/>
                         <field name="partner_id"/>
-                        <field name="user_id" select="1" default="uid" widget="selection" string="Responsible">
-                            <filter domain="[('user_id','=',uid)]" help="Responsible" icon="terp-partner" separator="1"/>
+                        <field name="user_id" select="1" default="uid" widget="selection" string="Salesman">
+                            <filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" separator="1"/>
                         </field>
                         <field name="origin"/>
                         <field name="amount_total"/>
@@ -370,14 +371,14 @@
                     <newline/>
                     <group col="10" colspan="4">
                         <field name="journal_id" widget="selection" select='1'/>
-                        <field name="period_id" select='1'/>
+                        <field name="period_id" select='1' string="Period"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
diff --git a/addons/account/account_invoice_workflow.xml b/addons/account/account_invoice_workflow.xml
index c3749eb8cf0..4b51c7c2ee0 100644
--- a/addons/account/account_invoice_workflow.xml
+++ b/addons/account/account_invoice_workflow.xml
@@ -105,14 +105,6 @@ write({'state':'cancel'})</field>
             <field name="signal">invoice_open</field>
         </record>
 
-        <record id="pro2_to_paid" model="workflow.transition">
-            <field name="act_from" ref="act_proforma2"/>
-            <field name="act_to" ref="account.act_paid"/>
-            <field name="trigger_model">account.move.line</field>
-            <field name="trigger_expr_id">move_line_id_payment_get()</field>
-            <field name="condition">test_paid()</field>
-        </record>
-
         <record id="pro2_to_cancel" model="workflow.transition">
             <field name="act_from" ref="act_proforma2"/>
             <field name="act_to" ref="account.act_cancel"/>
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 7acdb119a11..f28ebc76210 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -305,6 +305,7 @@ class account_move_line(osv.osv):
         ml = self.browse(cr, uid, id, context)
         return map(lambda x: x.id, ml.move_id.line_id)
 
+    # TODO: this is false, it does not uses draft and closed periods
     def _balance(self, cr, uid, ids, prop, unknow_none, unknow_dict):
         res={}
         # TODO group the foreach in sql
@@ -344,9 +345,9 @@ class account_move_line(osv.osv):
         result = []
         for line in self.browse(cr, uid, ids, context):
             if line.ref:
-                result.append((line.id, (line.name or '')+' ('+line.ref+')'))
+                result.append((line.id, (line.move_id.name or '')+' ('+line.ref+')'))
             else:
-                result.append((line.id, line.name))
+                result.append((line.id, line.move_id.name))
         return result
 
     def _balance_search(self, cursor, user, obj, name, args, domain=None, context=None):
@@ -426,7 +427,7 @@ class account_move_line(osv.osv):
         'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade", domain=[('type','<>','view'), ('type', '<>', 'closed')], select=2),
         'move_id': fields.many2one('account.move', 'Move', ondelete="cascade", help="The move of this entry line.", select=2, required=True),
         'narration': fields.related('move_id','narration', type='text', relation='account.move', string='Narration'),
-        'ref': fields.char('Ref.', size=64),
+        'ref': fields.related('move_id', 'ref', string='Reference', type='char', size=64, store=True),
         'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1),
         '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),
@@ -435,10 +436,10 @@ class account_move_line(osv.osv):
 
         'period_id': fields.many2one('account.period', 'Period', required=True, select=2),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, select=1),
-        'blocked': fields.boolean('Litigation', help="You can check this box to mark the entry line as a litigation with the associated partner"),
+        'blocked': fields.boolean('Litigation', help="You can check this box to mark this journal item as a litigation with the associated partner"),
 
         'partner_id': fields.many2one('res.partner', 'Partner'),
-        'date_maturity': fields.date('Maturity date', help="This field is used for payable and receivable entries. You can put the limit date for the payment of this entry line."),
+        'date_maturity': fields.date('Maturity date', help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."),
         'date': fields.related('move_id','date', string='Effective date', type='date', required=True,
             store={
                 'account.move': (_get_move_lines, ['date'], 20)
@@ -456,8 +457,8 @@ class account_move_line(osv.osv):
             type='many2one', relation='account.invoice', fnct_search=_invoice_search),
         'account_tax_id':fields.many2one('account.tax', 'Tax'),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
-#TODO: remove this
-        'amount_taxed':fields.float("Taxed Amount", digits_compute=dp.get_precision('Account')),
+        #TODO: remove this
+        #'amount_taxed':fields.float("Taxed Amount", digits_compute=dp.get_precision('Account')),
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True)
 
     }
@@ -864,7 +865,7 @@ class account_move_line(osv.osv):
         fields = {}
         flds = []
         title = "Accounting Entries" #self.view_header_get(cr, uid, view_id, view_type, context)
-        xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write">\n\t''' % (title)
+        xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write" colors="red:state==\'draft\';black:state==\'valid\'">\n\t''' % (title)
 
         ids = journal_pool.search(cr, uid, [])
         journals = journal_pool.browse(cr, uid, ids)
@@ -907,8 +908,8 @@ class account_move_line(osv.osv):
             if common_fields.get(field) == total:
                 fields.get(field).append(None)
 
-            if field=='state':
-                state = 'colors="red:state==\'draft\'"'
+#            if field=='state':
+#                state = 'colors="red:state==\'draft\'"'
 
             attrs = []
             if field == 'debit':
@@ -996,7 +997,7 @@ class account_move_line(osv.osv):
                 if journal.allow_date and period_id:
                     period = self.pool.get('account.period').browse(cr, uid, [period_id])[0]
                     if not time.strptime(vals['date'][:10],'%Y-%m-%d')>=time.strptime(period.date_start,'%Y-%m-%d') or not time.strptime(vals['date'][:10],'%Y-%m-%d')<=time.strptime(period.date_stop,'%Y-%m-%d'):
-                        raise osv.except_osv(_('Error'),_('The date of your Ledger Posting is not in the defined period !'))
+                        raise osv.except_osv(_('Error'),_('The date of your Journal Entry is not in the defined period!'))
         else:
             return True
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 5ade15ff918..bab05321f4d 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -874,7 +874,7 @@
             <field name="type">tree</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('valid')" string="Account Entry Line" editable="top" on_write="on_create_write">
+                <tree colors="red:state in ('draft');black:state in ('valid')" string="Account Entry Line" editable="top" on_write="on_create_write">
                     <field name="date"/>
                     <field name="period_id"/>
                     <field name="move_id"/>
@@ -926,7 +926,7 @@
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Accounting Documents"/>
                                 <field name="invoice" readonly="True"/>
-                                <field name="move_id" readonly="True"/>
+                                <field name="move_id" required="False"/>
                                 <field name="statement_id" readonly="True"/>
                             </group>
 
@@ -1059,7 +1059,7 @@
                         <field name="date" select='1'/>
                         <field name="account_id" select='1'/>
                         <field name="partner_id" select='1'>
-                            <filter help="Next Partner Entries to reconcile" name="next_partner" string="Next Partner to reconcile" context="{'next_partner_only': 1}" icon="terp-partner" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
+                            <filter help="Next Partner Entries to reconcile" name="next_partner" string="Next Partner to reconcile" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
                         </field>
                     </group>
                     <newline/>
@@ -1775,7 +1775,7 @@
             <field name="type">tree</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('valid')" string="Account Entry Line">
+                <tree colors="red:state in ('draft');black:state in ('valid')" string="Account Entry Line">
                     <field name="date"/>
                     <field name="move_id"/>
                     <field name="statement_id" string="St."/>
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index 3ed82c75f6f..27244d23694 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:07+0000\n"
+"PO-Revision-Date: 2010-08-25 07:56+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 4cb9e9bc57e..34c4d4fa398 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 17:21+0000\n"
-"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
+"PO-Revision-Date: 2010-08-25 08:04+0000\n"
+"Last-Translator: Ferdinand-chricar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index cce3ec4b817..f6a0e982119 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:09+0000\n"
+"PO-Revision-Date: 2010-08-25 07:58+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: 2010-08-25 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 9e59b136c6b..6cc89aab9b8 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:07+0000\n"
+"PO-Revision-Date: 2010-08-25 07:55+0000\n"
 "Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index 563d2f4db0c..c32d8a0abff 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:04+0000\n"
+"PO-Revision-Date: 2010-08-25 07:43+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@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: 2010-08-25 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index 567f4f93dee..0360a636c9d 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:04+0000\n"
+"PO-Revision-Date: 2010-08-25 07:44+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: 2010-08-25 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index 4a640ee12ac..d92c139d1fd 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: ASTRIT BOKSHI <astritbokshi@gmail.com>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:53+0000\n"
+"PO-Revision-Date: 2010-08-25 07:19+0000\n"
 "Last-Translator: bokshas <astritbokshi@gmail.com>\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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index 399b44f5995..25d42c77ba0 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:09+0000\n"
+"PO-Revision-Date: 2010-08-25 07:58+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: 2010-08-25 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 5478ae1bc63..480a019a8ca 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:04+0000\n"
+"PO-Revision-Date: 2010-08-25 07:43+0000\n"
 "Last-Translator: Omer Barlas <omer@barlas.com.tr>\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-08-25 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index fd8f277215f..1c718ffeaac 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:57+0000\n"
+"PO-Revision-Date: 2010-08-25 07:28+0000\n"
 "Last-Translator: Jeff Wang <wjfonhand@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: 2010-08-25 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index c2fbe5f9293..0245acaa25d 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -268,7 +268,7 @@ class account_invoice(osv.osv):
         'invoice_line': fields.one2many('account.invoice.line', 'invoice_id', 'Invoice Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'tax_line': fields.one2many('account.invoice.tax', 'invoice_id', 'Tax Lines', readonly=True, states={'draft':[('readonly',False)]}),
 
-        'move_id': fields.many2one('account.move', 'Invoice Movement', readonly=True, help="Links to the automatically generated Ledger Postings."),
+        'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True, help="Link to the automatically generated Journal Items."),
         'amount_untaxed': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Untaxed',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
@@ -299,7 +299,7 @@ class account_invoice(osv.osv):
                 '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),
                 'account.move.reconcile': (_get_invoice_from_reconcile, None, 50),
-            }, help="The Ledger Postings of the invoice have been reconciled with Ledger Postings of the payment(s)."),
+            }, 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'),
@@ -313,7 +313,7 @@ class account_invoice(osv.osv):
             },
             help="Remaining amount due."),
         'payment_ids': fields.function(_compute_lines, method=True, relation='account.move.line', type="many2many", string='Payments'),
-        'move_name': fields.char('Ledger Posting', size=64, readonly=True, states={'draft':[('readonly',False)]}),
+        '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)]})
     }
@@ -883,7 +883,7 @@ class account_invoice(osv.osv):
             line = self.finalize_invoice_move_lines(cr, uid, inv, line)
 
             move = {
-                'ref': inv.number,
+                'ref': inv.reference and inv.reference or inv.name,
                 'line_id': line,
                 'journal_id': journal_id,
                 'date': date,
diff --git a/addons/account/test/account_customer_invoice.yml b/addons/account/test/account_customer_invoice.yml
index e5920d0caed..f8798d7d9e3 100644
--- a/addons/account/test/account_customer_invoice.yml
+++ b/addons/account/test/account_customer_invoice.yml
@@ -47,7 +47,7 @@
 -
   !assert {model: account.invoice, id: account_invoice_customer0}:
     - state == 'open'
-    
+
 -
   I check that now there is a move attached to the invoice
 -
@@ -126,7 +126,7 @@
     acc_id=self.browse(cr, uid, ref("account_invoice_customer0"))
     assert(acc_id.move_id)
 -
-  I refund the invoice Using Credit Note
+  I refund the invoice Using Refund Button
 -
   !record {model: account.invoice.refund, id: account_invoice_refund_0}:
     description: Refund To China Export
diff --git a/addons/account/test/account_validate_account_move.yml b/addons/account/test/account_validate_account_move.yml
index 5157467800b..e775c8d50d5 100644
--- a/addons/account/test/account_validate_account_move.yml
+++ b/addons/account/test/account_validate_account_move.yml
@@ -1,5 +1,5 @@
 -
-  In order to test Validate Ledger Postings wizard in OpenERP I created a account move
+  In order to test the 'Validate Journal Entries' wizard in OpenERP, I created an account move
 
 -
   !record {model: account.move, id: account_move_0}:
@@ -40,7 +40,7 @@
   !assert {model: account.move, id: account_move_0}:
     - state == 'draft'
 -
-  I validate this account move by using Validate Ledger Postings
+  I validate this account move by using the 'Validate Journal Entries' wizard
 -
   !record {model: validate.account.move, id: validate_account_move_0}:
     journal_id: account.bank_journal
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index 50d6770fd3c..22f9ec63789 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -34,8 +34,9 @@ class account_invoice_refund(osv.osv_memory):
     _columns = {
        'date': fields.date('Operation date', help='This date will be used as the invoice date for Refund Invoice and Period will be chosen accordingly!'),
        'period': fields.many2one('account.period', 'Force period'),
-       'journal_id': fields.many2one('account.journal', 'Journal'),
+       'journal_id': fields.many2one('account.journal', 'Refund Journal', help='You can select here the journal to use for the refund invoice that will be created. If you leave that field empty, it will use the same journal as the current invoice.'),
        'description': fields.char('Description', size=128, required=True),
+       'filter_refund': fields.selection([('modify', 'Modify'), ('refund', 'Refund'), ('cancel', 'Cancel')], "Refund Type", required=True, help='Refund invoice base on this type'),
     }
 
     def _get_journal(self, cr, uid, context=None):
@@ -50,7 +51,8 @@ class account_invoice_refund(osv.osv_memory):
 
     _defaults = {
         'date': time.strftime('%Y-%m-%d'),
-        'journal_id': _get_journal
+        'journal_id': _get_journal,
+        'filter_refund': 'modify',
     }
 
     def compute_refund(self, cr, uid, ids, mode='refund', context=None):
@@ -66,6 +68,8 @@ class account_invoice_refund(osv.osv_memory):
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
         wf_service = netsvc.LocalService('workflow')
+        inv_tax_obj = self.pool.get('account.invoice.tax')
+        inv_line_obj = self.pool.get('account.invoice.line')
 
         if context is None:
             context = {}
@@ -76,6 +80,7 @@ class account_invoice_refund(osv.osv_memory):
             period = False
             description = False
             company = self.pool.get('res.users').browse(cr, uid, uid).company_id
+            journal_id = form.get('journal_id', False)
             for inv in inv_obj.browse(cr, uid, context.get('active_ids'), context=context):
                 if inv.state in ['draft', 'proforma2', 'cancel']:
                     raise osv.except_osv(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode))
@@ -84,7 +89,8 @@ class account_invoice_refund(osv.osv_memory):
                 else:
                     period = inv.period_id and inv.period_id.id or False
 
-                journal_id = form.get('journal_id', False)
+                if not journal_id:
+                    journal_id = inv.journal_id.id
 
                 if form['date'] :
                     date = form['date']
@@ -153,10 +159,9 @@ class account_invoice_refund(osv.osv_memory):
                                     'journal_id', 'period_id'], context=context)
                         invoice = invoice[0]
                         del invoice['id']
-                        invoice_lines = self.pool.get('account.invoice.line').read(cr, uid, invoice['invoice_line'], context=context)
+                        invoice_lines = inv_line_obj.read(cr, uid, invoice['invoice_line'], context=context)
                         invoice_lines = inv_obj._refund_cleanup_lines(cr, uid, invoice_lines)
-                        tax_lines = self.pool.get('account.invoice.tax').read(
-                                                        cr, uid, invoice['tax_line'], context=context)
+                        tax_lines = inv_tax_obj.read(cr, uid, invoice['tax_line'], context=context)
                         tax_lines = inv_obj._refund_cleanup_lines(cr, uid, tax_lines)
 
                         invoice.update({
@@ -196,13 +201,8 @@ class account_invoice_refund(osv.osv_memory):
             return result
 
     def invoice_refund(self, cr, uid, ids, context=None):
-        return self.compute_refund(cr, uid, ids, 'refund', context=context)
-
-    def invoice_cancel(self, cr, uid, ids, context=None):
-        return self.compute_refund(cr, uid, ids, 'cancel', context=context)
-
-    def invoice_modify(self, cr, uid, ids, context=None):
-        return self.compute_refund(cr, uid, ids, 'modify', context=context)
+        data_refund = self.read(cr, uid, ids, [] ,context=context)[0]['filter_refund']
+        return self.compute_refund(cr, uid, ids, data_refund, context=context)
 
 account_invoice_refund()
 
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index e4849823d52..e26eb4e12c9 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -7,29 +7,25 @@
             <field name="model">account.invoice.refund</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Refund">
-                    <separator string="This wizard is used to refund the invoice" colspan="4"/>
+                <form string="Refund Invoice">
+                    <separator string="Refund Invoice Options" colspan="4"/>
                     <group colspan="4" >
-                         <label string="Are you sure you want to refund this invoice ?" colspan="2"/>
-                         <newline/>
                          <field name="description"/>
+                         <field name="journal_id"/>
                          <field name="date"/>
                          <field name="period"/>
-                         <field name="journal_id" />
+                         <field name="filter_refund"/>
                     </group>
                     <separator colspan="4"/>
                     <group col="4" colspan="4" fill="1">
-                        <label align="0.0" width="300" string="Refund Invoice: creates a refund invoice"/>
-                        <label align="0.0" width="500" colspan="4" string="Cancel Invoice: creates a reverse accounting entries to cancel the invoice"/>
-                        <label align="0.0" width="550" colspan="4" string="Modify Invoice: creates a refund invoice, and new copy of the same invoice ready for editing"/>
+                    	<label align="0.0" width="550" colspan="4" string="Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."/>
+                        <label align="0.0" width="300" string="Refund Invoice: Creates the refund invoice, ready for editing."/>
+                        <label align="0.0" width="500" colspan="4" string="Cancel Invoice: Creates the refund invoice, validate and reconcile it to cancel the current invoice."/>
                     </group>
                     <separator colspan="4"/>
                     <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-redo" string="Refund Invoice" name="invoice_refund" type="object"/>
-                        <button icon="gtk-ok" string="Cancel Invoice" name="invoice_cancel" type="object"/>
-                        <button icon="gtk-undo" string="Modify Invoice" name="invoice_modify" type="object"/>
+                        <button string='Refund' icon="gtk-execute" name="invoice_refund" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_pay_invoice.py b/addons/account/wizard/account_pay_invoice.py
index 109d9f12e61..93716dc65bf 100644
--- a/addons/account/wizard/account_pay_invoice.py
+++ b/addons/account/wizard/account_pay_invoice.py
@@ -161,6 +161,7 @@ class account_invoice_pay(osv.osv_memory):
             writeoff_account_id = context['write_off']['writeoff_acc_id']
             writeoff_journal_id = context['write_off']['writeoff_journal_id']
             comment = context['write_off']['comment']
+            context['analytic_id'] = context['write_off']['analytic_id']
 
         amount = data['amount']
 
diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml
index 297269dd38c..457e144e4ab 100644
--- a/addons/account/wizard/account_reconcile_partner_process_view.xml
+++ b/addons/account/wizard/account_reconcile_partner_process_view.xml
@@ -15,7 +15,7 @@
                     <newline/>
                     <group colspan="4" col="4">
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                        <button name="next_partner" icon="gtk-go-forward" type="object" string="Go to next partner" />
+                        <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to next partner" />
                     </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
index 9d4b25204e3..714d64fb400 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Unreconciliation">
                 <separator string="Unreconciliate transactions" colspan="4"/>
-                <image name="gtk-dialog-info"/>
+                <image name="terp-referer"/>
                 <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled" colspan="2"/>
                 <separator colspan="4"/>
                     <group colspan="4" col="6">
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index f9a9aa3e23e..352d23d6b53 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -14,6 +14,7 @@
                 <field name="journal_id"/>
                 <newline/>
                 <field name="period_id"/>
+                <separator colspan="4"/>
                 <group colspan="4" col="6">
                     <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     <button icon="terp-camera_test" string="Approve" name="validate_move" type="object"/>
@@ -29,11 +30,11 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="validate_account_move_view"/>
             <field name="target">new</field>
-            <field name="help">The process of ledger is the process of transferring debit and credit amounts from a journal of original entry to a ledger book.</field>
+            <field name="help">The validation of journal entries process is also called 'ledger posting' and is the process of transferring debit and credit amounts from a journal of original entry to a ledger book.</field>
         </record>
 
         <menuitem
-            name="Validate Ledger Postings"
+            name="Validate Journal Entries"
             parent="periodical_processing_journal_entries_validation"
             action="action_validate_account_move"
             id="menu_validate_account_moves"
@@ -41,14 +42,14 @@
 
         <!--Account Move lines-->
         <record id="validate_account_move_line_view" model="ir.ui.view">
-            <field name="name">Validate Ledger Postings</field>
+            <field name="name">Validate Journal Entries</field>
             <field name="model">validate.account.move.lines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Validate Ledger Posting">
-                <separator string="Post Entry Lines" colspan="4"/>
-                <image name="gtk-dialog-info"/>
-                <label string="All selected entry lines will be posted. It means you won't be able to modify their accouting fields." colspan="2"/>
+            <form string="Validate Journal Entries">
+                <separator string="Post Journal Entries" colspan="4"/>
+                <image name="terp-referer"/>
+                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accouting fields." colspan="2"/>
                 <separator colspan="4"/>
                 <group colspan="4" col="6">
                     <button icon="gtk-cancel" special="cancel" string="Cancel"/>
@@ -59,7 +60,7 @@
         </record>
 
         <record id="action_validate_account_move_line" model="ir.actions.act_window">
-            <field name="name">Validate Ledger Postings</field>
+            <field name="name">Validate Journal Entries</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">validate.account.move.lines</field>
             <field name="view_type">form</field>
@@ -72,7 +73,7 @@
         <record model="ir.values" id="validate_account_move_line_values">
             <field name="model_id" ref="account.model_account_move_line" />
             <field name="object" eval="1" />
-            <field name="name">Validate Ledger Postings</field>
+            <field name="name">Validate Journal Entries</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_validate_account_move_line'))" />
             <field name="key">action</field>
diff --git a/addons/account_analytic_analysis/i18n/bg.po b/addons/account_analytic_analysis/i18n/bg.po
index 279a9b7b38c..a9b0d11a6bb 100644
--- a/addons/account_analytic_analysis/i18n/bg.po
+++ b/addons/account_analytic_analysis/i18n/bg.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:06+0000\n"
+"PO-Revision-Date: 2010-08-25 07:46+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/fi.po b/addons/account_analytic_analysis/i18n/fi.po
index d3aa2998abd..20a7e4b5158 100644
--- a/addons/account_analytic_analysis/i18n/fi.po
+++ b/addons/account_analytic_analysis/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:10+0000\n"
+"PO-Revision-Date: 2010-08-25 08:02+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/lt.po b/addons/account_analytic_analysis/i18n/lt.po
index d356e2420c1..7944728cc78 100644
--- a/addons/account_analytic_analysis/i18n/lt.po
+++ b/addons/account_analytic_analysis/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:07+0000\n"
+"PO-Revision-Date: 2010-08-25 07:55+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/tr.po b/addons/account_analytic_analysis/i18n/tr.po
index 285c3b7dd3f..cb09d7f4bcb 100644
--- a/addons/account_analytic_analysis/i18n/tr.po
+++ b/addons/account_analytic_analysis/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:06+0000\n"
+"PO-Revision-Date: 2010-08-25 07:47+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_default/i18n/lt.po b/addons/account_analytic_default/i18n/lt.po
index e1dcbfbbf51..bca01654e72 100644
--- a/addons/account_analytic_default/i18n/lt.po
+++ b/addons/account_analytic_default/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:06+0000\n"
+"PO-Revision-Date: 2010-08-25 07:47+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/tr.po b/addons/account_analytic_default/i18n/tr.po
index 38918a9e54d..d6d15d4c068 100644
--- a/addons/account_analytic_default/i18n/tr.po
+++ b/addons/account_analytic_default/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:06+0000\n"
+"PO-Revision-Date: 2010-08-25 07:48+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_plans/i18n/lt.po b/addons/account_analytic_plans/i18n/lt.po
index 6830076d825..2b7a8607a36 100644
--- a/addons/account_analytic_plans/i18n/lt.po
+++ b/addons/account_analytic_plans/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:06+0000\n"
+"PO-Revision-Date: 2010-08-25 07:47+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po
index 185bcf1f290..e92542b87a6 100644
--- a/addons/account_analytic_plans/i18n/tr.po
+++ b/addons/account_analytic_plans/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:05+0000\n"
+"PO-Revision-Date: 2010-08-25 07:45+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po
index 89665060b7a..5f58a37b999 100644
--- a/addons/account_budget/i18n/lt.po
+++ b/addons/account_budget/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:07+0000\n"
+"PO-Revision-Date: 2010-08-25 07:54+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po
index de452d0b01f..47281fd52c4 100644
--- a/addons/account_budget/i18n/tr.po
+++ b/addons/account_budget/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:07+0000\n"
+"PO-Revision-Date: 2010-08-25 07:53+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_coda/i18n/ar.po b/addons/account_coda/i18n/ar.po
index 298a0ee5b25..bd3e7a08bc3 100644
--- a/addons/account_coda/i18n/ar.po
+++ b/addons/account_coda/i18n/ar.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-24 13:11+0000\n"
-"PO-Revision-Date: 2010-08-24 05:57+0000\n"
+"PO-Revision-Date: 2010-08-25 07:28+0000\n"
 "Last-Translator: bamuhrez <bamuhrez@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 0f223623c48..8d494b685a7 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -95,7 +95,7 @@
             <field name="type">tree</field>
             <field eval="32" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('validate')" editable="bottom" string="Partner entries">
+                <tree colors="red:state in ('draft');black:state in ('validate')" editable="bottom" string="Partner entries">
                     <field name="date"/>
                     <field name="move_id"/>
                     <field name="ref"/>
diff --git a/addons/account_followup/i18n/lt.po b/addons/account_followup/i18n/lt.po
index fdf5d619b4f..099bc916b67 100644
--- a/addons/account_followup/i18n/lt.po
+++ b/addons/account_followup/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:04+0000\n"
+"PO-Revision-Date: 2010-08-25 07:44+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po
index 9eefc82ad76..4f360520915 100644
--- a/addons/account_followup/i18n/tr.po
+++ b/addons/account_followup/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:06+0000\n"
+"PO-Revision-Date: 2010-08-25 07:48+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_invoice_layout/i18n/lt.po b/addons/account_invoice_layout/i18n/lt.po
index 33b3c3e5f66..917ac400da4 100644
--- a/addons/account_invoice_layout/i18n/lt.po
+++ b/addons/account_invoice_layout/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:05+0000\n"
+"PO-Revision-Date: 2010-08-25 06:04+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/tr.po b/addons/account_invoice_layout/i18n/tr.po
index 0897bbcdf0d..e276818f0a6 100644
--- a/addons/account_invoice_layout/i18n/tr.po
+++ b/addons/account_invoice_layout/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:07+0000\n"
+"PO-Revision-Date: 2010-08-25 07:52+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_payment/i18n/lt.po b/addons/account_payment/i18n/lt.po
index 7e87b2141f9..17409afad79 100644
--- a/addons/account_payment/i18n/lt.po
+++ b/addons/account_payment/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:10+0000\n"
+"PO-Revision-Date: 2010-08-25 08:03+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/tr.po b/addons/account_payment/i18n/tr.po
index dad16d2d746..21d80c3683b 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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:11+0000\n"
+"PO-Revision-Date: 2010-08-25 08:04+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_report/i18n/lt.po b/addons/account_report/i18n/lt.po
index 544f6a71695..fbe0d33588b 100644
--- a/addons/account_report/i18n/lt.po
+++ b/addons/account_report/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:06+0000\n"
+"PO-Revision-Date: 2010-08-25 07:49+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/tr.po b/addons/account_report/i18n/tr.po
index 627c98cdf2a..4e6c4a9d17c 100644
--- a/addons/account_report/i18n/tr.po
+++ b/addons/account_report/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:09+0000\n"
+"PO-Revision-Date: 2010-08-25 07:57+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_reporting/i18n/lt.po b/addons/account_reporting/i18n/lt.po
index 8799d418803..fd60c86ee77 100644
--- a/addons/account_reporting/i18n/lt.po
+++ b/addons/account_reporting/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:02+0000\n"
+"PO-Revision-Date: 2010-08-25 05:58+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/tr.po b/addons/account_reporting/i18n/tr.po
index bc45bff2370..5ae738be8e4 100644
--- a/addons/account_reporting/i18n/tr.po
+++ b/addons/account_reporting/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:09+0000\n"
+"PO-Revision-Date: 2010-08-25 07:57+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_tax_include/i18n/tr.po b/addons/account_tax_include/i18n/tr.po
index 8e787f4e345..b53e7cb1130 100644
--- a/addons/account_tax_include/i18n/tr.po
+++ b/addons/account_tax_include/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:06+0000\n"
+"PO-Revision-Date: 2010-08-25 07:50+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_voucher/i18n/account_voucher.pot b/addons/account_voucher/i18n/account_voucher.pot
index 46f7fb42d89..874c6297462 100644
--- a/addons/account_voucher/i18n/account_voucher.pot
+++ b/addons/account_voucher/i18n/account_voucher.pot
@@ -281,7 +281,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/ar.po b/addons/account_voucher/i18n/ar.po
index 05f63ecc24a..a8d8dc6bbf7 100644
--- a/addons/account_voucher/i18n/ar.po
+++ b/addons/account_voucher/i18n/ar.po
@@ -282,7 +282,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/bg.po b/addons/account_voucher/i18n/bg.po
index 344d4177e4e..e976b77f007 100644
--- a/addons/account_voucher/i18n/bg.po
+++ b/addons/account_voucher/i18n/bg.po
@@ -282,7 +282,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/bs.po b/addons/account_voucher/i18n/bs.po
index 035493ed236..7b3350a9a1c 100644
--- a/addons/account_voucher/i18n/bs.po
+++ b/addons/account_voucher/i18n/bs.po
@@ -282,7 +282,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/ca.po b/addons/account_voucher/i18n/ca.po
index 7ae395a9335..99d0942f224 100644
--- a/addons/account_voucher/i18n/ca.po
+++ b/addons/account_voucher/i18n/ca.po
@@ -282,7 +282,7 @@ msgstr "Nou pagament bancari"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr "Línies de comprovant"
 
diff --git a/addons/account_voucher/i18n/cs.po b/addons/account_voucher/i18n/cs.po
index 05f63ecc24a..a8d8dc6bbf7 100644
--- a/addons/account_voucher/i18n/cs.po
+++ b/addons/account_voucher/i18n/cs.po
@@ -282,7 +282,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/de.po b/addons/account_voucher/i18n/de.po
index 8355a486b7d..2d2a5233a3e 100644
--- a/addons/account_voucher/i18n/de.po
+++ b/addons/account_voucher/i18n/de.po
@@ -282,7 +282,7 @@ msgstr "Neue Bankzahlung"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr "Auszugspositionen"
 
diff --git a/addons/account_voucher/i18n/el.po b/addons/account_voucher/i18n/el.po
index 56ae9a69aad..e75e183b8c2 100644
--- a/addons/account_voucher/i18n/el.po
+++ b/addons/account_voucher/i18n/el.po
@@ -283,7 +283,7 @@ msgstr "Νέα Πληρωμή Τράπεζας"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr "Γραμμές Παραστατικού"
 
diff --git a/addons/account_voucher/i18n/es.po b/addons/account_voucher/i18n/es.po
index 6f0b8fbd572..364df94d7d9 100644
--- a/addons/account_voucher/i18n/es.po
+++ b/addons/account_voucher/i18n/es.po
@@ -282,7 +282,7 @@ msgstr "Nuevo pago bancario"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr "Líneas de comprobante"
 
diff --git a/addons/account_voucher/i18n/es_AR.po b/addons/account_voucher/i18n/es_AR.po
index 057043e645c..6eda03d0951 100644
--- a/addons/account_voucher/i18n/es_AR.po
+++ b/addons/account_voucher/i18n/es_AR.po
@@ -282,7 +282,7 @@ msgstr "Nuevo pago en bancos"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr "Lineas del voucher"
 
diff --git a/addons/account_voucher/i18n/et.po b/addons/account_voucher/i18n/et.po
index 6454eadd7a6..b78b0e2781a 100644
--- a/addons/account_voucher/i18n/et.po
+++ b/addons/account_voucher/i18n/et.po
@@ -322,7 +322,7 @@ msgstr "Uus pangamakse"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr "Tähiku read"
 
diff --git a/addons/account_voucher/i18n/fr.po b/addons/account_voucher/i18n/fr.po
index 28108b2360a..2b6f1e29e09 100644
--- a/addons/account_voucher/i18n/fr.po
+++ b/addons/account_voucher/i18n/fr.po
@@ -282,7 +282,7 @@ msgstr "Nouveau Paiement Bancaire"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr "Lignes de Souches"
 
diff --git a/addons/account_voucher/i18n/hr.po b/addons/account_voucher/i18n/hr.po
index a2b3937da37..d099117e269 100644
--- a/addons/account_voucher/i18n/hr.po
+++ b/addons/account_voucher/i18n/hr.po
@@ -282,7 +282,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/hu.po b/addons/account_voucher/i18n/hu.po
index 05f63ecc24a..a8d8dc6bbf7 100644
--- a/addons/account_voucher/i18n/hu.po
+++ b/addons/account_voucher/i18n/hu.po
@@ -282,7 +282,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/id.po b/addons/account_voucher/i18n/id.po
index f770d6c8e3b..8139df0348d 100644
--- a/addons/account_voucher/i18n/id.po
+++ b/addons/account_voucher/i18n/id.po
@@ -282,7 +282,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/it.po b/addons/account_voucher/i18n/it.po
index b9f51e3d29e..0a43b73c605 100644
--- a/addons/account_voucher/i18n/it.po
+++ b/addons/account_voucher/i18n/it.po
@@ -282,7 +282,7 @@ msgstr "Nuovo Pagamento Bancario"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr "Nuova Ricevuta"
 
diff --git a/addons/account_voucher/i18n/ko.po b/addons/account_voucher/i18n/ko.po
index 739add68afd..6389b093d99 100644
--- a/addons/account_voucher/i18n/ko.po
+++ b/addons/account_voucher/i18n/ko.po
@@ -283,7 +283,7 @@ msgstr "새 은행 결제"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr "전표 라인"
 
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index 86cff924204..3117a73dc6e 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:07+0000\n"
+"PO-Revision-Date: 2010-08-25 07:53+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -282,7 +282,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/nl.po b/addons/account_voucher/i18n/nl.po
index 45e499f70ef..b3d29854ece 100644
--- a/addons/account_voucher/i18n/nl.po
+++ b/addons/account_voucher/i18n/nl.po
@@ -282,7 +282,7 @@ msgstr "Nieuwe bankbetaling"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr "Bonregels"
 
diff --git a/addons/account_voucher/i18n/nl_BE.po b/addons/account_voucher/i18n/nl_BE.po
index fd1f916829c..fde6795e91d 100644
--- a/addons/account_voucher/i18n/nl_BE.po
+++ b/addons/account_voucher/i18n/nl_BE.po
@@ -282,7 +282,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/oc.po b/addons/account_voucher/i18n/oc.po
index 1ae2ad5023b..d3811ea1497 100644
--- a/addons/account_voucher/i18n/oc.po
+++ b/addons/account_voucher/i18n/oc.po
@@ -283,7 +283,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/pl.po b/addons/account_voucher/i18n/pl.po
index 867e7ce5a38..f4d732870d4 100644
--- a/addons/account_voucher/i18n/pl.po
+++ b/addons/account_voucher/i18n/pl.po
@@ -282,7 +282,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/pt.po b/addons/account_voucher/i18n/pt.po
index 11530184b45..b4f5dc99d96 100644
--- a/addons/account_voucher/i18n/pt.po
+++ b/addons/account_voucher/i18n/pt.po
@@ -282,7 +282,7 @@ msgstr "Novo pagamento bancário"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr "Linhas Voucher"
 
diff --git a/addons/account_voucher/i18n/pt_BR.po b/addons/account_voucher/i18n/pt_BR.po
index 4c7890bc673..35af296f0c0 100644
--- a/addons/account_voucher/i18n/pt_BR.po
+++ b/addons/account_voucher/i18n/pt_BR.po
@@ -282,7 +282,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/ro.po b/addons/account_voucher/i18n/ro.po
index 96bfcdeb6a9..45322098f0a 100644
--- a/addons/account_voucher/i18n/ro.po
+++ b/addons/account_voucher/i18n/ro.po
@@ -282,7 +282,7 @@ msgstr "Plată nouă prin bancă"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr "Înregistrări bonuri valorice"
 
diff --git a/addons/account_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po
index 7a7b897416c..c905500e618 100644
--- a/addons/account_voucher/i18n/ru.po
+++ b/addons/account_voucher/i18n/ru.po
@@ -282,7 +282,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/sl.po b/addons/account_voucher/i18n/sl.po
index f2616c89850..37c75f576a2 100644
--- a/addons/account_voucher/i18n/sl.po
+++ b/addons/account_voucher/i18n/sl.po
@@ -282,7 +282,7 @@ msgstr "Novo bančno plačilo"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/sq.po b/addons/account_voucher/i18n/sq.po
index 01c293b5d2f..20c1981720b 100644
--- a/addons/account_voucher/i18n/sq.po
+++ b/addons/account_voucher/i18n/sq.po
@@ -283,7 +283,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/sr.po b/addons/account_voucher/i18n/sr.po
index e607c0faa6b..623af11cbd9 100644
--- a/addons/account_voucher/i18n/sr.po
+++ b/addons/account_voucher/i18n/sr.po
@@ -283,7 +283,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/sv.po b/addons/account_voucher/i18n/sv.po
index dc1d449ec32..868f73fd40c 100644
--- a/addons/account_voucher/i18n/sv.po
+++ b/addons/account_voucher/i18n/sv.po
@@ -282,7 +282,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/tlh.po b/addons/account_voucher/i18n/tlh.po
index 76a668d455e..af8a8577ec9 100644
--- a/addons/account_voucher/i18n/tlh.po
+++ b/addons/account_voucher/i18n/tlh.po
@@ -282,7 +282,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index c5119caa6ac..9a1640a7386 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:06+0000\n"
+"PO-Revision-Date: 2010-08-25 07:51+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -282,7 +282,7 @@ msgstr "Yeni Banka Ödemesi"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr "Fiş Kalemleri"
 
diff --git a/addons/account_voucher/i18n/uk.po b/addons/account_voucher/i18n/uk.po
index 500c8962bb0..ab92517fda8 100644
--- a/addons/account_voucher/i18n/uk.po
+++ b/addons/account_voucher/i18n/uk.po
@@ -282,7 +282,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/vi.po b/addons/account_voucher/i18n/vi.po
index 30c865017e6..fd930c1a101 100644
--- a/addons/account_voucher/i18n/vi.po
+++ b/addons/account_voucher/i18n/vi.po
@@ -283,7 +283,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/i18n/zh_CN.po b/addons/account_voucher/i18n/zh_CN.po
index 4aa49b64445..e50ff08cdbf 100644
--- a/addons/account_voucher/i18n/zh_CN.po
+++ b/addons/account_voucher/i18n/zh_CN.po
@@ -282,7 +282,7 @@ msgstr "新的银行付款"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr "原始凭证明细"
 
diff --git a/addons/account_voucher/i18n/zh_TW.po b/addons/account_voucher/i18n/zh_TW.po
index 513f3b22fd7..63c2ef87b03 100644
--- a/addons/account_voucher/i18n/zh_TW.po
+++ b/addons/account_voucher/i18n/zh_TW.po
@@ -282,7 +282,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
+#: field:account.voucher,line_ids:0
 msgid "Voucher Lines"
 msgstr ""
 
diff --git a/addons/account_voucher/report/report_voucher_amount.rml b/addons/account_voucher/report/report_voucher_amount.rml
index 81ebc376e52..71e18a23a69 100755
--- a/addons/account_voucher/report/report_voucher_amount.rml
+++ b/addons/account_voucher/report/report_voucher_amount.rml
@@ -234,19 +234,19 @@
             <font color="white"> </font>
           </para>
           <section>
-            <para style="terp_default_8">[[ repeatIn(voucher.payment_ids,'payment_ids') ]] </para>
+            <para style="terp_default_8">[[ repeatIn(voucher.line_ids,'line_ids') ]] </para>
             <blockTable colWidths="342.0,135.0" style="Table3">
               <tr>
                 <td>
-                  <para style="terp_header">[[ payment_ids.partner_id and payment_ids.partner_id.name or '' ]] </para>
+                  <para style="terp_header">[[ line_ids.partner_id and line_ids.partner_id.name or '' ]] </para>
                 </td>
                 <td>
-                  <para style="terp_header_Right">[[ payment_ids.amount ]]</para>
+                  <para style="terp_header_Right">[[ line_ids.amount ]]</para>
                 </td>
               </tr>
               <tr>
                 <td>
-                  <para style="terp_default_9_30">[[ payment_ids.account_id.name ]] </para>
+                  <para style="terp_default_9_30">[[ line_ids.account_id.name ]] </para>
                 </td>
                 <td>
                   <para style="P22">
@@ -256,7 +256,7 @@
               </tr>
               <tr>
                 <td>
-                  <para style="terp_default_9_50">[[ payment_ids.ref ]] [[ payment_ids.amount ]] </para>
+                  <para style="terp_default_9_50">[[ line_ids.ref ]] [[ line_ids.amount ]] </para>
                 </td>
                 <td>
                   <para style="terp_default_9_50">
@@ -266,7 +266,7 @@
               </tr>
               <tr>
                 <td>
-                  <para style="terp_default_9_50">[[ payment_ids.type ]]</para>
+                  <para style="terp_default_9_50">[[ line_ids.type ]]</para>
                 </td>
                 <td>
                   <para style="terp_default_9_50">
diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml
index 6091519df53..b63bfc9d129 100644
--- a/addons/account_voucher/test/account_voucher.yml
+++ b/addons/account_voucher/test/account_voucher.yml
@@ -9,7 +9,7 @@
     journal_id: account.bank_journal
     name: Voucher for Axelor
     narration: Basic Pc
-    payment_ids:
+    line_ids:
       - account_id: account.a_recv
         amount: 1000.0
         name: Voucher for Axelor
@@ -35,17 +35,8 @@
   I create voucher by clicking on Create button
 -
   !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucherforaxelor0}
--
-  I check that the voucher state is "Waiting for re-checking"
--
-  !assert {model: account.voucher, id: account_voucher_voucherforaxelor0}:
-    - state == 'recheck'
 -
   I clicked on Validate Button
--
-  !workflow {model: account.voucher, action: recheck_voucher, ref: account_voucher_voucherforaxelor0}
--
-  I check that the voucher state is "posted"
 -
   !assert {model: account.voucher, id: account_voucher_voucherforaxelor0}:
     - state == 'posted'
@@ -68,7 +59,7 @@
     journal_id: account.bank_journal
     name: Voucher Axelor
     narration: Basic PC
-    payment_ids:
+    line_ids:
       - account_id: account.cash
         amount: 1000.0
         name: Voucher Axelor
@@ -93,21 +84,11 @@
   I create voucher by clicking on Create button
 -
   !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucheraxelor0}
--
-  I check that the voucher state is "Waiting for re-checking"
--
-  !assert {model: account.voucher, id: account_voucher_voucheraxelor0}:
-    - state == 'recheck'
--
-  I clicked on Validate Button
--
-  !workflow {model: account.voucher, action: recheck_voucher, ref: account_voucher_voucheraxelor0}
 -
   I check that the voucher state is "posted"
 -
   !assert {model: account.voucher, id: account_voucher_voucheraxelor0}:
     - state == 'posted'
-
 -
   I check that moves get created for this voucher
 -
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 2c2ea28b7c9..e8a02320533 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -25,159 +25,72 @@ from osv import fields
 from osv import osv
 from tools.translate import _
 
-class ir_sequence_type(osv.osv):
-    _inherit = "ir.sequence.type"
-    _columns = {
-        'name': fields.char('Sequence Name',size=128, required=True),
-        'code': fields.char('Sequence Code',size=128, required=True),
-    }
-ir_sequence_type()
-
-class account_journal(osv.osv):
-    _inherit = "account.journal"
-    _columns = {
-        'max_amount': fields.float('Verify Transaction', digits=(16, 2), help="Validate voucher entry twice before posting it, if transaction amount more then entered here"),
-    }
-account_journal()
-
-class account_account(osv.osv):
-    """
-    account_account
-    """
-    
-    _inherit = 'account.account'
-    _columns = {
-        'user_type_type': fields.related('user_type','report_type', type='char', size=64, relation='account.account.type', string='User Type Code', readonly=True, store=True)
-    }
-account_account()
-
-class account_move(osv.osv):
-    _inherit = 'account.move'
-    
-    def _get_line_ids(self, cr, uid, ids, context=None):
-        result = {}
-        for line in self.pool.get('account.move.line').browse(cr, uid, ids, context=context):
-            result[line.move_id.id] = True
-        return result.keys()
-    
-    def _amount_all(self, cr, uid, ids, name, args, context=None):
-        res = {}
-        for move in self.browse(cr, uid, ids, context=context):
-            rs = {
-                'reconcile_id': False,
-            }
-            for line in move.line_id:
-                if line.reconcile_id:
-                    rs.update({
-                        'reconcile_id': line.reconcile_id.id
-                    })
-                    break
-            res[move.id] = rs
+class account_move_line(osv.osv):
+    _inherit = 'account.move.line'
+    def _unreconciled(self, cr, uid, ids, prop, unknow_none, context):
+        res={}
+        for line in self.browse(cr, uid, ids, context=context):
+            res[line.id] = line.debit - line.credit
+            if line.reconcile_partial_id:
+                res[line.id] = 0
+                for partial in line.reconcile_partial_id.line_partial_ids:
+                    res[line.id] += partial.debit - partial.credit
+            res[line.id] = abs(res[line.id])
         return res
-    
+
     _columns = {
-        'reconcile_id': fields.function(_amount_all, method=True, type="many2one", relation="account.move.reconcile", select=True, string='Reconcile',
-            store=True,
-            multi='all'),
+        'amount_unreconciled': fields.function(_unreconciled, method=True, string='Unreconciled Amount'),
     }
-    
-    def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
-        """
-        Returns a list of ids based on search domain {args}
-    
-        @param cr: A database cursor
-        @param user: ID of the user currently logged in
-        @param args: list of conditions to be applied in search opertion
-        @param offset: default from first record, you can start from nth record
-        @param limit: number of records to be obtained as a result of search opertion
-        @param order: ordering on any field(s)
-        @param context: context arguments, like lang, time zone
-        @param count: 
-        
-        @return: Returns a list of ids based on search domain
-        """
-        if not context:
-            context = {}
-        ttype = context.get('type', False)
-        partner = context.get('partner_id', False)
-        voucher = context.get('voucher', False)
-        if voucher and not partner:
-            raise osv.except_osv(_('Invalid Partner !'), _('Please select the partner !'))
-            
-        if ttype and ttype in ('receipt'):
-            args += [('journal_id.type','in', ['sale', 'purchase_refund'])]
-        elif ttype and ttype in ('payment'):
-            args += [('journal_id.type','in', ['purchase', 'sale_refund'])]
-        elif ttype and ttype in('sale', 'purchase'):
-            raise osv.except_osv(_('Invalid action !'), _('You can not reconcile sales, purchase, or journal voucher with invoice !'))
-            args += [('journal_id.type','=', 'do_not_allow_search')]
-        res = super(account_move, self).search(cr, user, args, offset, limit, order, {}, count)
-        return res
-    
-account_move()
+account_move_line()
 
 class account_voucher(osv.osv):
-
     def _get_period(self, cr, uid, context={}):
         if context.get('period_id', False):
             return context.get('period_id')
-
         periods = self.pool.get('account.period').find(cr, uid)
-        if periods:
-            return periods[0]
-        else:
-            return False
+        return periods and periods[0] or False
 
     def _get_journal(self, cr, uid, context={}):
         journal_pool = self.pool.get('account.journal')
-
         if context.get('journal_id', False):
             return context.get('journal_id')
-
         ttype = context.get('type', 'bank')
         res = journal_pool.search(cr, uid, [('type', '=', ttype)], limit=1)
+        return res and res[0] or False
 
-        if res:
-            return res[0]
-        else:
+    def _get_tax(self, cr, uid, context={}):
+        journal_id = context.get('journal_id', False)
+        if not journal_id:
             return False
-
-    def _get_type(self, cr, uid, context={}):
-        return context.get('type')
-        
-    def _get_pay_journal(self, cr, uid, context={}):
         journal_pool = self.pool.get('account.journal')
-
-        res = journal_pool.search(cr, uid, [('type', '=', 'bank')], limit=1)
-        if res:
-            return res[0]
-        else:
-            return False
+        journal = journal_pool.browse(cr, uid, journal_id)
+        account_id = journal.default_credit_account_id or journal.default_debit_account_id
+        if account_id and account_id.tax_ids:
+            tax_id = account_id.tax_ids[0].id
+            return tax_id
+        return False
 
     def _get_currency(self, cr, uid, context):
         user = self.pool.get('res.users').browse(cr, uid, uid)
         if user.company_id:
             return user.company_id.currency_id.id
-        else:
-            return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0]
+        return False
 
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
-    _order = "id desc"
+    _order = "date desc, id desc"
     _rec_name = 'number'
-    
     _columns = {
-        'type':fields.selection([
-            ('payment','Payment'),
-            ('receipt','Receipt'),
-            ('sale','Sale'),
-            ('purchase','Purchase'), 
-        ],'Type', select=True, readonly=True),
         'name':fields.char('Memo', size=256, readonly=True, states={'draft':[('readonly',False)]}),
         'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
         'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'payment_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
+
+        'line_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
+        'line_cr_ids':fields.one2many('account.voucher.line','voucher_id','Credits',
+            domain=[('type','=','cr')], context={'default_type':'cr'}),
+        'line_dr_ids':fields.one2many('account.voucher.line','voucher_id','Debits',
+            domain=[('type','=','dr')], context={'default_type':'dr'}),
         'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'narration':fields.text('Narration', readonly=True, states={'draft':[('readonly',False)]}),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -186,16 +99,13 @@ class account_voucher(osv.osv):
             [('draft','Draft'),
              ('proforma','Pro-forma'),
              ('posted','Posted'),
-             ('recheck','Waiting for Re-checking'),
-             ('cancel','Cancel'),
-             ('audit','Audit Complete')
+             ('cancel','Cancelled')
             ], 'State', readonly=True, size=32,
             help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Voucher. \
                         \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \
                         \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \
                         \n* The \'Cancelled\' state is used when user cancel voucher.'),
-        #'amount': fields.function(_compute_total, method=True, type='float', digits=(14,2), string='Total', store=True),
-        'amount': fields.float('Total', digits=(16, 2), readonly=True, states={'draft':[('readonly',False)]}),
+        'amount': fields.float('Total', digits=(16, 2), required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'tax_amount':fields.float('Tax Amount', digits=(14,2), readonly=True, states={'draft':[('readonly',False)]}),
         'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Payment or Receipt transaction number, i.e. Bank cheque number or payorder number or Wire transfer number or Acknowledge number."),
         'number': fields.related('move_id', 'name', type="char", readonly=True, string='Number'),
@@ -208,10 +118,9 @@ class account_voucher(osv.osv):
             ('pay_later','Pay Later or Group Funds'),
         ],'Payment', select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'tax_id':fields.many2one('account.tax', 'Tax', readonly=True, states={'draft':[('readonly',False)]}),
+        'pre_line':fields.boolean('Previous Payments ?', required=False),
     }
-    
     _defaults = {
-        'type':_get_type,
         'period_id': _get_period,
         'journal_id':_get_journal,
         'currency_id': _get_currency,
@@ -219,289 +128,180 @@ class account_voucher(osv.osv):
         'pay_now':lambda *a: 'pay_later',
         'name': lambda *a: '',
         'date' : lambda *a: time.strftime('%Y-%m-%d'),
-        'audit': lambda *a: False,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
+        'tax_id': _get_tax,
     }
 
-    def compute_tax(self, cr, uid, ids, context={}):
+    # TODO: review this code.
+    def onchange_price(self, cr, uid, ids, line_ids, tax_id, partner_id=False, context={}):
         tax_pool = self.pool.get('account.tax')
         partner_pool = self.pool.get('res.partner')
         position_pool = self.pool.get('account.fiscal.position')
         voucher_line_pool = self.pool.get('account.voucher.line')
-
-        for voucher in self.browse(cr, uid, ids):
-            total = 0.0
-            for line in voucher.payment_ids:
-                total += line.amount
-
-            if voucher.tax_id:
-                tax_id = voucher.tax_id.id
-                tax = [tax_pool.browse(cr, uid, tax_id)]
-                
-                if voucher.partner_id:
-                    partner = partner_pool.browse(cr, uid, voucher.partner_id) or False
-                    taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, tax)
-                    tax = tax_pool.browse(cr, uid, taxes)
-
-                voucher_total_tax = 0.0
-                voucher_total_amount = 0.0
-                if voucher.tax_id.price_include:
-                    for line in voucher.payment_ids:
-                        total_amount = 0.0
-                        total_tax = 0.0
-                        for tax_line in tax_pool.compute_all(cr, uid, tax, line.amount, 1).get('taxes'):
-                            total_tax += tax_line.get('amount')
-                            total_amount += tax_line.get('price_unit')
-                        voucher_total_tax += total_tax
-                        voucher_line_pool.write(cr, uid, [line.id], {'amount':total_amount})
-                    voucher_total_amount = total
-                else:
-                    for tax_line in tax_pool.compute_all(cr, uid, tax, total, 1).get('taxes'):
-                        voucher_total_tax += tax_line.get('amount')
-                    voucher_total_amount = total + voucher_total_tax
-                self.write(cr, uid, [voucher.id], {'tax_amount':voucher_total_tax, 'amount':voucher_total_amount})
-
-        return True
-                
-    def onchange_price(self, cr, uid, ids, payment_ids, tax_id, partner_id=False, context={}):
-        tax_pool = self.pool.get('account.tax')
-        partner_pool = self.pool.get('res.partner')
-        position_pool = self.pool.get('account.fiscal.position')
-
         res = {
             'tax_amount':False,
-            'amount':False
+            'amount':False,
         }
-
-        tax_amount = 0.0
+        voucher_total_tax = 0.0
+        voucher_total = 0.0
+        voucher_line_ids = []
+        
         total = 0.0
-
-        for line in payment_ids:
-            total += line[2].get('amount')
-
+        total_tax = 0.0
+        
+        for line in line_ids:
+            voucher_line_ids += [line[1]]
+            voucher_total += line[2].get('amount')
+        
+        total = voucher_total
+        
+        if tax_id:
+            tax = [tax_pool.browse(cr, uid, tax_id)]
+            
+            if partner_id:
+                partner = partner_pool.browse(cr, uid, partner_id) or False
+                taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, tax)
+                tax = tax_pool.browse(cr, uid, taxes)
+            
+            if not tax[0].price_include:
+                for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_total, 1).get('taxes'):
+                    total_tax += tax_line.get('amount')
+                total += total_tax
+            else:
+                line_ids2 = []
+                for line in line_ids:
+                    line_total = 0.0
+                    line_tax = 0.0
+                    operation = line[0]
+                    rec_id = line[1]
+                    rec = line[2]
+                    for tax_line in tax_pool.compute_all(cr, uid, tax, rec.get('amount'), 1).get('taxes'):
+                        line_tax += tax_line.get('amount')
+                        line_total += tax_line.get('price_unit')
+                    total_tax += line_tax
+                    if rec_id:
+                        voucher_line_pool.write(cr, uid, [rec_id], {'amount':line_total})
+                        line_ids2 += [rec_id]
+                    else:
+                        rec.update({
+                            'amount':line_total
+                        })
+                res.update({
+                    'line_ids':line_ids2
+                })
         res.update({
             'amount':total,
-            'tax_amount':tax_amount
+            'tax_amount':total_tax
         })
-        
         return {
             'value':res
         }
 
-    def create(self, cr, uid, vals, context={}):
-        """
-        Create a new record for a model account_voucher
-        @param cr: A database cursor
-        @param user: ID of the user currently logged in
-        @param vals: provides data for new record
-        @param context: context arguments, like lang, time zone
-        
-        @return: Returns an id of the new record
-        """
-
-        old_line = []
-        new_lines = []
-        
-        payment_ids = vals.get('payment_ids')
-        
-        if not payment_ids:
-            payment_ids = []
-        
-        vals.update({
-            'payment_ids':False
-        })
-        for line in payment_ids:
-            id1 = line[0]
-            id2 = line[1]
-            res = line[2]
-            if id1 == 0 and id2 == 0:
-                new_lines += [(id1, id2, res)]
-            else:
-                old_line += [(id1, id2, res)]
-
-        if new_lines:
-            vals.update({
-                'payment_ids':new_lines
-            })
-
-        res_id = super(account_voucher, self).create(cr, uid, vals, context)
-        
-        if old_line:
-            new_payment_ids = []
-            for line in old_line:
-                id1 = line[0]
-                id2 = line[1]
-                res = line[2]
-                if res:
-                    res.update({
-                        'voucher_id':res_id
-                    })
-                    new_payment_ids += [(id1, id2, res)]
-                
-            self.write(cr, uid, [res_id], {'payment_ids':new_payment_ids})
-        return res_id
-    
-    def onchange_partner_id(self, cr, uid, ids, partner_id, ttype, journal_id=False, context={}):
+    def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id=False, price=0.0, context={}):
         """
         Returns a dict that contains new values and context
     
-        @param cr: A database cursor
-        @param user: ID of the user currently logged in
         @param partner_id: latest value from user input for field partner_id
         @param args: other arguments
         @param context: context arguments, like lang, time zone
         
         @return: Returns a dict which contains new values, and context
         """
+        if not journal_id:
+            return {}
         move_pool = self.pool.get('account.move')
         line_pool = self.pool.get('account.voucher.line')
         move_line_pool = self.pool.get('account.move.line')
         partner_pool = self.pool.get('res.partner')
         journal_pool = self.pool.get('account.journal')
-        res = []
-        
-        context.update({
-            'type':ttype, 
-            'partner_id':partner_id, 
-            'voucher':True,
-        })
-        if journal_id:
-            context.update({
-                'journal_id':journal_id, 
-            })
-        
         default = {
-            'value':{'payment_ids':[],'amount':0.0},
-            'context':context,
+            'value':{'line_ids':[], 'line_dr_ids':[], 'line_cr_ids':[], 'pre_line': 0},
         }
+
+        # TODO: improve this if possible !
         if not partner_id:
             if ids:
                 line_ids = line_pool.search(cr, uid, [('voucher_id','=',ids[0])])
                 if line_ids:
                     line_pool.unlink(cr, uid, line_ids)
             return default
-        
-        account_id = False
+
+        journal = journal_pool.browse(cr, uid, journal_id)
         partner = partner_pool.browse(cr, uid, partner_id)
-        if ttype in ('sale'):
+        account_id = False
+        if journal.type in ('sale','sale_refund'):
             account_id = partner.property_account_receivable.id
-        elif ttype in ('purchase'):
+        elif journal.type in ('purchase', 'purchase_refund','expense'):
             account_id = partner.property_account_payable.id
-        elif ttype in ('payment', 'receipt'):
-            journal = journal_pool.browse(cr, uid, journal_id)
-            if ttype == 'payment':
-                account_id = journal.default_credit_account_id.id
-            elif ttype == 'receipt':
-                account_id = journal.default_debit_account_id.id
-        
+        else:
+            account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
         default['value'].update({
             'account_id':account_id
         })
-        if ttype not in ('payment', 'receipt'):
+        if journal.type not in ('cash', 'bank'):
             return default
-        
-        voucher_id = ids and ids[0] or False
-        search_type = 'credit'
-        account_type = False
-        if ttype == 'receipt':
-            search_type = 'debit'
-            account_type = 'receivable'
-        elif ttype == 'payment':
-            search_type = 'credit'
-            account_type = 'payable'
 
-        ids = move_line_pool.search(cr, uid, [('account_id.type','=', account_type), ('reconcile_id','=', False), ('partner_id','=',partner_id), (search_type,'>',0)], context=context)
-        total = 0.0
-        for line in move_line_pool.browse(cr, uid, ids):
-            amount = 0.0
-            rs = move_line_pool.default_get(cr, uid, move_line_pool._columns.keys(), context=context)
-            rs.update({
+        ids = move_line_pool.search(cr, uid, [('account_id.type','in', ('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',partner_id)], context=context)
+        moves = move_line_pool.browse(cr, uid, ids)
+        total_credit = price or 0.0
+        total_debit = 0.0
+        for line in moves:
+            if line.credit and line.reconcile_partial_id:
+                continue
+            total_credit += line.credit or 0.0
+            total_debit += line.debit or 0.0
+        for line in moves:
+            if line.credit and line.reconcile_partial_id:
+                continue
+            rs = {
                 'name':line.move_id.name,
-                'ref':line.ref or '/',
-                'move_id':line.move_id.id,
+                'type': line.credit and 'dr' or 'cr',
                 'move_line_id':line.id,
-                'voucher_id':voucher_id,
-                'amount':amount,
-            })
-            
-            if ttype == 'payment':
-                rs.update({
-                    'account_id':line.account_id, #line.move_id.partner_id.property_account_payable.id,
-                    #'amount':line.credit
-                })
-                amount = line.credit
-            elif ttype == 'receipt':
-                rs.update({
-                    'account_id':line.move_id.partner_id.property_account_receivable.id,
-                    #'amount':line.debit
-                })
-                amount = line.debit
+                'account_id':line.account_id.id,
+                'amount_original':line.credit or line.debit or 0.0,
+                'date_original':line.date,
+                'date_due':line.date_maturity,
+                'amount_unreconciled': line.amount_unreconciled
+            }
+            if line.credit:
+                rs['amount'] = min(line.amount_unreconciled, total_debit)
+                total_debit -= rs['amount']
+            else:
+                rs['amount'] = min(line.debit, total_credit)
+                total_credit -= rs['amount']
 
-            total += amount
-            line_id = line_pool.create(cr, uid, rs, context=context)
-            res += [line_id]
+            default['value']['line_ids'].append(rs)
+            if rs['type'] == 'cr':
+                default['value']['line_cr_ids'].append(rs)
+            else:
+                default['value']['line_dr_ids'].append(rs)
+                default['value']['pre_line'] = 1
+
+        return default
 
-        res = {
-            'payment_ids':res, 
-            'account_id':account_id, 
-            'amount':total
-        }
-        return {
-            'value':res,
-            'context':context,
-        }
-    
     def onchange_date(self, cr, user, ids, date, context={}):
         """
-        Returns a dict that contains new values and context
-        @param cr: A database cursor
-        @param user: ID of the user currently logged in
         @param date: latest value from user input for field date
         @param args: other arguments
         @param context: context arguments, like lang, time zone
         @return: Returns a dict which contains new values, and context
         """
-        res = {}
         period_pool = self.pool.get('account.period')
         pids = period_pool.search(cr, user, [('date_start','<=',date), ('date_stop','>=',date)])
-        if pids:
-            res.update({
-                'period_id':pids[0]
-            })
-            context.update({
-                'period_id':pids[0]
-            })
+        if not pids:
+            return {}
         return {
-            'value':res,
-            'context':context,
-        }
-    
-    def onchange_journal(self, cr, uid, ids, journal_id, ttype):
-        res = {}
-
-        if not journal_id:
-            return {
-                'value':res
+            'value':{
+                'period_id':pids[0]
             }
-        journal_pool = self.pool.get('account.journal')
-        journal = journal_pool.browse(cr, uid, journal_id)
-
-        if journal.type in ('sale', 'purchase') and not ttype:
-            res.update({
-                'type':journal.type
-            })
-
-        return {
-            'value':res
         }
 
-    def voucher_recheck(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state':'recheck'}, context)
-        return True
+    # TODO
+    def onchange_journal(self, cr, uid, ids, journal_id):
+        return {}
 
     def proforma_voucher(self, cr, uid, ids, context={}):
         self.action_move_line_create(cr, uid, ids)
-        #self.write(cr, uid, ids, )
         return True
 
     def action_cancel_draft(self, cr, uid, ids, context={}):
@@ -514,12 +314,10 @@ class account_voucher(osv.osv):
     def cancel_voucher(self, cr, uid, ids, context={}):
         move_pool = self.pool.get('account.move')
         voucher_line_pool = self.pool.get('account.voucher.line')
-
         for voucher in self.browse(cr, uid, ids):
             if voucher.move_id:
                 move_pool.button_cancel(cr, uid, [voucher.move_id.id])
                 move_pool.unlink(cr, uid, [voucher.move_id.id])
-
         res = {
             'state':'cancel',
             'move_id':False,
@@ -528,21 +326,18 @@ class account_voucher(osv.osv):
         return True
 
     def unlink(self, cr, uid, ids, context=None):
-        vouchers = self.read(cr, uid, ids, ['state'])
-        unlink_ids = []
-        for t in vouchers:
-            if t['state'] in ('draft', 'cancel'):
-                unlink_ids.append(t['id'])
-            else:
-                raise osv.except_osv('Invalid action !', 'Cannot delete Voucher(s) which are already opened or paid !')
-        return super(account_voucher, self).unlink(cr, uid, unlink_ids, context=context)
+        for t in self.read(cr, uid, ids, ['state'], context=context):
+            if t['state'] not in ('draft', 'cancel'):
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Voucher(s) which are already opened or paid !'))
+        return super(account_voucher, self).unlink(cr, uid, ids, context=context)
 
-    def onchange_payment(self, cr, uid, ids, pay_now, journal_id, partner_id, ttype):
+    # TODO
+    def onchange_payment(self, cr, uid, ids, pay_now, journal_id, partner_id, ttype='sale'):
+        if not partner_id:
+            return {}
         partner_pool = self.pool.get('res.partner')
-
         res = {'account_id':False}
-        
-        if pay_now == 'pay_later' and ttype in ('sale', 'purchase'):
+        if pay_now == 'pay_later':
             partner = partner_pool.browse(cr, uid, partner_id)
             if ttype == 'sale':
                 res.update({
@@ -552,15 +347,11 @@ class account_voucher(osv.osv):
                 res.update({
                     'account_id':partner.property_account_payable.id,
                 })
-        
         return {
             'value':res
         }
-        
+
     def action_move_line_create(self, cr, uid, ids, *args):
-    
-        journal_pool = self.pool.get('account.journal')
-        sequence_pool = self.pool.get('ir.sequence')
         move_pool = self.pool.get('account.move')
         move_line_pool = self.pool.get('account.move.line')
         analytic_pool = self.pool.get('account.analytic.line')
@@ -568,222 +359,148 @@ class account_voucher(osv.osv):
         invoice_pool = self.pool.get('account.invoice')
         
         for inv in self.browse(cr, uid, ids):
-        
             if inv.move_id:
                 continue
 
-            if not inv.payment_ids:
-                raise osv.except_osv(_('Error !'), _('Please define lines on voucher !'))
-            
-            journal = journal_pool.browse(cr, uid, inv.journal_id.id)
-            if journal.sequence_id:
-                name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
+            if not inv.line_ids:
+                raise osv.except_osv(_('Error !'), _('You can not validate a voucher without lines !'))
+
+            if inv.journal_id.sequence_id:
+                name = self.pool.get('ir.sequence').get_id(cr, uid, inv.journal_id.sequence_id.id)
             else:
-                raise osv.except_osv(_('Error !'), _('Please define sequence on journal !'))
-            
-            ref = False
-            if inv.type in ('purchase', 'receipt'):
-                ref = inv.reference
-            else:
-                ref = invoice_pool._convert_ref(cr, uid, name)
-            
-            company_currency = inv.company_id.currency_id.id
-            diff_currency_p = inv.currency_id.id <> company_currency
+                raise osv.except_osv(_('Error !'), _('Please define a sequence on the journal !'))
 
             move = {
                 'name' : name,
-                'journal_id': journal.id,
-                'type' : inv.type,
-                'narration' : inv.narration and inv.narration or inv.name,
+                'journal_id': inv.journal_id.id,
+                'narration' : inv.narration,
                 'date':inv.date,
-                'ref':ref
+                'ref':inv.reference,
+                'period_id': inv.period_id and inv.period_id.id or False
             }
-            
-            if inv.period_id:
-                move.update({
-                    'period_id': inv.period_id.id
-                })
-            
             move_id = move_pool.create(cr, uid, move)
+            company_currency = inv.account_id.company_id.currency_id.id
 
             #create the first line manually
+            debit = 0.0
+            credit = 0.0
+            # TODO: to improve to select debit or credit
+            if True:
+                debit = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount)
             move_line = {
-                'name':inv.name and inv.name or '/',
-                'debit':False,
-                'credit':False,
+                'name':inv.name or '/',
+                'debit':debit,
+                'credit':credit,
                 'account_id':inv.account_id.id,
                 'move_id':move_id ,
                 'journal_id':inv.journal_id.id,
                 'period_id':inv.period_id.id,
                 'partner_id':inv.partner_id.id,
-                'ref':ref,
+                'currency_id':inv.currency_id.id,
                 'date':inv.date
             }
-            
-            if diff_currency_p:
-                amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount)
-                inv.amount = amount_currency
-                move_line.update({
-                    'amount_currency':amount_currency,
-                    'currency_id':inv.currency_id.id
-                })
-            
-            total_amount = inv.amount
-            if inv.type in ('sale', 'receipt'):
-                move_line.update({
-                    'debit':total_amount
-                })
-            elif inv.type == 'purchase':
-                move_line.update({
-                    'credit':total_amount
-                })
 
-            line_ids = []
-            
             master_line = move_line_pool.create(cr, uid, move_line)
-            line_ids += [master_line]
+
             rec_list_ids = []
-            line_total = 0.0
+            line_total = debit - credit
+            for line in inv.line_ids:
+                if not line.amount:
+                    continue
+                amount = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, line.amount)
+                move_line = {
+                    'name':line.name and line.name or '/',
+                    'account_id':line.account_id.id,
+                    'move_id':move_id,
+                    'partner_id':inv.partner_id.id,
+                    'currency_id':inv.currency_id.id,
+                }
+                if (line.type=='dr'):
+                    line_total += amount
+                    move_line['debit'] = amount
+                else:
+                    line_total -= amount
+                    move_line['credit'] = amount
+
+                master_line = move_line_pool.create(cr, uid, move_line)
+                if line.move_line_id.id:
+                    rec_ids = [master_line, line.move_line_id.id]
+                    rec_list_ids.append(rec_ids)
+
+            if inv.tax_amount > 0:
+                amount = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.tax_amount)
+                name = inv.tax_id and inv.tax_id.name or '/'
+                move_line = {
+                    'name':name,
+                    'move_id':move_id ,
+                    'journal_id':inv.journal_id.id,
+                    'period_id':inv.period_id.id,
+                    'partner_id':inv.partner_id.id,
+                    'currency_id':inv.currency_id.id,
+                }
+
+                if inv.journal_id.type in ('sale','purchase_refund'):
+                    line_total -= amount
+                    move_line['credit'] = amount
+                else:
+                    line_total += amount
+                    move_line['debit'] = amount
+
+                account_id = False
+                if inv.tax_id:
+                    if inv.journal_id.type in ('sale_refund','purchase_refund'):
+                        account_id = inv.tax_id.account_paid_id
+                    else:
+                        account_id = inv.tax_id.account_collected_id.id
+                if not account_id:
+                    raise osv.except_osv(_('Invalid Error !'), _('No account defined on the related tax !'))
+                move_line['account_id'] = account_id
+
+                move_line_id = move_line_pool.create(cr, uid, move_line)
             
-            for line in inv.payment_ids:
-                rec_ids = []
-                amount=0.0
-
-                if inv.type in ('payment'):
-                    ref = line.ref
-                
-                move_line = {
-                     'name':line.name and line.name or '/',
-                     'debit':False,
-                     'credit':False,
-                     'account_id':line.account_id.id or False,
-                     'move_id':move_id ,
-                     'journal_id':inv.journal_id.id,
-                     'period_id':inv.period_id.id,
-                     'partner_id':line.partner_id.id or False,
-                     'ref':ref,
-                     'date':inv.date,
-                     'analytic_account_id':False
-                }
-                
-                if diff_currency_p:
-                    amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, line.amount)
-                    line.amount = amount_currency
-                    move_line.update({
-                        'amount_currency':amount_currency,
-                        'currency_id':inv.currency_id.id
-                    })
-                
-                if line.account_analytic_id:
-                    move_line.update({
-                        'analytic_account_id':line.account_analytic_id.id
-                    })
-
-                line_total += line.amount
-                if inv.type in ('sale', 'receipt'):
-                    move_line.update({
-                        'credit': line.amount or False
-                    })
-
-                if inv.type in ('purchase'):
-                    move_line.update({
-                        'debit': line.amount or False
-                    })
-
-                move_line_id = move_line_pool.create(cr, uid, move_line)
-                line_ids += [move_line_id]
-
-                if inv.type in ('payment', 'receipt') and line.move_id:
-                    rec_ids += [move_line_id]
-                    if line.move_line_id:
-                        rec_ids += [line.move_line_id.id]
-                    
-                    if rec_ids:
-                        rec_list_ids.append(rec_ids)
-
-            if inv.type in ('sale', 'purchase') and inv.tax_amount > 0:
-                name = '/'
-                if not inv.tax_id:
-                    name = inv.tax_id.name
+            if not self.pool.get('res.currency').is_zero(cr, uid, inv.currency_id, line_total):
+                diff = line_total
                 move_line = {
                     'name':name,
                     'account_id':False,
                     'move_id':move_id ,
-                    'journal_id':inv.journal_id.id,
-                    'period_id':inv.period_id.id,
                     'partner_id':inv.partner_id.id,
-                    'ref':ref,
-                    'date':inv.date
+                    'date':inv.date,
+                    'credit':diff>0 and diff or 0.0,
+                    'debit':diff<0 and -diff or 0.0,
                 }
                 account_id = False
-                if inv.tax_id and inv.tax_id.account_collected_id:
-                    account_id = inv.tax_id.account_collected_id.id
-                    
-                if inv.type == 'sale':
-                    move_line.update({
-                        'credit':inv.tax_amount,
-                        'account_id':account_id and account_id or inv.journal_id.default_credit_account_id.id
-                    })
-
-                elif inv.type == 'purchase':
-                    move_line.update({
-                        'debit':inv.tax_amount,
-                        'account_id':account_id and account_id or inv.journal_id.default_debit_account_id.id
-                    })
-
+                if inv.journal_id.type in ('sale','sale_refund', 'cash','bank'):
+                    account_id = inv.partner_id.property_account_receivable.id
+                else:
+                    account_id = inv.partner_id.property_account_payable.id
+                move_line['account_id'] = account_id
                 move_line_id = move_line_pool.create(cr, uid, move_line)
-                line_ids += [move_line_id]
 
-            if line_total != inv.amount and inv.type in ('payment', 'receipt'):
-                name = '/'
-
-                move_line = {
-                    'name':name,
-                    'account_id':False,
-                    'move_id':move_id ,
-                    'journal_id':inv.journal_id.id,
-                    'period_id':inv.period_id.id,
-                    'partner_id':inv.partner_id.id,
-                    'ref':ref,
-                    'date':inv.date
-                }
-                account_id = False
-                
-            rec = {
+            self.write(cr, uid, [inv.id], {
                 'move_id': move_id,
                 'state':'posted'
-            }
-            
-            self.write(cr, uid, [inv.id], rec)
+            })
             move_pool.post(cr, uid, [move_id], context={})
             for rec_ids in rec_list_ids:
-                move_line_pool.reconcile_partial(cr, uid, rec_ids)
-
-            inv = self.browse(cr, uid, inv.id)
-            name = inv.name and inv.name or inv.number
-            message = _('Voucher ') + " '" + str(name) + "' "+ _("is confirm")
-            self.log(cr, uid, inv.id, message)
+                if len(rec_ids) >= 2:
+                    move_line_pool.reconcile_partial(cr, uid, rec_ids)
         return True
 
-    def _convert_ref(self, cr, uid, ref):
-        return (ref or '').replace('/','')
-
     def copy(self, cr, uid, id, default={}, context=None):
-        res = {
+        default.update({
             'state':'draft',
             'number':False,
             'move_id':False
-        }
-        default.update(res)
+        })
         if 'date' not in default:
             default['date'] = time.strftime('%Y-%m-%d')
         return super(account_voucher, self).copy(cr, uid, id, default, context)
-    
+
+    # TODO
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """
         Returns views and fields for current model where view will depend on {view_type}.
-        @param cr: A database cursor
-        @param user: ID of the user currently logged in
         @param view_id: list of fields, which required to read signatures
         @param view_type: defines a view type. it can be one of (form, tree, graph, calender, gantt, search, mdx)
         @param context: context arguments, like lang, time zone
@@ -793,14 +510,12 @@ class account_voucher(osv.osv):
         """
         data_pool = self.pool.get('ir.model.data')
         journal_pool = self.pool.get('account.journal')
-        
         voucher_type = {
             'sale':'view_sale_receipt_form',
             'purchase':'view_purchase_receipt_form',
             'payment':'view_vendor_payment_form',
             'receipt':'view_vendor_receipt_form'
         }
-
         if view_type == 'form':
             tview = voucher_type.get(context.get('type'))
             result = data_pool._get_id(cr, uid, 'account_voucher', tview)
@@ -812,45 +527,47 @@ class account_voucher(osv.osv):
         if view_type == 'search':
             journal_list = journal_pool.name_search(cr, uid, '', [], context=context)
             res['fields']['journal_id']['selection'] = journal_list
-        
         return res
 
 account_voucher()
 
 class account_voucher_line(osv.osv):
     _name = 'account.voucher.line'
-    _description = 'Voucher Line'
+    _description = 'Voucher Lines'
+    def _compute_balance(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for line in self.browse(cr, uid, ids):
+            move_line = line.move_line_id or False
+            if not move_line:
+                res[line.id] = 0.0
+            elif move_line and move_line.credit > 0:
+                res[line.id] = move_line.credit
+            else:
+                res[line.id] = move_line.debit
+        return res
 
     _columns = {
-        'voucher_id':fields.many2one('account.voucher', 'Voucher'),
+        'voucher_id':fields.many2one('account.voucher', 'Voucher', required=1),
         'name':fields.char('Description', size=256),
         'account_id':fields.many2one('account.account','Account', required=True, domain=[('type','<>','view')]),
         'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
         'amount':fields.float('Amount'),
-#        'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Cr/Dr'),
-        'ref':fields.char('Reference', size=32),
+        'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Cr/Dr'),
         'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account'),
-        'stype':fields.selection([('service','Service'),('other','Other')], 'Product Type'),
         '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_original': fields.date('Date', readonly="1"), #fields.related account.move.line
-        'date_due': fields.related('move_line_id','date_maturity', type='date', relation='account.move.line', string='Due Date', readonly="1"),
-#        'date_due': fields.date('Due Date', readonly="1"), #fields.related account.move.line
-        'amount_original': fields.float('Originial Amount', readonly="1"), #fields.related account.move.line
-        'amount_unreconciled': fields.related('move_line_id','balance', type='float', relation='account.move.line', string='Open Balance', readonly="1"),
-#        'amount_unreconciled': fields.float('Open Balance', readonly="1"), #fields.related account.move.line
-        'move_id' : fields.many2one('account.move','Bill / Invoice'),
+        '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, type='float', string='Originial Amount', store=True),
+        'amount_unreconciled': fields.related('move_line_id','amount_unreconciled', type='float', relation='account.move.line', string='Open Balance', readonly="1"),
     }
     _defaults = {
-        'name': lambda *a: '/'
+        'name': lambda *a: ''
     }
 
     def onchange_move_line_id(self, cr, user, ids, move_line_id, context={}):
         """
         Returns a dict that contains new values and context
 
-        @param cr: A database cursor
-        @param user: ID of the user currently logged in
         @param move_line_id: latest value from user input for field move_line_id
         @param args: other arguments
         @param context: context arguments, like lang, time zone
@@ -860,63 +577,51 @@ class account_voucher_line(osv.osv):
         res = {}
         move_line_pool = self.pool.get('account.move.line')
         if move_line_id:
-            move_line = move_line_pool.browse(cr, user, move_line_id)
-
+            move_line = move_line_pool.browse(cr, user, move_line_id, context=context)
             move_id = move_line.move_id.id
-            amount = move_line.credit and move_line.credit or move_line.debit
+            if move_line.credit:
+                ttype='dr'
+                amount = move_line.credit
+            else:
+                ttype='cr'
+                amount = move_line.debit
             account_id = move_line.account_id.id
-
             res.update({
-                'move_id':move_id,
-                'amount':amount,
-                'account_id':account_id
-            })
-            context.update({
-                'journal_id':move_line.journal_id.id,
-                'partner_id':move_line.partner_id.id,
-                'account_id':account_id
+                'account_id':account_id,
+                'type': ttype
             })
         return {
             'value':res,
-            'context':context,
         }
-    
+
     def default_get(self, cr, user, fields_list, context=None):
         """
         Returns default values for fields
-        @param cr: A database cursor
-        @param user: ID of the user currently logged in
         @param fields_list: list of fields, for which default values are required to be read 
         @param context: context arguments, like lang, time zone
         
         @return: Returns a dict that contains default values for fields
         """
+        journal_id = context.get('journal_id', False)
+        partner_id = context.get('partner_id', False)
         journal_pool = self.pool.get('account.journal')
         partner_pool = self.pool.get('res.partner')
-        account_id = False
-
         values = super(account_voucher_line, self).default_get(cr, user, fields_list, context=context)
-        journal_id = context.get('journal_id', False)
-        ttype = context.get('type', False)
-        partner_id = context.get('partner_id', False)
-        
-        if ttype and journal_id and ttype in ('sale', 'purchase'):
-            journal = journal_pool.browse(cr, user, journal_id)
-            if ttype == 'sale' and journal:
-                account_id = journal.default_credit_account_id and journal.default_credit_account_id.id or False
-            elif ttype == 'purchase' and journal:
-                account_id = journal.default_credit_account_id and journal.default_debit_account_id.id or False
-        elif  ttype and partner_id and ttype in ('payment', 'receipt'):
-            partner = partner_pool.browse(cr, user, partner_id)
-            if ttype == 'receipt' and partner:
-                account_id = partner.property_account_receivable and partner.property_account_receivable.id or False
-            elif ttype == 'payment' and partner:
-                account_id = partner.property_account_receivable and partner.property_account_payable.id or False
+        if (not journal_id) or ('account_id' not in fields_list):
+            return values
+        journal = journal_pool.browse(cr, user, journal_id)
+        account_id = False
+        if journal.type in ('sale', 'purchase_refund'):
+            account_id = journal.default_credit_account_id and journal.default_credit_account_id.id or False
+        elif journal.type in ('purchase', 'expense', 'sale_refund'):
+            account_id = journal.default_debit_account_id and journal.default_debit_account_id.id or False
+        elif partner_id:
+            account_id = partner_pool.browse(cr, user, partner_id, context=context).property_account_receivable.id
 
-        if not account_id:
+        if (not account_id) and 'account_id' in fields_list:
             raise osv.except_osv(_('Invalid Error !'), _('Please change partner and try again !'))
         values.update({
-            'account_id':account_id
+            'account_id':account_id,
         })
         return values
 account_voucher_line()
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 06d77904dba..f0bebc49d2c 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -16,7 +16,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Payment Information">
-                            <field name="payment_ids" on_change="onchange_price(payment_ids, False, False)" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
+                            <field name="line_ids" on_change="onchange_price(line_ids, False, False)" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
                                 <tree string="Payment Lines" editable="bottom">
                                     <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
                                     <field name="amount"/>
@@ -50,8 +50,7 @@
                     <group col="10" colspan="4">
                         <field name="state"/>
                         <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
-                        <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  icon="gtk-cancel"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                         <button name="%(action_view_account_voucher_unreconcile)d" string="Unreconcile" type="action" states="posted" icon="terp-stock_effects-object-colorize"/>
                     </group>
@@ -78,13 +77,13 @@
             <field name="arch" type="xml">
                 <form string="Sales Payment">
                     <group col="6" colspan="4">
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type, journal_id)" string="Customer"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, journal_id, amount)" string="Customer"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             widget="selection" select="1"
-                            on_change="onchange_journal(journal_id,type)"
+                            on_change="onchange_partner_id(partner_id, journal_id, amount)"
                             string="Payment Method"/>
-                        <field name="amount"/>
+                        <field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount)"/>
                         <field name="reference" select="1" string="Payment Ref"/>
                         <field name="name" colspan="4"/>
                         <field name="account_id"
@@ -92,18 +91,30 @@
                             widget="selection"
                             on_change="onchange_account(account_id)"
                             invisible="True"/>
+                        <field name="pre_line" invisible="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Payment Information">
-<!--                            <field name="payment_ids" on_change="onchange_price(payment_ids, 0.0, False)" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">-->
-                            <field name="payment_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
-                                <tree string="Payment Lines" editable="bottom">
-                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'type':parent.type, 'partner_id':parent.partner_id}" on_change="onchange_move_line_id(move_line_id)" domain="[('account_id.type','=','receivable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id), ('debit','>',0)]"/>
+                            <field name="line_cr_ids" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
+                                <tree string="Invoices and outstanding payments" editable="bottom">
+                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                                        on_change="onchange_move_line_id(move_line_id)"
+                                        domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                        />
+                                    <field name="account_id"  domain="[('type','=','receivable')]"/>
+                                    <field name="date_original" readonly="1"/>
+                                    <field name="date_due" readonly="1"/>
+                                    <field name="amount_original" readonly="1"/>
+                                    <field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
+                                    <field name="amount" sum="Payment"/>
+                                </tree>
+                            </field>
+                            <field name="line_dr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}">
+                                <tree string="Credits" editable="bottom">
+                                    <field name="move_line_id"/>
                                     <field name="account_id"  domain="[('type','=','receivable')]"/>
                                     <field name="date_original"/>
-                                    <field name="date_due"/>
                                     <field name="amount_original"/>
-                                    <field name="amount_unreconciled" sum="Open Balance"/>
                                     <field name="amount" sum="Payment"/>
                                 </tree>
                             </field>
@@ -114,10 +125,8 @@
                             <group col="2" colspan="1">
                                 <separator string="Other Information" colspan="2"/>
                                 <field name="date" select="1" on_change="onchange_date(date)"/>
-                                <field name="currency_id" select="1"
-                                    attrs="{'readonly':[('type','in',['sale', 'purchase'])]}"/>
+                                <field name="currency_id" select="1"/>
                                 <field name="number"/>
-                                <field name="type" on_change="onchange_journal(journal_id,type)" invisible="1"/>
                             </group>
                         </page>
                         <page string="Journal Items" groups="base.group_extended">
@@ -133,8 +142,7 @@
                     <group col="10" colspan="4">
                         <field name="state"/>
                         <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
-                        <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  icon="gtk-cancel"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                         <button name="%(action_view_account_voucher_unreconcile)d" string="Unreconcile" type="action" states="posted" icon="terp-stock_effects-object-colorize"/>
                     </group>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index f049524d5b6..09ff786e94d 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -8,18 +8,17 @@
             <field name="arch" type="xml">
                 <form string="Sales Receipt">
                     <group col="6" colspan="4">
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type, journal_id)" string="Customer"/>
-                        <field name="journal_id"  domain="[('type','=','sale')]" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, journal_id)" string="Customer"/>
+                        <field name="journal_id"  domain="[('type','=','sale')]" widget="selection" on_change="onchange_journal(journal_id)"/>
                         <field name="number"/>
                         <field name="name" colspan="4"/>
-                        <field name="date" select="1" on_change="onchange_date(date)"/>
-                        <field name="type" on_change="onchange_journal(journal_id,type)" invisible="True"/> <!-- Type is given by menu, not by journal ? yes-->
+                        <field name="date" on_change="onchange_date(date)"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Sales Information">
-                            <field name="payment_ids" on_change="onchange_price(payment_ids, tax_id, parent.partner_id)" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
+                            <field name="line_ids" on_change="onchange_price(line_ids, tax_id, parent.partner_id)" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
                                 <tree string="Sales Lines" editable="bottom">
-                                    <field name="account_id" domain="[('user_type_type','=','income')]" widget="selection"/>
+                                    <field name="account_id" domain="[('user_type.report_type','=','income')]" widget="selection"/>
                                     <field name="name"/>
                                     <field name="amount" sum="Total"/>
                                     <field name="account_analytic_id" groups="base.group_extended"/>
@@ -32,10 +31,10 @@
                             <group col="2" colspan="1">
                                 <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>
-                                    <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id, type)" required="1"/>
+                                    <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
                                     <field name="account_id" 
-                                         attrs="{'invisible':[('type','!=','view'),('pay_now','!=','pay_now')]}"
-                                          domain="[('user_type_type','=','asset'), ('type','!=','view')]"/>
+                                         attrs="{'invisible':[('pay_now','!=','pay_now')]}"
+                                          domain="[('user_type.report_type','=','asset')]"/>
                                          <!-- should select income accounts only. Or use the journal for this ? -->
                                     <field name="reference"
                                          attrs="{'invisible':[('pay_now','!=','pay_now')]}"
@@ -43,8 +42,8 @@
                                 </group>
                                 <group col="3" colspan="1">
                                     <separator string="Total" colspan="3"/>
-                                    <field name="tax_id" on_change="onchange_price(payment_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all'))]"/><field name="tax_amount" on_change="onchange_price(payment_ids, tax_id, partner_id)" nolabel="1"/>
-                                    <field name="amount" string="Total"/><button icon="terp-stock_format-scientific" name="compute_tax" attrs="{'invisible':[('state','!=','draft')]}" colspan="1" string="Compute TAX" type="object"/>
+                                    <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all'))]"/><field name="tax_amount" on_change="onchange_price(line_ids, tax_id, partner_id)" nolabel="1"/>
+                                    <label colspan="1" string=""/><field name="amount" string="Total"/>
                                 </group>
                             </group>
                         </page>
@@ -60,9 +59,8 @@
                     </notebook>
                     <group col="10" colspan="4">
                         <field name="state"/>
-                        <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
-                        <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  icon="gtk-cancel"/>
+                        <button name="proforma_voucher" string="Post" states="draft" icon="terp-document-new"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                         <button name="%(action_view_account_voucher_unreconcile)d" string="Cancel" type="action" states="posted" icon="terp-stock_effects-object-colorize"/>
                     </group>
@@ -99,12 +97,12 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Bill Information">
-                            <field name="payment_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
+                            <field name="line_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
                                 <tree string="Voucher Lines" editable="bottom">
                                     <field name="stype" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
                                     <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
                                     <field name="amount"/>
-                                    <field name="account_id" domain="[('user_type_type','=','expense'), ('type','!=','view')]"/>
+                                    <field name="account_id" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"/>
                                     <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
                                     <field name="account_analytic_id"/>
                                 </tree>
@@ -133,8 +131,7 @@
                     <group col="10" colspan="4">
                         <field name="state"/>
                         <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
-                        <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  icon="gtk-cancel"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                         <button name="%(action_view_account_voucher_unreconcile)d" string="Cancel" type="action" states="posted" icon="terp-stock_effects-object-colorize"/>
                     </group>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index fd9ecc6c806..4dcb371104d 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -6,19 +6,16 @@
             <field name="model">account.voucher</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open','proforma','posted','recheck','audit')" string="Voucher Entries">
+                <tree colors="blue:state in ('draft');gray:state in ('cancel')" string="Voucher Entries">
                     <field name="date"/>
                     <field name="number"/>
                     <field name="reference"/>
                     <field name="partner_id"/>
                     <field name="journal_id"/>
-                    <field name="account_id"/>
+                    <field name="period_id" invisible="context.get('visible', False)"/>
                     <field name="amount" sum="Total Amount"/>
-                    <field name="period_id"/>
                     <field name="state"/>
-                    <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
-                    <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
-                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                    <button name="proforma_voucher" string="Post" states="draft" icon="terp-document-new"/>
                 </tree>
             </field>
         </record>
@@ -38,7 +35,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Voucher Entry">
-                            <field name="payment_ids" colspan="4" nolabel="1" height="180">
+                            <field name="line_ids" colspan="4" nolabel="1" height="180">
                                 <tree string="Voucher Lines" editable="top">
                                     <field name="name" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
                                     <field name="account_id"/>
@@ -82,8 +79,7 @@
                     <group col="10" colspan="4">
                         <field name="state"/>
                         <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
-                        <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  icon="gtk-cancel"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </form>
@@ -131,6 +127,7 @@
                 </search>
             </field>
         </record>
+
         <record id="view_voucher_filter_new" model="ir.ui.view">
             <field name="name">account.voucher.select</field>
             <field name="model">account.voucher</field>
@@ -139,16 +136,14 @@
                 <search string="Search Vouchers">
                     <group col='8' colspan='4'>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
-                        <filter icon="terp-check" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
                         <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
-                        <field name="number" select='1'/>
-                        <field name="account_id" select="1"/>
-                        <field name="partner_id" select='1'/>
                         <field name="date" select='1'/>
+                        <field name="number" select='1'/>
+                        <field name="partner_id" select='1'/>
                     </group>
                     <newline/>
                     <group col='8' colspan='4'>
@@ -159,8 +154,7 @@
                     <group expand="0" string="Group By..." colspan="12" col="10">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
                         <filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                     <newline/>
@@ -197,18 +191,6 @@
         </record>
         <menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6"/>
 
-        <record model="ir.ui.view" id="view_account_journal_form_inherit">
-            <field name="name">account.journal.form.inherit</field>
-            <field name="model">account.journal</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_journal_form"/>
-            <field name="arch" type="xml">
-                <field name="allow_date" position="after">
-                    <field name="max_amount" select="1"/>
-                </field>
-            </field>
-        </record>
-
         <act_window
             domain="[('journal_id','=',active_id)]"
             id="act_journal_voucher_open"
diff --git a/addons/account_voucher/voucher_workflow.xml b/addons/account_voucher/voucher_workflow.xml
index 9c4f2d15e71..aabf239366c 100644
--- a/addons/account_voucher/voucher_workflow.xml
+++ b/addons/account_voucher/voucher_workflow.xml
@@ -49,7 +49,6 @@
 <!--            <field name="act_from" ref="act_proforma"/>-->
 <!--            <field name="act_to" ref="act_recheck"/>-->
 <!--            <field name="signal">proforma_voucher</field>-->
-<!--            <field name="condition">amount &gt; journal_id.max_amount</field>-->
 <!--        </record>-->
 <!--        -->
 <!--        <record id="t4" model="workflow.transition">-->
diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po
index 3035a37b52f..b789cd2f733 100644
--- a/addons/analytic_journal_billing_rate/i18n/tr.po
+++ b/addons/analytic_journal_billing_rate/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:57+0000\n"
+"PO-Revision-Date: 2010-08-25 07:28+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po
index dd1ab6308f4..d0d5de89023 100644
--- a/addons/analytic_user_function/i18n/tr.po
+++ b/addons/analytic_user_function/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:02+0000\n"
+"PO-Revision-Date: 2010-08-25 06:01+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/auction/i18n/lt.po b/addons/auction/i18n/lt.po
index 8d60d936bbb..6049a1623c8 100644
--- a/addons/auction/i18n/lt.po
+++ b/addons/auction/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:05+0000\n"
+"PO-Revision-Date: 2010-08-25 06:08+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/nl.po b/addons/auction/i18n/nl.po
index 81207fc9bde..4de273999a5 100644
--- a/addons/auction/i18n/nl.po
+++ b/addons/auction/i18n/nl.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:07+0000\n"
+"PO-Revision-Date: 2010-08-25 07:52+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/tr.po b/addons/auction/i18n/tr.po
index 8462a5c9d22..63c637b7d63 100644
--- a/addons/auction/i18n/tr.po
+++ b/addons/auction/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:57+0000\n"
+"PO-Revision-Date: 2010-08-25 07:28+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/audittrail/i18n/lt.po b/addons/audittrail/i18n/lt.po
index cfa24201815..7300aaeb761 100644
--- a/addons/audittrail/i18n/lt.po
+++ b/addons/audittrail/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:11+0000\n"
+"PO-Revision-Date: 2010-08-25 08:04+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/tr.po b/addons/audittrail/i18n/tr.po
index 2b93ff7d748..eb0416ca084 100644
--- a/addons/audittrail/i18n/tr.po
+++ b/addons/audittrail/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:56+0000\n"
+"PO-Revision-Date: 2010-08-25 07:26+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index 86d16c4a049..8571129abc4 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/i18n/zh_CN.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:57+0000\n"
+"PO-Revision-Date: 2010-08-25 07:27+0000\n"
 "Last-Translator: Black Jack <onetimespeed@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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/base_contact/i18n/lt.po b/addons/base_contact/i18n/lt.po
index 897ea340724..e4b3144be1a 100644
--- a/addons/base_contact/i18n/lt.po
+++ b/addons/base_contact/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:05+0000\n"
+"PO-Revision-Date: 2010-08-25 07:45+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
diff --git a/addons/base_contact/i18n/tr.po b/addons/base_contact/i18n/tr.po
index 3badf77d8c3..40f009508ac 100644
--- a/addons/base_contact/i18n/tr.po
+++ b/addons/base_contact/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:11+0000\n"
+"PO-Revision-Date: 2010-08-25 08:03+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/zh_CN.po b/addons/base_contact/i18n/zh_CN.po
index 85811d5b3ff..051302f693c 100644
--- a/addons/base_contact/i18n/zh_CN.po
+++ b/addons/base_contact/i18n/zh_CN.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:09+0000\n"
+"PO-Revision-Date: 2010-08-25 07:58+0000\n"
 "Last-Translator: Black Jack <onetimespeed@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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_iban/i18n/tr.po b/addons/base_iban/i18n/tr.po
index 5f5747779e4..ae4230e6348 100644
--- a/addons/base_iban/i18n/tr.po
+++ b/addons/base_iban/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:09+0000\n"
+"PO-Revision-Date: 2010-08-25 07:58+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_module_quality/i18n/tr.po b/addons/base_module_quality/i18n/tr.po
index f830eff82ac..74f9138be0d 100644
--- a/addons/base_module_quality/i18n/tr.po
+++ b/addons/base_module_quality/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:06+0000\n"
+"PO-Revision-Date: 2010-08-25 06:11+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_record/i18n/tr.po b/addons/base_module_record/i18n/tr.po
index 93c33fe6321..adaa0439e3e 100644
--- a/addons/base_module_record/i18n/tr.po
+++ b/addons/base_module_record/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:56+0000\n"
+"PO-Revision-Date: 2010-08-25 07:26+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_report_creator/i18n/tr.po b/addons/base_report_creator/i18n/tr.po
index dc746f0133a..7b6c120c54b 100644
--- a/addons/base_report_creator/i18n/tr.po
+++ b/addons/base_report_creator/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:06+0000\n"
+"PO-Revision-Date: 2010-08-25 07:45+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po
index 7d03fc14700..88545111c1d 100644
--- a/addons/base_report_designer/i18n/tr.po
+++ b/addons/base_report_designer/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:01+0000\n"
+"PO-Revision-Date: 2010-08-25 07:36+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index 20bad828006..d2812bee612 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:06+0000\n"
+"PO-Revision-Date: 2010-08-25 07:49+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po
index 964f867c5cc..48e7b36bc7d 100644
--- a/addons/base_vat/i18n/tr.po
+++ b/addons/base_vat/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:07+0000\n"
+"PO-Revision-Date: 2010-08-25 07:53+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po
index 883b0b3eaa0..e31ebe54255 100644
--- a/addons/board/i18n/tr.po
+++ b/addons/board/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:06+0000\n"
+"PO-Revision-Date: 2010-08-25 07:49+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index cac0e6f3c3c..6c3c0d7a10d 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-24 06:02+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-25 18:50+0000\n"
+"Last-Translator: Heikki Kulhia <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -28,6 +28,8 @@ msgid ""
 "This property defines the list                 of date/time exceptions for "
 "arecurring calendar component."
 msgstr ""
+"Tämä ominaisuus määrittelee listan päivä/aika poikkeuksia toistuvissa "
+"kalenterin osissa."
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_user:0
@@ -97,7 +99,7 @@ msgstr "Vaiheen nimi"
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
 #: model:ir.ui.menu,name:crm.next_id_51
 msgid "Cases"
-msgstr "Tapahtumat"
+msgstr "Tapaukset"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
@@ -135,7 +137,7 @@ msgstr "Määrä"
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "Tavallinen- tai puhelinkokous mahdollisuudelle"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim2
@@ -191,6 +193,7 @@ msgid ""
 "Describes the action name.eg:on which object which ation to be taken on "
 "basis of which condition"
 msgstr ""
+"Kuvaa toiminnon nimen esim. riippuen kohteen toiminnoista ja olosuhteista"
 
 #. module: crm
 #: help:crm.case,section_id:0
@@ -198,6 +201,8 @@ msgid ""
 "Section to which Case belongs to. Define Responsible user and Email account "
 "for mail gateway."
 msgstr ""
+"Osio johon tapaus kuuluu. Määritä vastuuhenkilö ja sähköpostitili "
+"yhdyskäytävälle"
 
 #. module: crm
 #: view:crm.case:0
@@ -320,7 +325,7 @@ msgstr "Toinen haastattelu"
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_subscribe
 msgid "Subscribe to a Remote calendar"
-msgstr ""
+msgstr "Kirjaudu etäkalenteriin"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ-act
@@ -394,12 +399,12 @@ msgstr "Seuraava haastattelu"
 #. module: crm
 #: field:crm.case.rule,regex_history:0
 msgid "Regular Expression on Case History"
-msgstr ""
+msgstr "Säännöllinen lauseke tilannehistoriassa"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_email_add_cc
 msgid "Email Add CC"
-msgstr ""
+msgstr "Lisää sähköpostin vastaanottaja"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
@@ -938,6 +943,7 @@ msgid ""
 "Category related to the section.Subdivide the CRM cases independently or "
 "section-wise."
 msgstr ""
+"Tähän osioon liittyvä kategoria jakaa CRM-tapaukset yksittäin tai osioittain."
 
 #. module: crm
 #: field:crm.case.rule,act_state:0
diff --git a/addons/crm/i18n/hr.po b/addons/crm/i18n/hr.po
index 980c350c24e..c2c277685ee 100644
--- a/addons/crm/i18n/hr.po
+++ b/addons/crm/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-24 06:03+0000\n"
+"PO-Revision-Date: 2010-08-25 06:43+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index 675e1da669c..6b6faea036e 100644
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/i18n/lt.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: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-24 06:00+0000\n"
+"PO-Revision-Date: 2010-08-25 07:31+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index 1a0daeeedec..8a22c73cf24 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.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: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-24 06:04+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-25 19:54+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -43,7 +43,7 @@ msgstr "Tytuł"
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ2
 msgid "Cases by section and category2"
-msgstr "Sprawy wg sekcji i kategorii"
+msgstr "Sprawy wg sekcji i kategorii2"
 
 #. module: crm
 #: wizard_field:crm.lead.partner_create,init,close:0
@@ -71,7 +71,7 @@ msgstr "Wstrzymane prace"
 #. module: crm
 #: field:crm.case.rule,trg_state_to:0
 msgid "Button Pressed"
-msgstr "Naciśnięto przycisk"
+msgstr "Naciśnięcie przycisku"
 
 #. module: crm
 #: view:crm.case:0
@@ -110,7 +110,7 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_hr
 msgid "Human Resources"
-msgstr "Zasoby ludzkie"
+msgstr "Kadry"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2
@@ -351,7 +351,7 @@ msgstr "Daty"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Test"
-msgstr "Test Segmentacji"
+msgstr "Test segmentacji"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
@@ -373,7 +373,7 @@ msgstr "Nazwa kontaktu"
 #: selection:crm.lead.opportunity_set,create_partner,action:0
 #: selection:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Link to an existing partner"
-msgstr "Połączenie do istniejącego partnera"
+msgstr "Połączenie do utworzonego partnera"
 
 #. module: crm
 #: field:crm.case.rule,trg_date_range_type:0
@@ -403,7 +403,7 @@ msgstr "Wyrażenie regularne dla historii sprawy"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_email_add_cc
 msgid "Email Add CC"
-msgstr ""
+msgstr "DW w email"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
@@ -453,7 +453,7 @@ msgstr "Komunikacja"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(email_from)s = Partner email"
-msgstr ""
+msgstr "%(email_from)s = Email partnera"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
@@ -474,7 +474,7 @@ msgstr "Istniejący klient"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet2
 msgid "Home"
-msgstr ""
+msgstr "Dom"
 
 #. module: crm
 #: field:crm.case,categ_id:0
@@ -501,6 +501,8 @@ msgid ""
 "Check this if you want the rule to mark CC(mail to any other person defined "
 "in actions)."
 msgstr ""
+"Zaznacz to, jeśli chcesz, aby reguła wysyłała wiadomość DW (mail do dowolnej "
+"osoby zdefiniowanej w akcji)."
 
 #. module: crm
 #: field:crm.meeting,class:0
@@ -510,7 +512,7 @@ msgstr "Prywatność"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(partner)s = Partner name"
-msgstr ""
+msgstr "%(partner)s = Nazwa partnera"
 
 #. module: crm
 #: view:crm.case:0
@@ -820,7 +822,7 @@ msgstr "Umowę podpisano"
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,init:0
 msgid "Subscribe to Remote ICS"
-msgstr ""
+msgstr "Powiąż ze zdalnym ICS"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor1
@@ -943,7 +945,7 @@ msgstr "Wyłączny"
 msgid ""
 "Category related to the section.Subdivide the CRM cases independently or "
 "section-wise."
-msgstr ""
+msgstr "Kategoria związana z sekcją. Ustala podział spraw wewnątrz w sekcji."
 
 #. module: crm
 #: field:crm.case.rule,act_state:0
@@ -959,7 +961,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead6
 msgid "Radio"
-msgstr ""
+msgstr "Radio"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity_assign_wizard
@@ -969,7 +971,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on States"
-msgstr "Warunki stanów"
+msgstr "Warunki dla stanów"
 
 #. module: crm
 #: field:crm.case.rule,trg_date_type:0
@@ -984,7 +986,7 @@ msgstr "Przeszukuj historie"
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Gives the sequence order when displaying a list of case stages."
-msgstr "Ustala kolejność wyświetlania listy etapów spraw."
+msgstr "Ustala kolejność wyświetlania listy spraw wg etapów."
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support3
@@ -1027,6 +1029,7 @@ msgid ""
 "These people will receive a copy of the future communication between partner "
 "and users by email"
 msgstr ""
+"Te osoby otrzymają kopie korespondencji pomiędzy partnerem i użytkownikiem."
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -1128,7 +1131,7 @@ msgstr "Nazwa kategorii sprawy"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim2
 msgid "Preventive"
-msgstr "Prewencyjnie"
+msgstr "Działania prewencyjne"
 
 #. module: crm
 #: field:crm.case.rule,act_email_cc:0
@@ -1155,7 +1158,7 @@ msgstr "Nie możesz przypisać do zamkniętej sprawy"
 msgid ""
 "Check this if you want the rule to send a reminder by email to the partner."
 msgstr ""
-"Zaznacz, jeśli chcesz aby reguła wysyłała przypomnienie mailem do partnera."
+"Zaznacz, jeśli chcesz, aby reguła wysyłała przypomnienie mailem do partnera."
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:0
@@ -1170,7 +1173,7 @@ msgstr "Spotkania"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on Case Fields"
-msgstr "Warunki na pola sprawy"
+msgstr "Warunki dla pól sprawy"
 
 #. module: crm
 #: field:crm.case,date_action_next:0
@@ -1183,7 +1186,7 @@ msgstr "Następna akcja"
 #: selection:crm.case.rule,trg_date_type:0
 #: view:crm.opportunity:0
 msgid "Deadline"
-msgstr "Ostateczny czas ukończenia"
+msgstr "Termin"
 
 #. module: crm
 #: wizard_button:caldav.crm.export,init,end:0
@@ -1352,7 +1355,7 @@ msgstr "Spotkanie"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(partner_email)s = Partner email"
-msgstr ""
+msgstr "%(partner_email)s = Email partnera"
 
 #. module: crm
 #: view:crm.case:0
@@ -1823,7 +1826,7 @@ msgstr "Etap sprzedaży"
 #. module: crm
 #: field:crm.meeting,alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Przypomnienie"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_watchers:0
@@ -2170,6 +2173,8 @@ msgid ""
 "need a delay before the trigger date, like sending a reminder 15 minutes "
 "before a meeting."
 msgstr ""
+"Opóźnienie po czasie wyzwolenia. Możesz wstawić wartości ujemne, jeśli "
+"chcesz przypomnienie np. 15 min przed spotkaniem."
 
 #. module: crm
 #: view:crm.claim:0
@@ -2290,7 +2295,7 @@ msgstr "Sprawy spotkań"
 #. module: crm
 #: view:crm.job:0
 msgid "Job Info"
-msgstr "Informacja o stanowisko"
+msgstr "Informacja o stanowisku"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2326,7 +2331,7 @@ msgstr "Praca - Formularz rekrutacji"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim1
 msgid "Corrective"
-msgstr ""
+msgstr "Działania naprawcze"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity
@@ -2384,6 +2389,8 @@ msgid ""
 "No E-Mail ID Found for the Responsible Partner or missing reply address in "
 "section!"
 msgstr ""
+"Nie znaleziono ID E-Mail dla partnera odpowiedzialnego lub brak adresu "
+"zwrotnego w sekcji!"
 
 #. module: crm
 #: view:crm.job:0
@@ -2491,6 +2498,9 @@ msgid ""
 "mentality in relation to our services.The scale hasto be created with a "
 "factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."
 msgstr ""
+"Stany emocji pozwalają określać poziomy zadowolenia partnera w stosunku do "
+"naszej obsługi. Skala powinna być utworzona jako liczby od 0 (bardzie "
+"niezadowolony) do 10 (bardzo zadowolony)."
 
 #. module: crm
 #: field:crm.meeting,freebusy:0
@@ -2653,7 +2663,7 @@ msgstr "Reklamacje"
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
 msgid "Decrease (0>1)"
-msgstr ""
+msgstr "Zmniejsz (0>1)"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_case_history_event
@@ -2674,7 +2684,7 @@ msgstr "Do"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_user_email)s = Responsible email"
-msgstr "%(case_user_email)s = email odpowiedzialnego"
+msgstr "%(case_user_email)s = Email odpowiedzialnego"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_presale
@@ -2833,7 +2843,7 @@ msgstr "Reklamacja/Opis akcji"
 #. module: crm
 #: field:crm.case.rule,trg_max_history:0
 msgid "Maximum Communication History"
-msgstr ""
+msgstr "Maksimum historii komunikacji"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3179,7 +3189,7 @@ msgstr "Anulowano"
 #. module: crm
 #: view:crm.job:0
 msgid "Applied Job"
-msgstr ""
+msgstr "Zgłoszenia na stanowisko"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
@@ -3191,7 +3201,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Relevant"
-msgstr "Odpowiedni"
+msgstr "Priorytet"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,name:0
@@ -3294,7 +3304,7 @@ msgstr "Kanał"
 #. module: crm
 #: help:crm.case.rule,act_mail_to_email:0
 msgid "Email-id of the persons whom mail is to be sent"
-msgstr ""
+msgstr "Email osoby, do której ma być wysłana wiadomość"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_claim
@@ -3485,7 +3495,7 @@ msgstr "Drzewo funduszy"
 #. module: crm
 #: field:crm.case.rule,act_method:0
 msgid "Call Object Method"
-msgstr ""
+msgstr "Metoda wywołania obiektu"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_fund_all1
@@ -3517,7 +3527,7 @@ msgstr "Odnośnik 2"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Sales Purchase"
-msgstr ""
+msgstr "Sprzedaż-Zakupy"
 
 #. module: crm
 #: view:crm.job:0
@@ -3655,7 +3665,7 @@ msgstr "Listopad"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job2
 msgid "Licenced"
-msgstr ""
+msgstr "Licencjonowane"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
@@ -3769,7 +3779,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on Case Partner"
-msgstr "Warunki na partnera sprawy"
+msgstr "Warunki dla partnera sprawy"
 
 #. module: crm
 #: field:crm.case.section,code:0
@@ -3912,7 +3922,7 @@ msgstr "Zaplanuj spotkanie"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on Priority Range"
-msgstr "Warunki na zakres priorytetu"
+msgstr "Warunki dla zakres priorytetu"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
@@ -3988,7 +3998,7 @@ msgstr "Log sprawy"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on Timing"
-msgstr "Warunki na czas"
+msgstr "Warunki dla czasu"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_helpdesk
diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po
index be63f25762c..4f1655d6296 100644
--- a/addons/crm/i18n/pt.po
+++ b/addons/crm/i18n/pt.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: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-24 05:59+0000\n"
+"PO-Revision-Date: 2010-08-25 07:31+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/sk.po b/addons/crm/i18n/sk.po
index f46cc405167..34539ac2668 100644
--- a/addons/crm/i18n/sk.po
+++ b/addons/crm/i18n/sk.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-24 06:02+0000\n"
+"PO-Revision-Date: 2010-08-25 06:31+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/tr.po b/addons/crm/i18n/tr.po
index ed34d741400..fa2d1a40b14 100644
--- a/addons/crm/i18n/tr.po
+++ b/addons/crm/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: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-24 05:58+0000\n"
+"PO-Revision-Date: 2010-08-25 07:30+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm_profiling/i18n/pl.po b/addons/crm_profiling/i18n/pl.po
index 4aae0328930..ed7fd9d01f5 100644
--- a/addons/crm_profiling/i18n/pl.po
+++ b/addons/crm_profiling/i18n/pl.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-21 20:20+0000\n"
+"PO-Revision-Date: 2010-08-25 19:09+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
@@ -39,7 +39,7 @@ msgstr "Otwórz kwestionariusz"
 #. module: crm_profiling
 #: field:crm.segmentation,child_ids:0
 msgid "Child Profiles"
-msgstr ""
+msgstr "Profile podrzędne"
 
 #. module: crm_profiling
 #: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
@@ -55,7 +55,7 @@ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 #: field:crm_profiling.answer,name:0
 #: model:ir.model,name:crm_profiling.model_crm_profiling_answer
 msgid "Answer"
-msgstr "Odpowiedz"
+msgstr "Odpowiedź"
 
 #. module: crm_profiling
 #: view:res.partner:0
@@ -135,6 +135,9 @@ msgid ""
 "Check this box if you want to use this tab as part of the segmentation rule. "
 "If not checked, the criteria beneath will be ignored"
 msgstr ""
+"Zaznacz tę opcję, jeśli chcesz stosować tę zakładkę jako część reguły "
+"segmentacji. Jeśli nie zaznaczone, to, to poniższe kryteria zostaną "
+"zignorowane."
 
 #. module: crm_profiling
 #: view:crm_profiling.question:0
@@ -168,4 +171,4 @@ msgstr "Używanie kwestionariusza"
 #. module: crm_profiling
 #: wizard_button:open_questionnaire,open,compute:0
 msgid "Save Data"
-msgstr "Zapis danych"
+msgstr "Zapisz dane"
diff --git a/addons/crm_profiling/i18n/tr.po b/addons/crm_profiling/i18n/tr.po
index d524670f26d..6cf4ff61b90 100644
--- a/addons/crm_profiling/i18n/tr.po
+++ b/addons/crm_profiling/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:10+0000\n"
+"PO-Revision-Date: 2010-08-25 08:02+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index 61f6bd3adc5..4df773eb8ed 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:56+0000\n"
+"PO-Revision-Date: 2010-08-25 07:26+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po
index 9e9dafd4869..79666a02cbd 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:06+0000\n"
+"PO-Revision-Date: 2010-08-25 07:46+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/document/i18n/mn.po b/addons/document/i18n/mn.po
index 828cdc7bb25..4c33b51a4ca 100644
--- a/addons/document/i18n/mn.po
+++ b/addons/document/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:01+0000\n"
+"PO-Revision-Date: 2010-08-25 07:34+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po
index 160bda9a37f..f5dc23b3182 100644
--- a/addons/document/i18n/ru.po
+++ b/addons/document/i18n/ru.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:11+0000\n"
+"PO-Revision-Date: 2010-08-25 08:03+0000\n"
 "Last-Translator: devcode <klaider@yandex.ru>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po
index ebf145368ec..ffa85df4ac1 100644
--- a/addons/document/i18n/tr.po
+++ b/addons/document/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:10+0000\n"
+"PO-Revision-Date: 2010-08-25 08:01+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index 8c0648e0cad..e61f62c7dbb 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:07+0000\n"
+"PO-Revision-Date: 2010-08-25 07:53+0000\n"
 "Last-Translator: Black Jack <onetimespeed@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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document_ics/i18n/tr.po b/addons/document_ics/i18n/tr.po
index 5e88de62f69..cee29289a55 100644
--- a/addons/document_ics/i18n/tr.po
+++ b/addons/document_ics/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:59+0000\n"
+"PO-Revision-Date: 2010-08-25 07:31+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/zh_CN.po b/addons/document_ics/i18n/zh_CN.po
index bfc08893a68..df13fb1f652 100644
--- a/addons/document_ics/i18n/zh_CN.po
+++ b/addons/document_ics/i18n/zh_CN.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:57+0000\n"
+"PO-Revision-Date: 2010-08-25 07:28+0000\n"
 "Last-Translator: Black Jack <onetimespeed@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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index 596bb80032e..825059bd46b 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -131,7 +131,7 @@ class res_users(osv.osv):
                 parent_ids = map(lambda x: x['manager_id'][0], data_dept)
                 cr.execute('SELECT res.user_id FROM hr_employee AS emp JOIN resource_resource AS res ON res.id=emp.resource_id \
                         WHERE emp.id IN %s', (tuple(parent_ids),))
-                parent_ids = [x[0] for x in cr.fetchall()]
+                parent_ids = [x[0] for x in cr.fetchall() if x[0]]
             result[user_id] = parent_ids
         return result
 
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index 126a0e8b314..395d9c27ea3 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:03+0000\n"
+"PO-Revision-Date: 2010-08-25 06:33+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index b4a2e623799..e27f2261802 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/i18n/pt_BR.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:57+0000\n"
+"PO-Revision-Date: 2010-08-25 07:28+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index 92a19e74654..55783de2946 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:02+0000\n"
+"PO-Revision-Date: 2010-08-25 06:22+0000\n"
 "Last-Translator: adsiz_1029@hotmail.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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 439f8377ec1..7e17bebf90f 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:57+0000\n"
+"PO-Revision-Date: 2010-08-25 07:28+0000\n"
 "Last-Translator: Black Jack <onetimespeed@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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr_attendance/i18n/fi.po b/addons/hr_attendance/i18n/fi.po
index 8050e631c8d..ec469ee387f 100644
--- a/addons/hr_attendance/i18n/fi.po
+++ b/addons/hr_attendance/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:48+0000\n"
+"PO-Revision-Date: 2010-08-25 07:11+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po
index ad30a55c307..544073b1302 100644
--- a/addons/hr_attendance/i18n/pt_BR.po
+++ b/addons/hr_attendance/i18n/pt_BR.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:03+0000\n"
+"PO-Revision-Date: 2010-08-25 06:38+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/tr.po b/addons/hr_attendance/i18n/tr.po
index bced8fa66ee..d6d85af7f2c 100644
--- a/addons/hr_attendance/i18n/tr.po
+++ b/addons/hr_attendance/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:11+0000\n"
+"PO-Revision-Date: 2010-08-25 08:06+0000\n"
 "Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_contract/i18n/tr.po b/addons/hr_contract/i18n/tr.po
index 81fcbb0f94b..68e1b9de4b4 100644
--- a/addons/hr_contract/i18n/tr.po
+++ b/addons/hr_contract/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:02+0000\n"
+"PO-Revision-Date: 2010-08-25 06:20+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_expense/i18n/pt_BR.po b/addons/hr_expense/i18n/pt_BR.po
index 03b55d9b2b8..bb9327b1dc5 100644
--- a/addons/hr_expense/i18n/pt_BR.po
+++ b/addons/hr_expense/i18n/pt_BR.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:03+0000\n"
+"PO-Revision-Date: 2010-08-25 06:51+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/ru.po b/addons/hr_expense/i18n/ru.po
index 4e6cb62d58f..670b50ba911 100644
--- a/addons/hr_expense/i18n/ru.po
+++ b/addons/hr_expense/i18n/ru.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 07:33+0000\n"
+"PO-Revision-Date: 2010-08-25 06:59+0000\n"
 "Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/tr.po b/addons/hr_expense/i18n/tr.po
index 2ad96a2881b..4fa40599b27 100644
--- a/addons/hr_expense/i18n/tr.po
+++ b/addons/hr_expense/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:03+0000\n"
+"PO-Revision-Date: 2010-08-25 06:45+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_holidays/i18n/lt.po b/addons/hr_holidays/i18n/lt.po
index 8b00a5b157d..560dd4c9bcb 100644
--- a/addons/hr_holidays/i18n/lt.po
+++ b/addons/hr_holidays/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:34+0000\n"
+"PO-Revision-Date: 2010-08-25 05:46+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/tr.po b/addons/hr_holidays/i18n/tr.po
index a1faa7d1b58..12b13f201f4 100644
--- a/addons/hr_holidays/i18n/tr.po
+++ b/addons/hr_holidays/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:58+0000\n"
+"PO-Revision-Date: 2010-08-25 07:30+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index eddc082646f..5677a1f69d7 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:03+0000\n"
+"PO-Revision-Date: 2010-08-25 06:53+0000\n"
 "Last-Translator: Black Jack <onetimespeed@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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_timesheet/i18n/tr.po b/addons/hr_timesheet/i18n/tr.po
index e4095d8a7d5..7c73bb0ee57 100644
--- a/addons/hr_timesheet/i18n/tr.po
+++ b/addons/hr_timesheet/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:57+0000\n"
+"PO-Revision-Date: 2010-08-25 07:27+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet_invoice/i18n/tr.po b/addons/hr_timesheet_invoice/i18n/tr.po
index 9263b75750b..1534c4fae3c 100644
--- a/addons/hr_timesheet_invoice/i18n/tr.po
+++ b/addons/hr_timesheet_invoice/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:56+0000\n"
+"PO-Revision-Date: 2010-08-25 07:26+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_sheet/i18n/lt.po b/addons/hr_timesheet_sheet/i18n/lt.po
index 72ca9e8a543..1965bfd46e3 100644
--- a/addons/hr_timesheet_sheet/i18n/lt.po
+++ b/addons/hr_timesheet_sheet/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:04+0000\n"
+"PO-Revision-Date: 2010-08-25 07:41+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/tr.po b/addons/hr_timesheet_sheet/i18n/tr.po
index 6fb84e09159..63b817c9730 100644
--- a/addons/hr_timesheet_sheet/i18n/tr.po
+++ b/addons/hr_timesheet_sheet/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:03+0000\n"
+"PO-Revision-Date: 2010-08-25 06:56+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/idea/i18n/lt.po b/addons/idea/i18n/lt.po
index 1d3f1425458..89be83fa2d3 100644
--- a/addons/idea/i18n/lt.po
+++ b/addons/idea/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:57+0000\n"
+"PO-Revision-Date: 2010-08-25 07:27+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/zh_CN.po b/addons/idea/i18n/zh_CN.po
index 30ada3e331a..bb8f436d4d5 100644
--- a/addons/idea/i18n/zh_CN.po
+++ b/addons/idea/i18n/zh_CN.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:01+0000\n"
+"PO-Revision-Date: 2010-08-25 07:33+0000\n"
 "Last-Translator: Black Jack <onetimespeed@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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/l10n_be/i18n/tr.po b/addons/l10n_be/i18n/tr.po
index 9eccc2b1617..59115d63c99 100644
--- a/addons/l10n_be/i18n/tr.po
+++ b/addons/l10n_be/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:02+0000\n"
+"PO-Revision-Date: 2010-08-25 06:24+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_ch/i18n/it.po b/addons/l10n_ch/i18n/it.po
index 01080029b4a..0980533a58f 100644
--- a/addons/l10n_ch/i18n/it.po
+++ b/addons/l10n_ch/i18n/it.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:02+0000\n"
+"PO-Revision-Date: 2010-08-25 06:15+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/tr.po b/addons/l10n_ch/i18n/tr.po
index 847b1eb8249..555280aa43b 100644
--- a/addons/l10n_ch/i18n/tr.po
+++ b/addons/l10n_ch/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:57+0000\n"
+"PO-Revision-Date: 2010-08-25 07:27+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po b/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
index 96157cf3d4f..0e43c465e1a 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:03+0000\n"
+"PO-Revision-Date: 2010-08-25 06:42+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_chart_uk_minimal/i18n/tr.po b/addons/l10n_chart_uk_minimal/i18n/tr.po
index 86dfc4cb4c0..b3eff33c5cd 100644
--- a/addons/l10n_chart_uk_minimal/i18n/tr.po
+++ b/addons/l10n_chart_uk_minimal/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:01+0000\n"
+"PO-Revision-Date: 2010-08-25 07:36+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_fr/i18n/tr.po b/addons/l10n_fr/i18n/tr.po
index d3afe16d3ef..eb30bedae66 100644
--- a/addons/l10n_fr/i18n/tr.po
+++ b/addons/l10n_fr/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:03+0000\n"
+"PO-Revision-Date: 2010-08-25 06:53+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_lu/i18n/tr.po b/addons/l10n_lu/i18n/tr.po
index 4debb9b3e8c..9079d4f4a62 100644
--- a/addons/l10n_lu/i18n/tr.po
+++ b/addons/l10n_lu/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:02+0000\n"
+"PO-Revision-Date: 2010-08-25 06:26+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/membership/i18n/tr.po b/addons/membership/i18n/tr.po
index 9feee428ca6..34555230ea9 100644
--- a/addons/membership/i18n/tr.po
+++ b/addons/membership/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:03+0000\n"
+"PO-Revision-Date: 2010-08-25 06:34+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index 9bef51e2472..38d5a24bbbd 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:01+0000\n"
+"PO-Revision-Date: 2010-08-25 07:37+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index fda1e063254..857c0e138d6 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:11+0000\n"
+"PO-Revision-Date: 2010-08-25 08:05+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index 6790d49fc0f..6ff90cc592d 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/i18n/zh_TW.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:08+0000\n"
+"PO-Revision-Date: 2010-08-25 07:57+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp_operations/i18n/tr.po b/addons/mrp_operations/i18n/tr.po
index 385c666891f..e1be6a0f609 100644
--- a/addons/mrp_operations/i18n/tr.po
+++ b/addons/mrp_operations/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:59+0000\n"
+"PO-Revision-Date: 2010-08-25 07:31+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po
index 782f6b2f7a4..67143328333 100644
--- a/addons/mrp_repair/i18n/tr.po
+++ b/addons/mrp_repair/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:56+0000\n"
+"PO-Revision-Date: 2010-08-25 07:26+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_subproduct/i18n/tr.po b/addons/mrp_subproduct/i18n/tr.po
index 07f0d7a6bf4..d44f1ffaeed 100644
--- a/addons/mrp_subproduct/i18n/tr.po
+++ b/addons/mrp_subproduct/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:03+0000\n"
+"PO-Revision-Date: 2010-08-25 06:41+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/point_of_sale/i18n/lt.po b/addons/point_of_sale/i18n/lt.po
index f5f6d759509..bb4353fd9a7 100644
--- a/addons/point_of_sale/i18n/lt.po
+++ b/addons/point_of_sale/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:58+0000\n"
+"PO-Revision-Date: 2010-08-25 07:29+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/tr.po b/addons/point_of_sale/i18n/tr.po
index 98afc19da42..6840ab6b013 100644
--- a/addons/point_of_sale/i18n/tr.po
+++ b/addons/point_of_sale/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:01+0000\n"
+"PO-Revision-Date: 2010-08-25 07:33+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/process/i18n/tr.po b/addons/process/i18n/tr.po
index e0810fc683e..559379cdc7f 100644
--- a/addons/process/i18n/tr.po
+++ b/addons/process/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:04+0000\n"
+"PO-Revision-Date: 2010-08-25 07:41+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index a897efb442d..720d482c323 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:01+0000\n"
+"PO-Revision-Date: 2010-08-25 07:33+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index 8ab579d1136..874e8a6c802 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:01+0000\n"
+"PO-Revision-Date: 2010-08-25 07:33+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index 153735b51c9..24e3745e1fc 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:01+0000\n"
+"PO-Revision-Date: 2010-08-25 07:34+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index 557da70931e..344b4a7367b 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:11+0000\n"
+"PO-Revision-Date: 2010-08-25 08:05+0000\n"
 "Last-Translator: Sonja Sardelić <sardelic.sonja@gmail.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index 59894c5e748..e8d1b3f510e 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:03+0000\n"
+"PO-Revision-Date: 2010-08-25 07:39+0000\n"
 "Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 987f6024bbf..4489fc3c79b 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:03+0000\n"
+"PO-Revision-Date: 2010-08-25 06:55+0000\n"
 "Last-Translator: Black Jack <onetimespeed@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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product_margin/i18n/pt_BR.po b/addons/product_margin/i18n/pt_BR.po
index 748c588fbc4..fc8aac36280 100644
--- a/addons/product_margin/i18n/pt_BR.po
+++ b/addons/product_margin/i18n/pt_BR.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:56+0000\n"
+"PO-Revision-Date: 2010-08-25 07:26+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/tr.po b/addons/product_margin/i18n/tr.po
index 5122e564cfc..1f746094e89 100644
--- a/addons/product_margin/i18n/tr.po
+++ b/addons/product_margin/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:11+0000\n"
+"PO-Revision-Date: 2010-08-25 08:04+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index 7b3094f38f5..7d8c21eba90 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:02+0000\n"
+"PO-Revision-Date: 2010-08-25 06:29+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: 2010-08-25 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index 4725826ffa8..73de4c144d3 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:01+0000\n"
+"PO-Revision-Date: 2010-08-25 07:34+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: 2010-08-25 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index 4be9630309d..8f0c6e4836f 100644
--- a/addons/project/i18n/tr.po
+++ b/addons/project/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:02+0000\n"
+"PO-Revision-Date: 2010-08-25 07:37+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: 2010-08-25 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 06ad777069e..f0cfb181f4a 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -41,7 +41,7 @@ class report_project_task_user(osv.osv):
         'hours_effective': fields.float('Effective Hours', readonly=True),
         'hours_delay': fields.float('Avg. Plan.-Eff.', readonly=True),
         'remaining_hours': fields.float('Remaining Hours', readonly=True),
-        'progress': fields.float('Progress', readonly=True),
+        'progress': fields.float('Progress', readonly=True, group_operator='avg'),
         'total_hours': fields.float('Total Hours', readonly=True),
         'closing_days': fields.float('Days to Close', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of Days to close the task"),
diff --git a/addons/project_gtd/i18n/tr.po b/addons/project_gtd/i18n/tr.po
index 8cd84a06062..d35c6f62531 100644
--- a/addons/project_gtd/i18n/tr.po
+++ b/addons/project_gtd/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:02+0000\n"
+"PO-Revision-Date: 2010-08-25 06:19+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_mrp/i18n/tr.po b/addons/project_mrp/i18n/tr.po
index 1181572ca24..ced7c23a54f 100644
--- a/addons/project_mrp/i18n/tr.po
+++ b/addons/project_mrp/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:44+0000\n"
+"PO-Revision-Date: 2010-08-25 07:04+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_retro_planning/i18n/tr.po b/addons/project_retro_planning/i18n/tr.po
index f0cec262378..fe38c87d244 100644
--- a/addons/project_retro_planning/i18n/tr.po
+++ b/addons/project_retro_planning/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:57+0000\n"
+"PO-Revision-Date: 2010-08-25 07:27+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_scrum/i18n/tr.po b/addons/project_scrum/i18n/tr.po
index 0f7a4f57a6f..3a7c12aad91 100644
--- a/addons/project_scrum/i18n/tr.po
+++ b/addons/project_scrum/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:06+0000\n"
+"PO-Revision-Date: 2010-08-25 07:46+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
diff --git a/addons/project_timesheet/i18n/tr.po b/addons/project_timesheet/i18n/tr.po
index 408dfa61498..fb50ff8e7ba 100644
--- a/addons/project_timesheet/i18n/tr.po
+++ b/addons/project_timesheet/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:03+0000\n"
+"PO-Revision-Date: 2010-08-25 06:49+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index e1d1d0a1514..f1cf9fe0f53 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/i18n/et.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:04+0000\n"
+"PO-Revision-Date: 2010-08-25 07:42+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index 46956eebc44..0d18789f8be 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:01+0000\n"
+"PO-Revision-Date: 2010-08-25 07:33+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index 35e8b39bbcf..8e599e7db86 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:37+0000\n"
+"PO-Revision-Date: 2010-08-25 05:50+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 533c035d7ac..81834ebbdbf 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -301,15 +301,16 @@
             <field name="name">purchase.order.line.form2</field>
             <field name="model">purchase.order.line</field>
             <field name="type">form</field>
+            <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <form string="Purchase Order Line">
                     <notebook colspan="4">
                         <page string="Order Line">
                            	<separator colspan="4" string="General Information"/>
                          	<field name="order_id"/>
-                            <field name="product_id"  readonly="1" />
+                            <field name="product_id" readonly="1" />
                             <field name="product_qty" readonly="1" />
-                            <field name="product_uom"  readonly="1"/>
+                            <field name="product_uom" readonly="1"/>
                             <field colspan="4" name="name"/>
                             <field name="date_planned" widget="date"  readonly="1"/>
                             <field name="price_unit"/>
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 245da72cad8..49a28e352b2 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -40,7 +40,7 @@ class stock_picking(osv.osv):
     _inherit = 'stock.picking'
     _columns = {
         'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
-            ondelete='set null', select=True, readonly=True),
+            ondelete='set null', select=True),
     }
     _defaults = {
         'purchase_id': lambda *a: False,
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 867f48f6fe0..a991b79d0e9 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -19,7 +19,32 @@
             id="act_purchase_order_2_stock_picking"
             name="Picking"
             res_model="stock.picking"
-            src_model="purchase.order"/>
-
+            src_model="purchase.order"
+            context="{'contact_display': 'partner'}" />
+       
+       <record id="action_picking_in_tree_view" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="stock.view_picking_in_tree"/>
+            <field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
+        </record>
+        <record id="action_picking_in_form_view" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="stock.view_picking_in_form"/>
+            <field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
+        </record>
+        
+        <record id="stock_picking_in_inherit_purchase" model="ir.ui.view">
+            <field name="name">Incoming Picking Inherited</field>
+            <field name="model">stock.picking</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_picking_in_form"/>
+            <field name="arch" type="xml">
+                <field name="backorder_id" position="after">
+                    <field name="purchase_id"/>
+                </field>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/report_intrastat/i18n/pt_BR.po b/addons/report_intrastat/i18n/pt_BR.po
index 473edcb0f87..e3307bb812b 100644
--- a/addons/report_intrastat/i18n/pt_BR.po
+++ b/addons/report_intrastat/i18n/pt_BR.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:03+0000\n"
+"PO-Revision-Date: 2010-08-25 06:35+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: 2010-08-25 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/tr.po b/addons/report_intrastat/i18n/tr.po
index 22e4e8846b3..5b23e2d9293 100644
--- a/addons/report_intrastat/i18n/tr.po
+++ b/addons/report_intrastat/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:02+0000\n"
+"PO-Revision-Date: 2010-08-25 06:23+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: 2010-08-25 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index a38f46d8fb0..65631f8ed66 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:03+0000\n"
+"PO-Revision-Date: 2010-08-25 07:39+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: <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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index ad889fb447e..8c98a62608d 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/sale/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:57+0000\n"
+"PO-Revision-Date: 2010-08-25 07:27+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index 1a0a39c1e9e..7613d7ed0fd 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:00+0000\n"
+"PO-Revision-Date: 2010-08-25 07:31+0000\n"
 "Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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-08-25 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 2990f89a9db..d9bc3181dcb 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:50+0000\n"
+"PO-Revision-Date: 2010-08-25 07:14+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: 2010-08-25 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index e765604b3be..55fdd68cbd8 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:46+0000\n"
+"PO-Revision-Date: 2010-08-25 07:07+0000\n"
 "Last-Translator: Jay (OpenERP) <jvo@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: 2010-08-25 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index 30e856290d9..5562068fa01 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:01+0000\n"
+"PO-Revision-Date: 2010-08-25 07:37+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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: 2010-08-25 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index d8df1901024..39260e759b4 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -35,7 +35,7 @@ stock_move()
 class stock_picking(osv.osv):
     _inherit = 'stock.picking'
     _columns = {
-        'sale_id': fields.many2one('sale.order', 'Sale Order', ondelete='set null', select=True, readonly=True),
+        'sale_id': fields.many2one('sale.order', 'Sale Order', ondelete='set null', select=True),
     }
     _defaults = {
         'sale_id': False
diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 2e9e7e0b66e..73df12db523 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -12,5 +12,20 @@
                 </field>
             </field>
         </record>
+        
+        <!-- Adding Sale Order Reference to outgoing picking -->
+        
+        <record id="stock_picking_out_inherit_sale" model="ir.ui.view">
+            <field name="name">Outgoing picking Inherited</field>
+            <field name="model">stock.picking</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_picking_out_form"/>
+            <field name="arch" type="xml">
+                <field name="move_type" position="after">
+                    <field name="sale_id"/>
+                </field>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/sale_journal/i18n/pl.po b/addons/sale_journal/i18n/pl.po
index 1f26be13d10..8adaeae688c 100644
--- a/addons/sale_journal/i18n/pl.po
+++ b/addons/sale_journal/i18n/pl.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:56+0000\n"
+"PO-Revision-Date: 2010-08-25 07:26+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/tr.po b/addons/sale_journal/i18n/tr.po
index 04af26e7637..8a552d536f1 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:03+0000\n"
+"PO-Revision-Date: 2010-08-25 06:39+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po
index eeeb843d9b3..d30cf3c9ab0 100644
--- a/addons/stock/i18n/bs.po
+++ b/addons/stock/i18n/bs.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:56+0000\n"
+"PO-Revision-Date: 2010-08-25 07:27+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po
index 96aa2bfa6de..2d05a843cfa 100644
--- a/addons/stock/i18n/it.po
+++ b/addons/stock/i18n/it.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:55+0000\n"
+"PO-Revision-Date: 2010-08-25 07:25+0000\n"
 "Last-Translator: Davide Corio - Domsense <davide.corio@domsense.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index b5b76faba75..12f1d467dbc 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:59+0000\n"
+"PO-Revision-Date: 2010-08-25 07:31+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: 2010-08-25 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po
index 7ca224999b8..a4bdd2f11b4 100644
--- a/addons/stock/i18n/pt_BR.po
+++ b/addons/stock/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:41+0000\n"
+"PO-Revision-Date: 2010-08-25 05:56+0000\n"
 "Last-Translator: Renato Lima - http://www.akretion.com "
 "<renatonlima@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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index 942eb83fd21..c956bb06e70 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:43+0000\n"
+"PO-Revision-Date: 2010-08-25 07:01+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index af422b63dd5..e1aa0dc4e13 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -30,27 +30,31 @@ class stock_return_picking(osv.osv_memory):
     _description = 'Return Picking'
 
     def default_get(self, cr, uid, fields, context):
-        """ 
+        """
          To get default values for the object.
          @param self: The object pointer.
          @param cr: A database cursor
          @param uid: ID of the user currently logged in
-         @param fields: List of fields for which we want default values 
-         @param context: A standard dictionary 
-         @return: A dictionary which of fields with values. 
-        """ 
+         @param fields: List of fields for which we want default values
+         @param context: A standard dictionary
+         @return: A dictionary with default values for all field in ``fields``
+        """
         res = super(stock_return_picking, self).default_get(cr, uid, fields, context=context)
         record_id = context and context.get('active_id', False) or False
         pick_obj = self.pool.get('stock.picking')
         pick = pick_obj.browse(cr, uid, record_id)
-        for m in [line for line in pick.move_lines]:
-            res['return%s'%(m.id)] = m.product_qty
-            if pick.invoice_state=='invoiced':
-                res['invoice_state'] = '2binvoiced'
-            else:
-                res['invoice_state'] = 'none'
+        if pick:
+            if 'invoice_state' in fields:
+                if pick.invoice_state=='invoiced':
+                    res['invoice_state'] = '2binvoiced'
+                else:
+                    res['invoice_state'] = 'none'
+            for line in pick.move_lines:
+                return_id = 'return%s'%(line.id)
+                if return_id in fields:
+                    res[return_id] = line.product_qty
         return res
-    
+
     def view_init(self, cr, uid, fields_list, context=None):
         """ 
          Creates view dynamically and adding fields at runtime.
diff --git a/addons/stock_invoice_directly/i18n/tr.po b/addons/stock_invoice_directly/i18n/tr.po
index 9ef605eb22d..7c54d4d1b40 100644
--- a/addons/stock_invoice_directly/i18n/tr.po
+++ b/addons/stock_invoice_directly/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:06+0000\n"
+"PO-Revision-Date: 2010-08-25 07:46+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po
index b4ca71feb24..901787a10bd 100644
--- a/addons/stock_location/i18n/tr.po
+++ b/addons/stock_location/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:10+0000\n"
+"PO-Revision-Date: 2010-08-25 08:02+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_no_autopicking/i18n/tr.po b/addons/stock_no_autopicking/i18n/tr.po
index 7fd109a5011..768eeab7102 100644
--- a/addons/stock_no_autopicking/i18n/tr.po
+++ b/addons/stock_no_autopicking/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:52+0000\n"
+"PO-Revision-Date: 2010-08-25 07:17+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/subscription/i18n/pl.po b/addons/subscription/i18n/pl.po
index 8674d598052..c5587879631 100644
--- a/addons/subscription/i18n/pl.po
+++ b/addons/subscription/i18n/pl.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 22:02+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-08-25 18:52+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
@@ -68,7 +68,7 @@ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 #. module: subscription
 #: selection:subscription.subscription,interval_type:0
 msgid "Weeks"
-msgstr "Tygodni"
+msgstr "Tygodnie"
 
 #. module: subscription
 #: field:subscription.subscription,state:0
@@ -83,12 +83,12 @@ msgstr "Pola dokumentu subskrypcji"
 #. module: subscription
 #: field:subscription.subscription,interval_number:0
 msgid "Interval Qty"
-msgstr "Il. interwał"
+msgstr "Il. interwałów"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Stop"
-msgstr "Stop"
+msgstr "Zatrzymaj"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -165,7 +165,7 @@ msgstr "Uwagi"
 #. module: subscription
 #: selection:subscription.subscription,interval_type:0
 msgid "Months"
-msgstr "Miesięcy"
+msgstr "Miesiące"
 
 #. module: subscription
 #: selection:subscription.subscription,interval_type:0
@@ -180,7 +180,7 @@ msgstr "Subskrypcje i operacje powtarzalne"
 #. module: subscription
 #: field:subscription.subscription,active:0
 msgid "Active"
-msgstr "Aktywny"
+msgstr "Aktywne"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document
@@ -190,7 +190,7 @@ msgstr "Dokument subskrypcji"
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
 msgid "Cron Job"
-msgstr ""
+msgstr "Nazwa w planiście"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_subscription
@@ -222,7 +222,7 @@ msgstr "Fałsz"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Process"
-msgstr "Proces"
+msgstr "Uruchom"
 
 #. module: subscription
 #: model:ir.actions.act_window,name:subscription.action_subscription_form
@@ -266,7 +266,7 @@ msgstr "Wartość domyślna"
 #: view:subscription.subscription:0
 #: field:subscription.subscription,doc_lines:0
 msgid "Documents created"
-msgstr "Dokumenty utworzono"
+msgstr "Utworzone dokumenty"
 
 #. module: subscription
 #: model:ir.ui.menu,name:subscription.menu_tools
diff --git a/addons/subscription/i18n/tr.po b/addons/subscription/i18n/tr.po
index 5704cf79727..b2a889a2282 100644
--- a/addons/subscription/i18n/tr.po
+++ b/addons/subscription/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 05:58+0000\n"
+"PO-Revision-Date: 2010-08-25 07:29+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: 2010-08-25 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/survey/i18n/pl.po b/addons/survey/i18n/pl.po
new file mode 100644
index 00000000000..95252bfab22
--- /dev/null
+++ b/addons/survey/i18n/pl.po
@@ -0,0 +1,697 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 06:01+0000\n"
+"PO-Revision-Date: 2010-08-25 20:02+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"Language-Team: Polish <pl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_survey_form
+msgid "Surveys"
+msgstr "Sondaże"
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey
+msgid "Survey Analysis Report"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_page_question
+#: model:ir.ui.menu,name:survey.menu_survey_question_form1
+msgid "Survey Questions"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.response:0
+msgid "Set to draft"
+msgstr "Ustaw na projekt"
+
+#. module: survey
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
+#. module: survey
+#: field:survey.history,date:0
+msgid "Date started"
+msgstr ""
+
+#. module: survey
+#: field:survey,history:0
+msgid "History Lines"
+msgstr "Pozycje historii"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail:0
+msgid "Body"
+msgstr "Treść"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_name
+#: model:ir.ui.menu,name:survey.menu_run_survey_form
+msgid "Give Survey Response"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_question
+msgid "All Questions"
+msgstr ""
+
+#. module: survey
+#: field:survey,date_open:0
+msgid "Survey Open Date"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_name_wiz
+msgid "survey.name.wiz"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Users Details"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_question_message
+#: model:ir.model,name:survey.model_survey_question
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Survey Question"
+msgstr ""
+
+#. module: survey
+#: help:survey,response_user:0
+msgid "Set to one if  you require only one response per user"
+msgstr ""
+
+#. module: survey
+#: field:survey.page,title:0
+msgid "Page Title"
+msgstr "Tytuł strony"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_history
+msgid "Survey History"
+msgstr "Historia sondażu"
+
+#. module: survey
+#: field:survey.response,comment:0
+#: field:survey.response.answer,comment:0
+msgid "Notes"
+msgstr "Uwagi"
+
+#. module: survey
+#: field:survey.question,tot_resp:0
+msgid "Total Response"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.wiz:0
+msgid "Your Messages"
+msgstr "Twoja wiadomość"
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Cancelled"
+msgstr "Anulowano"
+
+#. module: survey
+#: field:survey.question,allow_comment:0
+msgid "Allow Comment Field"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Ostrzeżenie !"
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+#: wizard_field:wizard.send.invitation,init,send_mail_existing:0
+msgid "Send reminder for existing user"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_question_form
+#: model:ir.ui.menu,name:survey.menu_new_survey_question_form1
+msgid "New Survey Question"
+msgstr ""
+
+#. module: survey
+#: view:survey.response:0
+msgid "Skip"
+msgstr "Pomiń"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,partner_ids:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail_subject:0
+#: wizard_field:wizard.send.invitation,init,mail_subject_existing:0
+msgid "Subject"
+msgstr "Temat"
+
+#. module: survey
+#: field:survey,max_response_limit:0
+msgid "Maximum Response Limit"
+msgstr ""
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail_from:0
+msgid "From"
+msgstr "Od"
+
+#. module: survey
+#: field:survey.response,response_type:0
+msgid "Response Type"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,transfer:0
+msgid "Page Transfer"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,question_id:0
+#: field:survey.page,question_ids:0
+#: field:survey.question,question:0
+#: field:survey.response,question_id:0
+msgid "Question"
+msgstr "Pytanie"
+
+#. module: survey
+#: wizard_button:wizard.send.invitation,init,send:0
+msgid "Send"
+msgstr "Wyślij"
+
+#. module: survey
+#: field:survey.answer,response:0
+msgid "#Response"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,response_answer_ids:0
+msgid "Response Answer"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Summary"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+#: wizard_field:wizard.send.invitation,init,send_mail:0
+msgid "Send mail for new user"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Error !"
+msgstr "Błąd !"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Skipped Question"
+msgstr ""
+
+#. module: survey
+#: wizard_button:wizard.send.invitation,send,end:0
+msgid "_Ok"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Link"
+msgstr "Odnośnik"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_survey_config
+msgid "Configuration"
+msgstr "Konfiguracja"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_wiz
+msgid "survey.question.wiz"
+msgstr ""
+
+#. module: survey
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Niewłaściwy XML dla architektury widoku!"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response_answer
+#: view:survey.response.answer:0
+msgid "Survey Response Answer"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Page :-"
+msgstr ""
+
+#. module: survey
+#: field:survey,response_user:0
+msgid "Maximum Response per User"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Total Started Survey :-"
+msgstr ""
+
+#. module: survey
+#: view:survey.response:0
+msgid "Comment"
+msgstr "Komentarz"
+
+#. module: survey
+#: field:survey.response,date_modify:0
+msgid "Modify Date"
+msgstr "Data modyfikacji"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Answered Question"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "You can not give response for this survey more than %s times"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Manually"
+msgstr "Ręcznie"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_form1
+msgid "All Surveys"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,users:0
+msgid "Users"
+msgstr "Użytkownicy"
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Message"
+msgstr "Wiadomość"
+
+#. module: survey
+#: field:survey.name.wiz,page_no:0
+msgid "Page Number"
+msgstr "Numer strony"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,send,note:0
+msgid "Log"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_question_form
+msgid "All Survey Questions"
+msgstr ""
+
+#. module: survey
+#: field:survey,date_close:0
+msgid "Survey Close Date"
+msgstr ""
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Start"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+#: selection:survey.response,state:0
+msgid "Draft"
+msgstr "Projekt"
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Closed"
+msgstr "Zamknięte"
+
+#. module: survey
+#: view:survey:0
+#: field:survey.answer,answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,answer_choice_ids:0
+#: field:survey.response.answer,answer_id:0
+msgid "Answer"
+msgstr "Odpowiedź"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_page_form
+msgid "All Survey Pages"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,store_ans:0
+msgid "Store Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey,state:0
+#: field:survey.response,state:0
+msgid "Status"
+msgstr "Stan"
+
+#. module: survey
+#: model:ir.module.module,shortdesc:survey.module_meta_information
+msgid "Survey Module"
+msgstr ""
+
+#. module: survey
+#: model:ir.module.module,description:survey.module_meta_information
+msgid ""
+"\n"
+"    This module is used for surveing. It depends on the answers or reviews "
+"of some questions by different users.\n"
+"    A survey may have multiple pages. Each page may contain multiple "
+"questions and each question may have multiple answers.\n"
+"    Different users may give different answers of question and according to "
+"that survey is done. \n"
+"    Partners are also sent mails with user name and password for the "
+"invitation of the survey\n"
+"    "
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+msgid "Survey Details"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_require_answer:0
+msgid "Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.history,user_id:0
+#: field:survey.response,response_id:0
+msgid "User"
+msgstr "Użytkownik"
+
+#. module: survey
+#: field:res.users,survey_id:0
+msgid "Groups"
+msgstr "Grupy"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,response_ids:0
+#: view:survey.response:0
+#: field:survey.response.answer,response_id:0
+msgid "Response"
+msgstr "Odpowiedź"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_form1
+#: model:ir.ui.menu,name:survey.menu_new_survey_form
+msgid "New Survey"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.main_menu_survey
+msgid "Survey Management"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Skiped"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_answer
+#: view:survey.answer:0
+msgid "Survey Answer"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/wizard_survey.py:0
+#, python-format
+msgid "Attention!"
+msgstr "Uwaga!"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey
+#: view:res.users:0
+#: view:survey:0
+#: field:survey.history,survey_id:0
+#: view:survey.name.wiz:0
+#: field:survey.name.wiz,survey_id:0
+#: field:survey.page,survey_id:0
+#: field:survey.question,survey:0
+msgid "Survey"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Total Completed Survey :-"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "History"
+msgstr "Historia"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Seq"
+msgstr "Num."
+
+#. module: survey
+#: field:survey,tot_comp_survey:0
+msgid "Total Completed Survey"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Percentage"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.wiz,name:0
+msgid "Number"
+msgstr "Numer"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Survey Title :-"
+msgstr ""
+
+#. module: survey
+#: view:survey.response:0
+msgid "Done"
+msgstr "Wykonano"
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "'\" + que_rec[0]['question'] + \"' This question requires an answer."
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+#: wizard_button:wizard.send.invitation,init,end:0
+msgid "Cancel"
+msgstr "Anuluj"
+
+#. module: survey
+#: view:survey:0
+msgid "Close"
+msgstr "Zamknij"
+
+#. module: survey
+#: view:survey:0
+#: selection:survey,state:0
+msgid "Open"
+msgstr "Otwórz"
+
+#. module: survey
+#: field:survey,tot_start_survey:0
+msgid "Total Started Survey"
+msgstr ""
+
+#. module: survey
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
+"specjalnych !"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response
+#: view:survey.response:0
+msgid "Survey Response"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,average:0
+msgid "#Avg"
+msgstr ""
+
+#. module: survey
+#: field:survey,responsible_id:0
+msgid "Responsible"
+msgstr "Odpowiedzialny"
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Answered"
+msgstr "Z odpowiedzią"
+
+#. module: survey
+#: view:survey:0
+msgid "Other"
+msgstr "Inne"
+
+#. module: survey
+#: model:ir.actions.wizard,name:survey.wizard_send_invitation
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Send Invitation"
+msgstr "Wyślij zaproszenie"
+
+#. module: survey
+#: field:survey,title:0
+msgid "Survey Title"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "%"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,note:0
+#: field:survey.name.wiz,note:0
+#: view:survey.page:0
+#: field:survey.page,note:0
+#: view:survey.response:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Select Survey"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_page_form
+#: model:ir.ui.menu,name:survey.menu_new_survey_page_form1
+msgid "New Survey Page"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: field:survey.question,page_id:0
+msgid "Survey Page"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_answer
+msgid "Survey Answers"
+msgstr ""
+
+#. module: survey
+#: view:survey.page:0
+msgid "#Questions"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Que:"
+msgstr ""
+
+#. module: survey
+#: field:survey,page_ids:0
+msgid "Page"
+msgstr "Strona"
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,send:0
+msgid "User creation"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,sequence:0
+#: field:survey.page,sequence:0
+#: field:survey.question,sequence:0
+msgid "Sequence"
+msgstr "Numeracja"
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,send:0
+msgid "Results :"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/wizard_survey.py:0
+#, python-format
+msgid "%sSurvey is not in open state"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Select Partner"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,date_create:0
+msgid "Create Date"
+msgstr "Data utworzenia"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_pages
+#: model:ir.model,name:survey.model_survey_page
+#: model:ir.ui.menu,name:survey.menu_survey_page_form1
+msgid "Survey Pages"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Count"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,page:0
+msgid "Page Position"
+msgstr ""
diff --git a/addons/warning/i18n/tr.po b/addons/warning/i18n/tr.po
index 9499abe9a30..ee375cb3d2f 100644
--- a/addons/warning/i18n/tr.po
+++ b/addons/warning/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:06+0000\n"
+"PO-Revision-Date: 2010-08-25 07:49+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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/wiki/i18n/tr.po b/addons/wiki/i18n/tr.po
index b889d7d79aa..8012eea9ffd 100644
--- a/addons/wiki/i18n/tr.po
+++ b/addons/wiki/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-24 06:09+0000\n"
+"PO-Revision-Date: 2010-08-25 07:57+0000\n"
 "Last-Translator: adsiz_1029@hotmail.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: 2010-08-25 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki