[MERGE]

bzr revid: uco@tinyerp.com-20100827044426-7bcgxam4icqsmhqs

addons/account/account.py

@@ -2624,13 +2624,13 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
         data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view_multi')])
         data = data_pool.browse(cr, uid, data_id[0])
-        ref_acc_bank = data.res_id
+        view_id_cur = data.res_id
         ref_acc_bank = obj_multi.chart_template_id.bank_account_view_id
 
         current_num = 1
         for line in obj_multi.bank_accounts_id:
             #create the account_account for this bank journal
-            tmp = self.pool.get('res.partner.bank').name_get(cr, uid, [line.acc_no.id])[0][1]
+            tmp = line.acc_name
             dig = obj_multi.code_digits
             if ref_acc_bank.code:
                 try:
@@ -2638,7 +2638,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 except Exception,e:
                     new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)),'0')) + str(current_num)
             vals = {
-                'name': line.acc_no.bank and line.acc_no.bank.name+' '+tmp or tmp,
+                'name': tmp,
                 'currency_id': line.currency_id and line.currency_id.id or False,
                 'code': new_code,
                 'type': 'other',

addons/account/account_invoice_view.xml

@@ -65,9 +65,8 @@
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="base.group_extended"/>
                             <newline/>
                             <field name="price_subtotal"/>
-
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','!=',False),('company_id', '=', parent.company_id)]"/>
+                            <field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>

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-25 07:56+0000\n"
+"PO-Revision-Date: 2010-08-26 08:45+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-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account

addons/account/i18n/de.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+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-25 07:58+0000\n"
+"PO-Revision-Date: 2010-08-26 09:29+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+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-25 07:55+0000\n"
+"PO-Revision-Date: 2010-08-26 08:44+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-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+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-25 07:43+0000\n"
+"PO-Revision-Date: 2010-08-26 07:41+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-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:40+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-25 07:44+0000\n"
+"PO-Revision-Date: 2010-08-26 07:41+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:40+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-25 07:19+0000\n"
+"PO-Revision-Date: 2010-08-26 07:30+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-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+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-25 07:58+0000\n"
+"PO-Revision-Date: 2010-08-26 09:18+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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:40+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-25 07:43+0000\n"
+"PO-Revision-Date: 2010-08-26 07:39+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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:40+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-25 07:28+0000\n"
+"PO-Revision-Date: 2010-08-26 07:34+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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account

addons/account/invoice.py

@@ -874,7 +874,7 @@ class account_invoice(osv.osv):
 
             line = self.group_lines(cr, uid, iml, line, inv)
 
-            journal_id = inv.journal_id.id 
+            journal_id = inv.journal_id.id
             journal = self.pool.get('account.journal').browse(cr, uid, journal_id)
             if journal.centralisation:
                 raise osv.except_osv(_('UserError'),
@@ -1496,12 +1496,18 @@ class account_invoice_tax(osv.osv):
     def amount_change(self, cr, uid, ids, amount, currency_id=False, company_id=False, date_invoice=False):
         cur_obj = self.pool.get('res.currency')
         company_obj = self.pool.get('res.company')
-        company_currency=False
+        company_currency = False
+        tax_amount = self.read(cr, uid, ids[0], ['tax_amount'])['tax_amount']
+        tax_sign=1
+        if tax_amount < 0:
+            tax_sign = -1
+        elif tax_amount == 0:
+            tax_sign = 0
         if company_id:
             company_currency = company_obj.read(cr, uid, [company_id], ['currency_id'])[0]['currency_id'][0]
         if currency_id and company_currency:
-            amount = cur_obj.compute(cr, uid, currency_id, company_currency, amount, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+            amount = cur_obj.compute(cr, uid, currency_id, company_currency, amount*tax_sign, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-        return {'value': {'tax_amount':amount}}
+        return {'value': {'tax_amount': amount}}
 
     _order = 'sequence'
     _defaults = {

addons/account/wizard/account_invoice_refund.py

@@ -36,7 +36,7 @@ class account_invoice_refund(osv.osv_memory):
        'period': fields.many2one('account.period', 'Force period'),
        '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'),
+       'filter_refund': fields.selection([('modify', 'Modify'), ('refund', 'Refund'), ('cancel', 'Cancel')], "Refund Type", required=True, help='Refund invoice base on this type. You can not Modify and Cancel if the invoice is already rencociled'),
     }
 
     def _get_journal(self, cr, uid, context=None):
@@ -84,6 +84,8 @@ class account_invoice_refund(osv.osv_memory):
             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))
+                if inv.reconciled and mode in ('cancel', 'modify'):
+                    raise osv.except_osv(_('Error !'), _('Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice') % (mode))
                 if form['period'] :
                     period = form['period']
                 else:

addons/account/wizard/account_statement_from_invoice.py

@@ -64,10 +64,10 @@ class account_statement_from_invoice_lines(osv.osv_memory):
                 amount = -line.credit
 
             if line.amount_currency:
-                amount = currency_obj.compute(cursor, user, line.currency_id.id,
+                amount = currency_obj.compute(cr, uid, line.currency_id.id,
                     statement.currency.id, line.amount_currency, context=ctx)
             elif (line.invoice and line.invoice.currency_id.id <> statement.currency.id):
-                amount = currency_obj.compute(cursor, user, line.invoice.currency_id.id,
+                amount = currency_obj.compute(cr, uid, line.invoice.currency_id.id,
                     statement.currency.id, amount, context=ctx)
 
             reconcile_id = statement_reconcile_obj.create(cr, uid, {

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-25 07:46+0000\n"
+"PO-Revision-Date: 2010-08-26 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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:40+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-25 08:02+0000\n"
+"PO-Revision-Date: 2010-08-26 09:42+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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:40+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-25 07:55+0000\n"
+"PO-Revision-Date: 2010-08-26 08:43+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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:40+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-25 07:47+0000\n"
+"PO-Revision-Date: 2010-08-26 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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:40+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-25 07:47+0000\n"
+"PO-Revision-Date: 2010-08-26 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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+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-25 07:48+0000\n"
+"PO-Revision-Date: 2010-08-26 07:56+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+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-25 07:47+0000\n"
+"PO-Revision-Date: 2010-08-26 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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:40+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-25 07:45+0000\n"
+"PO-Revision-Date: 2010-08-26 07:43+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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:40+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-25 07:54+0000\n"
+"PO-Revision-Date: 2010-08-26 08:41+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+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-25 07:53+0000\n"
+"PO-Revision-Date: 2010-08-26 08:32+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-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+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-25 07:28+0000\n"
+"PO-Revision-Date: 2010-08-26 06:50+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-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda

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-25 07:44+0000\n"
+"PO-Revision-Date: 2010-08-26 07:42+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+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-25 07:48+0000\n"
+"PO-Revision-Date: 2010-08-26 08:01+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+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-25 06:04+0000\n"
+"PO-Revision-Date: 2010-08-26 07:26+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+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-25 07:52+0000\n"
+"PO-Revision-Date: 2010-08-26 08:23+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+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-25 08:03+0000\n"
+"PO-Revision-Date: 2010-08-26 09:54+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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:40+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-25 08:04+0000\n"
+"PO-Revision-Date: 2010-08-26 10:06+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:40+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-25 07:49+0000\n"
+"PO-Revision-Date: 2010-08-26 08:18+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-26 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:38+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-25 07:57+0000\n"
+"PO-Revision-Date: 2010-08-26 08: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-26 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:38+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-25 05:58+0000\n"
+"PO-Revision-Date: 2010-08-26 07:25+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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+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-25 07:57+0000\n"
+"PO-Revision-Date: 2010-08-26 09:02+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+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-25 07:50+0000\n"
+"PO-Revision-Date: 2010-08-26 08:22+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-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include

addons/account_voucher/i18n/el.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-03 02:48+0000\n"
+"PO-Revision-Date: 2010-08-26 21:26+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"Last-Translator: Makis Nicolaou <mark.nicolaou@gmail.com>\n"
 "Language-Team: Greek <el@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-12 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher

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-25 07:53+0000\n"
+"PO-Revision-Date: 2010-08-26 08:27+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher

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-25 07:51+0000\n"
+"PO-Revision-Date: 2010-08-26 08:23+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher

addons/account_voucher/voucher_payment_receipt_view.xml

@@ -161,18 +161,5 @@
         </record>
         <menuitem action="action_vendor_receipt" icon="STOCK_JUSTIFY_FILL" sequence="16"
             id="menu_action_vendor_receipt"  parent="account.menu_finance_receivables"/>
-        
-        <record id="action_cheque_pay" model="ir.actions.act_window">
-            <field name="name">Cheques</field>
-            <field name="res_model">account.voucher.open</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('journal_id.type', 'in', ['bank']), ('type','=','payment')]</field>
-            <field name="context">{'journal_type':'bank', 'type':'payment'}</field>
-            <field name="view_id" ref="account_open_vouchers_view"/>
-            <field name="target">new</field>
-        </record>
-
-        <menuitem action="action_cheque_pay" icon="STOCK_JUSTIFY_FILL" sequence="16"
-            id="menu_action_cheque_pay" parent="account.menu_finance_bank_and_cash"/>
     </data>
 </openerp>

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-25 07:28+0000\n"
+"PO-Revision-Date: 2010-08-26 07:36+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-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+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-25 06:01+0000\n"
+"PO-Revision-Date: 2010-08-26 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-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+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-25 06:08+0000\n"
+"PO-Revision-Date: 2010-08-26 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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+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-25 07:52+0000\n"
+"PO-Revision-Date: 2010-08-26 08:25+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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+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-25 07:28+0000\n"
+"PO-Revision-Date: 2010-08-26 07:34+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+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-25 08:04+0000\n"
+"PO-Revision-Date: 2010-08-26 10:13+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-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+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-25 07:26+0000\n"
+"PO-Revision-Date: 2010-08-26 07:33+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail

addons/audittrail/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 07:27+0000\n"
+"PO-Revision-Date: 2010-08-26 07:33+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail

addons/base_action_rule/base_action_rule.py

@@ -181,10 +181,12 @@ the rule to mark CC(mail to any other person defined in actions)."),
         for action_rule in self.browse(cr, uid, ids, context=context):
             model = action_rule.model_id.model
             obj_pool = self.pool.get(model)
-            obj_pool.__setattr__('create', self._create(obj_pool.create, model, context=context))
+            if not hasattr(obj_pool, 'base_action_ruled'):
-            obj_pool.__setattr__('write', self._write(obj_pool.write, model, context=context))
+                obj_pool.create = self._create(obj_pool.create, model, context=context)
-        return True
+                obj_pool.write = self._write(obj_pool.write, model, context=context)
+                obj_pool.base_action_ruled = True
 
+        return True
     def create(self, cr, uid, vals, context=None):
         res_id = super(base_action_rule, self).create(cr, uid, vals, context)
         self._register_hook(cr, uid, [res_id], context=context)        

addons/base_contact/i18n/lt.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 07:45+0000\n"
+"PO-Revision-Date: 2010-08-26 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-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 

addons/base_contact/i18n/tr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 08:03+0000\n"
+"PO-Revision-Date: 2010-08-26 10:01+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact

addons/base_contact/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 07:58+0000\n"
+"PO-Revision-Date: 2010-08-26 09:06+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact

addons/base_iban/i18n/ru.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 03:37+0000\n"
+"PO-Revision-Date: 2010-08-26 18:11+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"Last-Translator: Chertykov Denis <chertykov@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-12 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
@@ -34,7 +34,7 @@ msgstr "Международный номер банковского счета
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
 msgid "country_id"
-msgstr ""
+msgstr "Интендификатор страны"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field

addons/base_iban/i18n/tr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 07:58+0000\n"
+"PO-Revision-Date: 2010-08-26 09:13+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-26 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban

addons/base_module_quality/i18n/ru.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-03 03:42+0000\n"
+"PO-Revision-Date: 2010-08-26 18:08+0000\n"
-"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
+"Last-Translator: Chertykov Denis <chertykov@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-12 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
@@ -70,6 +70,7 @@ msgid ""
 "Some tests are more critical than others, so they have a bigger weight in "
 "the computation of final rating"
 msgstr ""
+"При вычислении итогового рейтинга более важные тесты имеют больший вес."
 
 #. module: base_module_quality
 #: view:module.quality.check:0

addons/base_module_quality/i18n/tr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 06:11+0000\n"
+"PO-Revision-Date: 2010-08-26 07:27+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality

addons/base_module_record/i18n/tr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 07:26+0000\n"
+"PO-Revision-Date: 2010-08-26 07:33+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-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record

addons/base_report_creator/i18n/tr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 07:45+0000\n"
+"PO-Revision-Date: 2010-08-26 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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator

addons/base_report_designer/i18n/tr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 07:36+0000\n"
+"PO-Revision-Date: 2010-08-26 07:17+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer

addons/base_setup/i18n/ru.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-02 17:28+0000\n"
+"PO-Revision-Date: 2010-08-26 17:38+0000\n"
-"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
+"Last-Translator: Chertykov Denis <chertykov@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-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -91,7 +91,7 @@ msgstr "Эл.почта"
 #: wizard_field:base_setup.base_setup,init,state_id:0
 #: wizard_field:base_setup.base_setup,update,state_id:0
 msgid "State"
-msgstr "Состояние"
+msgstr "Область/штат"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0

addons/base_setup/i18n/tr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 07:49+0000\n"
+"PO-Revision-Date: 2010-08-26 08:06+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-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup

addons/base_vat/i18n/tr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 07:53+0000\n"
+"PO-Revision-Date: 2010-08-26 08: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-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat

addons/board/i18n/tr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 07:49+0000\n"
+"PO-Revision-Date: 2010-08-26 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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board

addons/crm/crm_lead.py

@@ -344,7 +344,7 @@ class crm_lead(crm_case, osv.osv):
         if isinstance(ids, (str, int, long)):
             ids = [ids]
 
-        if msg.get('priority'):
+        if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
             vals['priority'] = msg.get('priority')
 
         maps = {

addons/crm/i18n/fi.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-25 18:50+0000\n"
+"PO-Revision-Date: 2010-08-26 07:01+0000\n"
-"Last-Translator: Heikki Kulhia <Unknown>\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-26 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm

addons/crm/i18n/hr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-25 06:43+0000\n"
+"PO-Revision-Date: 2010-08-26 07:13+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 

addons/crm/i18n/lt.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-25 07:31+0000\n"
+"PO-Revision-Date: 2010-08-26 07:19+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-26 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 

addons/crm/i18n/pl.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-25 19:54+0000\n"
+"PO-Revision-Date: 2010-08-26 07:02+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\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-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm

addons/crm/i18n/pt.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-25 07:31+0000\n"
+"PO-Revision-Date: 2010-08-26 07:22+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-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm

addons/crm/i18n/sk.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-25 06:31+0000\n"
+"PO-Revision-Date: 2010-08-26 07:21+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm

addons/crm/i18n/tr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-25 07:30+0000\n"
+"PO-Revision-Date: 2010-08-26 07:14+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm

addons/crm_profiling/i18n/pl.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 19:09+0000\n"
+"PO-Revision-Date: 2010-08-26 06:38+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\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-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling

addons/crm_profiling/i18n/tr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 08:02+0000\n"
+"PO-Revision-Date: 2010-08-26 09:39+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling

addons/delivery/i18n/ru.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 07:26+0000\n"
+"PO-Revision-Date: 2010-08-26 07:32+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-26 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery

addons/delivery/i18n/tr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 07:46+0000\n"
+"PO-Revision-Date: 2010-08-26 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-26 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery

addons/document/i18n/mn.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 07:34+0000\n"
+"PO-Revision-Date: 2010-08-26 06:44+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document

addons/document/i18n/ru.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 08:03+0000\n"
+"PO-Revision-Date: 2010-08-26 10:04+0000\n"
 "Last-Translator: devcode <klaider@yandex.ru>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document

addons/document/i18n/tr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 08:01+0000\n"
+"PO-Revision-Date: 2010-08-26 09:34+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document

addons/document/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 07:53+0000\n"
+"PO-Revision-Date: 2010-08-26 08:29+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document

addons/document_ics/i18n/tr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 07:31+0000\n"
+"PO-Revision-Date: 2010-08-26 07:22+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-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics

addons/document_ics/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 07:28+0000\n"
+"PO-Revision-Date: 2010-08-26 07:22+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics

addons/hr/hr_department.py

@@ -119,7 +119,7 @@ class res_users(osv.osv):
         result = {}
         obj_dept = self.pool.get('hr.department')
         for user_id in ids:
-            emp_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', user_id)])
+            emp_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', user_id)], context=context)
             cr.execute('SELECT emp.department_id FROM hr_employee AS emp \
                         JOIN resource_resource AS res ON res.id = emp.resource_id \
                         JOIN hr_department as dept ON dept.id = emp.department_id \
@@ -130,8 +130,8 @@ class res_users(osv.osv):
                 data_dept = obj_dept.read(cr, uid, ids_dept, ['manager_id'], context=context)
                 parent_ids = map(lambda x: x['manager_id'][0], data_dept)
                 cr.execute('SELECT res.user_id FROM hr_employee AS emp JOIN resource_resource AS res ON res.id=emp.resource_id \
-                        WHERE emp.id IN %s', (tuple(parent_ids),))
+                        WHERE emp.id IN %s AND res.user_id IS NOT NULL', (tuple(parent_ids),))
-                parent_ids = [x[0] for x in cr.fetchall() if x[0]]
+                parent_ids = [x[0] for x in cr.fetchall()]
             result[user_id] = parent_ids
         return result
 

addons/hr/i18n/lt.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 06:33+0000\n"
+"PO-Revision-Date: 2010-08-26 07:21+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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr

addons/hr/i18n/pt_BR.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 07:28+0000\n"
+"PO-Revision-Date: 2010-08-26 07:12+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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr

addons/hr/i18n/tr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 06:22+0000\n"
+"PO-Revision-Date: 2010-08-26 07:28+0000\n"
 "Last-Translator: adsiz_1029@hotmail.com <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr

addons/hr/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 07:28+0000\n"
+"PO-Revision-Date: 2010-08-26 06:55+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr

addons/hr_attendance/hr_attendance.py

@@ -72,13 +72,13 @@ class hr_attendance(osv.osv):
     def _altern_si_so(self, cr, uid, ids):
         for id in ids:
             sql = '''
-            select action, name
+            SELECT action, name
-            from hr_attendance as att
+            FROM hr_attendance AS att
-            where employee_id = (select employee_id from hr_attendance where id=%s)
+            WHERE employee_id = (SELECT employee_id FROM hr_attendance WHERE id=%s)
-            and action in ('sign_in','sign_out')
+            AND action IN ('sign_in','sign_out')
-            and name <= (select name from hr_attendance where id=%s)
+            AND name <= (SELECT name FROM hr_attendance WHERE id=%s)
-            order by name desc
+            ORDER BY name DESC
-            limit 2 '''
+            LIMIT 2 '''
             cr.execute(sql,(id,id))
             atts = cr.fetchall()
             if not ((len(atts)==1 and atts[0][0] == 'sign_in') or (atts[0][0] != atts[1][0] and atts[0][1] != atts[1][1])):
@@ -117,12 +117,12 @@ class hr_employee(osv.osv):
 
     _columns = {
        'state': fields.function(_state, method=True, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'),
-     }
+    }
 
     def _action_check(self, cr, uid, emp_id, dt=False, context=None):
         if context is None:
             context = {}
-        cr.execute('select max(name) from hr_attendance where employee_id=%s', (emp_id,))
+        cr.execute('SELECT MAX(name) FROM hr_attendance WHERE employee_id=%s', (emp_id,))
         res = cr.fetchone()
         return not (res and (res[0]>=(dt or time.strftime('%Y-%m-%d %H:%M:%S'))))
 

addons/hr_attendance/i18n/fi.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 07:11+0000\n"
+"PO-Revision-Date: 2010-08-26 07:12+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-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance

addons/hr_attendance/i18n/pt_BR.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 06:38+0000\n"
+"PO-Revision-Date: 2010-08-26 07:17+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance

addons/hr_attendance/i18n/tr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 08:06+0000\n"
+"PO-Revision-Date: 2010-08-26 07:14+0000\n"
 "Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance

addons/hr_attendance/wizard/hr_attendance_error.py

@@ -45,7 +45,7 @@ class hr_attendance_error(osv.osv_memory):
         data_error = self.read(cr, uid, ids, context=context)[0]
         date_from = data_error['init_date']
         date_to = data_error['end_date']
-        cr.execute("select id from hr_attendance where employee_id IN %s and to_char(name,'YYYY-mm-dd')<=%s and to_char(name,'YYYY-mm-dd')>=%s and action IN %s order by name" ,(tuple(context['active_ids']), date_to, date_from, tuple(['sign_in','sign_out'])))
+        cr.execute("SELECT id FROM hr_attendance WHERE employee_id IN %s AND to_char(name,'YYYY-mm-dd')<=%s AND to_char(name,'YYYY-mm-dd')>=%s AND action IN %s ORDER BY name" ,(tuple(context['active_ids']), date_to, date_from, tuple(['sign_in','sign_out'])))
         attendance_ids = [x[0] for x in cr.fetchall()]
         if not attendance_ids:
             raise osv.except_osv(_('No Data Available'), _('No records found for your selection!'))

addons/hr_contract/hr_contract.py

@@ -58,10 +58,10 @@ class hr_contract_wage_type_period(osv.osv):
     _columns = {
         'name': fields.char('Period Name', size=50, required=True, select=True),
         'factor_days': fields.float('Hours in the period', digits=(12,4), required=True, help='This field is used by the timesheet system to compute the price of an hour of work wased on the contract of the employee')
-        }
+    }
     _defaults = {
         'factor_days': 168.0
-        }
+    }
 hr_contract_wage_type_period()
 
 #Contract wage type (hourly, daily, monthly, ...)
@@ -73,11 +73,11 @@ class hr_contract_wage_type(osv.osv):
         'period_id': fields.many2one('hr.contract.wage.type.period', 'Wage Period', required=True),
         'type': fields.selection([('gross','Gross'), ('net','Net')], 'Type', required=True),
         'factor_type': fields.float('Factor for hour cost', digits=(12,4), required=True, help='This field is used by the timesheet system to compute the price of an hour of work wased on the contract of the employee')
-        }
+    }
     _defaults = {
         'type': 'gross',
         'factor_type': 1.8
-        }
+    }
 hr_contract_wage_type()
 
 
@@ -107,10 +107,10 @@ class hr_contract(osv.osv):
         'advantages_net': fields.float('Net Advantages Value', digits=(16,2)),
         'advantages_gross': fields.float('Gross Advantages Value', digits=(16,2)),
         'notes': fields.text('Notes'),
-        }
+    }
     _defaults = {
         'date_start': time.strftime("%Y-%m-%d"),
-        }
+    }
 
 hr_contract()
 

addons/hr_contract/i18n/tr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 06:20+0000\n"
+"PO-Revision-Date: 2010-08-26 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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract

addons/hr_evaluation/hr_evaluation.py

@@ -274,10 +274,10 @@ class survey_request(osv.osv):
     _inherit = "survey.request"
     _columns = {
         'is_evaluation': fields.boolean('Is Evaluation?'),
-        }
+    }
     _defaults = {
         'state': 'waiting_answer',
-        }
+    }
 
 survey_request()
 

addons/hr_expense/hr_expense.py

@@ -190,7 +190,7 @@ class hr_expense_expense(osv.osv):
             invoice_obj.button_compute(cr, uid, [inv_id], {'type': 'in_invoice'}, set_total=True)
             wf_service = netsvc.LocalService("workflow")
             wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_open', cr)
-            
+
             self.write(cr, uid, [exp.id], {'invoice_id': inv_id, 'state': 'invoiced'})
             res = inv_id
         return res
@@ -201,7 +201,7 @@ class product_product(osv.osv):
     _inherit = "product.product"
     _columns = {
         'hr_expense_ok': fields.boolean('Can Constitute an Expense', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."),
-                }
+    }
 
 product_product()
 
@@ -235,7 +235,7 @@ class hr_expense_line(osv.osv):
     _defaults = {
         'unit_quantity': 1,
         'date_value': time.strftime('%Y-%m-%d'),
-        }
+    }
     _order = "sequence"
 
     def onchange_product_id(self, cr, uid, ids, product_id, uom_id, employee_id, context=None):

addons/hr_expense/i18n/pt_BR.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 06:51+0000\n"
+"PO-Revision-Date: 2010-08-26 07:03+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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense

addons/hr_expense/i18n/ru.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense

addons/hr_expense/i18n/tr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-25 06:45+0000\n"
+"PO-Revision-Date: 2010-08-26 07:09+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-26 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense

addons/hr_holidays/hr_holidays.py

@@ -108,7 +108,7 @@ class hr_holidays_status(osv.osv):
     _defaults = {
         'color_name': 'red',
         'active': True,
-        }
+    }
 
 hr_holidays_status()
 
@@ -147,7 +147,7 @@ class hr_holidays(osv.osv):
         'category_id': fields.many2one('hr.employee.category', "Category", help='Category Of employee'),
         'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Holiday Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category'),
         'manager_id2': fields.many2one('hr.employee', 'Second Validator', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)')
-            }
+    }
 
     _defaults = {
         'employee_id': _employee_get ,
@@ -156,7 +156,7 @@ class hr_holidays(osv.osv):
         'allocation_type': 'employee',
         'user_id': lambda obj, cr, uid, context: uid,
         'holiday_type': 'employee'
-        }
+    }
 
     def _create_resource_leave(self, cr, uid, vals, context=None):
         '''This method will create entry in resource calendar leave object at the time of holidays validated '''
@@ -452,7 +452,7 @@ class resource_calendar_leaves(osv.osv):
     _description = "Leave Detail"
     _columns = {
         'holiday_id': fields.many2one("hr.holidays", "Holiday"),
-        }
+    }
 
 resource_calendar_leaves()