[MERGE]

bzr revid: uco@tinyerp.com-20100826045600-znypozwildoi1od5

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."\

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>

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:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

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)

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"/>

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"/>

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
 

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."/>

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

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

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

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

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

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

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

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

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

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

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,

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

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

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()
 

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>

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']
 

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>

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">

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>

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

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

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

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

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

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

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

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

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

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

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

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"/>

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

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

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

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

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

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

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

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

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

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

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

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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"
 

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 ""
 

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"
 

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 "Γραμμές Παραστατικού"
 

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"
 

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"
 

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"
 

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"
 

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 ""
 

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 ""
 

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 ""
 

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"
 

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 "전표 라인"
 

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 ""
 

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"
 

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 ""
 

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 ""
 

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 ""
 

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"
 

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 ""
 

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"
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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"
 

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 ""
 

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 ""
 

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 "原始凭证明细"
 

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 ""
 

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">

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
 -

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>

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>

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"

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">-->

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

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

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

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

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

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

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