[MERGE]: Merge with lp:openobject-addons

bzr revid: aag@tinyerp.com-20110823110005-lzu15tq9qzucbsth

addons/account/account.py

@@ -102,7 +102,7 @@ class account_payment_term_line(osv.osv):
                                    ('fixed', 'Fixed Amount')], 'Valuation',
                                    required=True, help="""Select here the kind of valuation related to this payment term line. Note that you should have your last line with the type 'Balance' to ensure that the whole amount will be threated."""),
 
-        'value_amount': fields.float('Value Amount', digits_compute=dp.get_precision('Payment Term'), help="For Value percent enter % ratio between 0-1."),
+        'value_amount': fields.float('Amount To Pay', digits_compute=dp.get_precision('Payment Term'), help="For percent enter a ratio between 0-1."),
         'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \
             "If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."),
         'days2': fields.integer('Day of the Month', required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."),
@@ -131,7 +131,7 @@ class account_account_type(osv.osv):
     _name = "account.account.type"
     _description = "Account Type"
     _columns = {
-        'name': fields.char('Acc. Type Name', size=64, required=True),
+        'name': fields.char('Account Type', size=64, required=True),
         'code': fields.char('Code', size=32, required=True),
         'close_method': fields.selection([('none', 'None'), ('balance', 'Balance'), ('detail', 'Detail'), ('unreconciled', 'Unreconciled')], 'Deferral Method', required=True, help="""Set here the method that will be used to generate the end of year journal entries for all the accounts of this type.
 
@@ -146,7 +146,7 @@ class account_account_type(osv.osv):
             ('expense','Profit & Loss (Expense Accounts)'),
             ('asset','Balance Sheet (Assets Accounts)'),
             ('liability','Balance Sheet (Liability Accounts)')
-        ],'P&L / BS Category', select=True, readonly=False, help="According value related accounts will be display on respective reports (Balance Sheet Profit & Loss Account)", required=True),
+        ],'P&L / BS Category', select=True, readonly=False, help="This field is used to generate legal reports: profit and loss, balance sheet.", required=True),
         'note': fields.text('Description'),
     }
     _defaults = {
@@ -358,13 +358,13 @@ class account_account(osv.osv):
             ('liquidity','Liquidity'),
             ('consolidation', 'Consolidation'),
             ('closed', 'Closed'),
-        ], 'Internal Type', required=True, help="This type is used to differentiate types with "\
-            "special effects in OpenERP: view can not have entries, consolidation are accounts that "\
+        ], 'Internal Type', required=True, help="The 'Internal Type' is used for features available on "\
+            "different types of accounts: view can not have journal items, consolidation are accounts that "\
             "can have children accounts for multi-company consolidations, payable/receivable are for "\
             "partners accounts (for debit/credit computations), closed for depreciated accounts."),
         'user_type': fields.many2one('account.account.type', 'Account Type', required=True,
-            help="These types are defined according to your country. The type contains more information "\
-            "about the account and its specificities."),
+            help="Account Type is used for information purpose, to generate "
+              "country-specific legal reports, and set the rules to close a fiscal year and generate opening entries."),
         'parent_id': fields.many2one('account.account', 'Parent', ondelete='cascade', domain=[('type','=','view')]),
         'child_parent_ids': fields.one2many('account.account','parent_id','Children'),
         'child_consol_ids': fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children'),
@@ -604,11 +604,11 @@ class account_journal(osv.osv):
         'name': fields.char('Journal Name', size=64, required=True),
         'code': fields.char('Code', size=5, required=True, help="The code will be displayed on reports."),
         'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Opening/Closing 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."\
-                                 " Select 'General' for miscellaneous operations."\
-                                 " Select 'Opening/Closing Situation' to be used at the time of new fiscal year creation or end of year entries generation."),
+                                 help="Select 'Sale' for customer invoices journals."\
+                                 " Select 'Purchase' for supplier invoices journals."\
+                                 " Select 'Cash' or 'Bank' for journals that are used in customer or supplier payments."\
+                                 " Select 'General' for miscellaneous operations journals."\
+                                 " Select 'Opening/Closing Situation' for entries generated for new fiscal years."),
         'type_control_ids': fields.many2many('account.account.type', 'account_journal_type_rel', 'journal_id','type_id', 'Type Controls', domain=[('code','<>','view'), ('code', '<>', 'closed')]),
         'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]),
         'view_id': fields.many2one('account.journal.view', 'Display Mode', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tells OpenERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."),

addons/account/i18n/ca.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: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: account

addons/account/i18n/es.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: 2011-08-19 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: account

addons/account_analytic_plans/i18n/ca.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: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: account_analytic_plans

addons/account_asset/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: account_asset

addons/account_followup/i18n/ca.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: 2011-08-19 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: account_followup

addons/account_payment/i18n/ca.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: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: account_payment

addons/account_sequence/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: account_sequence

addons/base_module_quality/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: base_module_quality
@@ -57,7 +57,7 @@ msgstr ""
 #: code:addons/base_module_quality/speed_test/speed_test.py:127
 #, python-format
 msgid "O(n) or worst"
-msgstr ""
+msgstr "O(n) o pitjor"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0

addons/base_tools/i18n/ar.po

@@ -0,0 +1,32 @@
+# Arabic translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-08-23 01:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-08-23 05:05+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
+
+#. module: base_tools
+#: model:ir.module.module,shortdesc:base_tools.module_meta_information
+msgid "Common base for tools modules"
+msgstr "قاعدة أساسية لأدوات البرامج"
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
+"\n"
+"    "

addons/caldav/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: caldav

addons/crm/i18n/ca.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: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: crm

addons/crm_claim/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: crm_claim

addons/document_ftp/test_easyftp.py

@@ -36,13 +36,13 @@ def get_plain_ftp(timeout=10.0):
 
 def get_ftp_login(cr, uid, ormobj):
     ftp = get_plain_ftp()
-    user = ormobj.pool.get('res.users').read(cr, uid, uid)
-    passwd = user.get('password','')
+    user = ormobj.pool.get('res.users').browse(cr, uid, uid)
+    passwd = user.password or ''
     if passwd.startswith("$1$"):
-        # md5 by base crypt. We cannot decode, wild guess 
+        # md5 by base crypt. We cannot decode, wild guess
         # that passwd = login
-        passwd = user.get('login', '')
-    ftp.login(user.get('login',''), passwd)
+        passwd = user.login
+    ftp.login(user.login, passwd)
     ftp.cwd("/" + cr.dbname)
     return ftp
 

addons/document_webdav/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: document_webdav

addons/email_template/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: email_template

addons/hr_payroll_account/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: hr_payroll_account

addons/hr_recruitment/security/ir.model.access.csv

@@ -9,3 +9,5 @@
 "access_survey_hr_user","survey.hr.user","survey.model_survey","base.group_hr_user",1,1,1,0
 "access_crm_phonecall_hruser","crm.phonecall hruser","crm.model_crm_phonecall","base.group_hr_user",1,1,1,1
 "access_crm_meeting_hruser","crm.meeting.hruser","crm.model_crm_meeting","base.group_hr_user",1,1,1,1
+"access_hr_recruitment_source_hr_officer","hr.recruitment.source","model_hr_recruitment_source","base.group_hr_user",1,1,1,1
+"access_hr_recruitment_source_all","hr.recruitment.source","model_hr_recruitment_source",,1,0,0,0

addons/hr_timesheet_invoice/i18n/ca.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: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: hr_timesheet_invoice

addons/l10n_be_invoice_bba/invoice.py

@@ -180,6 +180,8 @@ class account_invoice(osv.osv):
         return super(account_invoice, self).create(cr, uid, vals, context=context)     
 
     def write(self, cr, uid, ids, vals, context={}):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         for inv in self.browse(cr, uid, ids, context):    
             if vals.has_key('reference_type'):
                 reference_type = vals['reference_type']

addons/l10n_in/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: l10n_chart_in

addons/l10n_syscohada/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: l10n_syscohada

addons/marketing/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: marketing

addons/mrp/i18n/ca.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: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: mrp

addons/point_of_sale/i18n/ca.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: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: point_of_sale

addons/portal/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: portal

addons/project/i18n/ca.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: 2011-08-18 04:34+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: project

addons/project_issue/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: project_issue

addons/project_long_term/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-19 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: project_long_term

addons/project_messages/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: project_messages

addons/project_scrum/i18n/ca.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: 2011-08-19 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: project_scrum

addons/project_scrum/i18n/zh_CN.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: 2011-08-17 04:41+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: project_scrum

addons/purchase/i18n/ca.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: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: purchase

addons/purchase_requisition/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: purchase_requisition

addons/report_webkit/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: report_webkit

addons/resource/i18n/es_EC.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-17 04:41+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: resource

addons/sale_crm/i18n/ca.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: 2011-08-19 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: sale_crm

addons/share/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-19 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: share

addons/stock/i18n/ca.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: 2011-08-19 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: stock

addons/stock/product.py

@@ -224,8 +224,6 @@ class product_product(osv.osv):
         if context.get('compute_child',True):
             child_location_ids = location_obj.search(cr, uid, [('location_id', 'child_of', location_ids)])
             location_ids = child_location_ids or location_ids
-        else:
-            location_ids = location_ids
 
         uoms_o = {}
         product2uom = {}

addons/stock_planning/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-19 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: stock_planning