[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm

bzr revid: atp@tinyerp.com-20110216070922-3ywxzy0h8ejfk79z

addons/account/account.py

@@ -424,7 +424,7 @@ class account_account(osv.osv):
             context = {}
         accounts = self.browse(cr, uid, ids, context=context)
         for account in accounts:
-            if account.child_id and account.type != 'view':
+            if account.child_id and account.type not in ('view', 'consolidation'):
                 return False
         return True
 

addons/account/i18n/de.po

@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-18 12:10+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2011-02-13 22:46+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-19 04:43+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -4630,7 +4629,7 @@ msgstr "Fehler"
 #: field:account.analytic.cost.ledger.journal.report,date2:0
 #: field:account.analytic.inverted.balance,date2:0
 msgid "End of period"
-msgstr "Ende der Periode"
+msgstr "Ende Periode"
 
 #. module: account
 #: view:res.partner:0
@@ -9782,7 +9781,7 @@ msgstr "Rechnungspositionen"
 #: field:account.report.general.ledger,period_to:0
 #: field:account.vat.declaration,period_to:0
 msgid "End period"
-msgstr "Ende der Periode"
+msgstr "Ende Periode"
 
 #. module: account
 #: code:addons/account/account_move_line.py:738

addons/base_calendar/base_calendar.py

@@ -1473,7 +1473,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
             if not real_event_id in new_ids:
                 new_ids.append(real_event_id)
 
-        if vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
+        if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
             vals['vtimezone'] = vals['vtimezone'][40:]
 
         updated_vals = self.onchange_dates(cr, uid, new_ids,

addons/base_module_record/wizard/base_module_record_objects.py

@@ -90,7 +90,7 @@ def _record_objects(self, cr, uid, data, context):
         for s_id in search_ids:
              args=(cr.dbname,uid,obj_name,'copy',s_id,{},context)
              mod.recording_data.append(('query',args, {}, s_id))
-    return {'type': 'ir.actions.act_window_close'}
+    return {}
 
 def inter_call(self,cr,uid,data,context):
     res=base_module_save._create_module(self,cr, uid, data, context)

addons/base_module_record/wizard/base_module_save.py

@@ -77,7 +77,7 @@ intro_save_form = '''<?xml version="1.0"?>
     <newline/>
     <field name="module_file" filename="module_filename"/>
     <separator string="Information" colspan="4"/>
-     <label string="If you think your module could interest others people, we'd like you to publish it on OpenERP.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module." colspan="4" align="0.0"/>
+     <label string="If you think your module could interest other people, we'd like you to publish it on http://www.openerp.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module." colspan="4" align="0.0"/>
     <label string="Thanks in advance for your contribution." colspan="4" align="0.0"/>
 </form>'''
 
@@ -161,7 +161,7 @@ def _create_module(self, cr, uid, data, context):
 } """ % data['form']
     filewrite = {
         '__init__.py':'#\n# Generated by the OpenERP module recorder !\n#\n',
-        '__terp__.py':_terp,
+        '__openerp__.py':_terp,
         dname+'_data.xml': res_xml
     }
     for name,datastr in filewrite.items():

addons/crm_partner_assign/wizard/crm_forward_to_partner.py

@@ -270,6 +270,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         defaults.update({
             'subject' : '%s: %s' % (_('Fwd'), lead.name),
             'body' : body,
+            'email_cc' : ''
         })
         return defaults
 

addons/email_template/email_template_account_view.xml

@@ -96,7 +96,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
             <field name="view_id" ref="email_template_account_tree" />
-            <field name="context">{'group_by': [], 'search_default_draft': 1, 'search_default_my': 1}</field>
+            <field name="context">{'search_default_draft': 1, 'search_default_my': 1}</field>
             <field name="search_view_id" ref="view_email_template_account_search"/>
         </record>
 

addons/email_template/email_template_mailbox_view.xml

@@ -105,7 +105,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_email_template_mailbox_tree" />
-            <field name="context">{'group_by': [], 'search_default_outbox': 1}</field>
+            <field name="context">{'search_default_outbox': 1}</field>
             <field name="help">An email template is an email document that will be sent as part of a marketing campaign. You can personalize it according to specific customer profile fields, so that a partner name or other partner related information may be inserted automatically.</field>
             <field name="search_view_id" ref="view_email_template_mailbox_search"/>
         </record>

addons/hr/hr_view.xml

@@ -82,7 +82,6 @@
             <field name="name">hr.employee.tree</field>
             <field name="model">hr.employee</field>
             <field name="type">tree</field>
-            <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <tree string="Employees">
                     <field name="name"/>

addons/hr_timesheet/i18n/id.po

@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2009-11-09 13:50+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-02-14 13:44+0000\n"
+"Last-Translator: moelyana <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-15 05:32+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
 msgid "Service on Timesheet"
-msgstr ""
+msgstr "Pelayanan Timesheet"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:42
@@ -31,18 +31,18 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "(Keep empty for current_time)"
-msgstr ""
+msgstr "(Tetap kosongkan untuk waktu saat ini)"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "No employee defined for your user !"
-msgstr ""
+msgstr "Tidak ada karyawan yang didefinisikan  untuk  user Anda!"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Group By..."
-msgstr ""
+msgstr "Dikelompokan berdasarkan ..."
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
@@ -66,18 +66,18 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Stop Working"
-msgstr ""
+msgstr "Berhenti Bekerja"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_employee
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_employee
 msgid "Employee Timesheet"
-msgstr ""
+msgstr "Karyawan Timesheet"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Work done stats"
-msgstr ""
+msgstr "Status Pekerjaan yang dilakukan"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -96,12 +96,12 @@ msgstr ""
 #: code:addons/hr_timesheet/report/users_timesheet.py:76
 #, python-format
 msgid "Mon"
-msgstr ""
+msgstr "Senin"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "Sign in"
-msgstr ""
+msgstr "Login"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -115,23 +115,24 @@ msgstr ""
 #. module: hr_timesheet
 #: field:hr.sign.out.project,analytic_amount:0
 msgid "Minimum Analytic Amount"
-msgstr ""
+msgstr "Jumlah Minimum Analitik"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "Monthly Employee Timesheet"
-msgstr ""
+msgstr "Timesheet Bulanan Karyawan"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Work done in the last period"
-msgstr ""
+msgstr "Pekerjaan yang dilakukan  dalam periode terakhir"
 
 #. module: hr_timesheet
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Error! Anda tidak dapat memilih  departemen  yang karyawan adalah manajer."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,state:0
@@ -186,7 +187,7 @@ msgstr ""
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Peringatan"
 
 #. module: hr_timesheet
 #: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
@@ -197,32 +198,32 @@ msgstr ""
 #: view:hr.sign.in.project:0
 #: view:hr.sign.out.project:0
 msgid "Sign In/Out By Project"
-msgstr ""
+msgstr "Sign In / Out Berdasarkan Proyek"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:42
 #: code:addons/hr_timesheet/report/users_timesheet.py:76
 #, python-format
 msgid "Sat"
-msgstr ""
+msgstr "Sabtu"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:42
 #: code:addons/hr_timesheet/report/users_timesheet.py:76
 #, python-format
 msgid "Sun"
-msgstr ""
+msgstr "Minggu"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 #: view:hr.analytical.timesheet.users:0
 msgid "Print"
-msgstr ""
+msgstr "Cetak"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Timesheet Lines"
-msgstr ""
+msgstr "Baris Timesheet"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -233,25 +234,25 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Monthly Employees Timesheet"
-msgstr ""
+msgstr "Timesheet Bulanan Karyawan"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:39
 #: code:addons/hr_timesheet/report/users_timesheet.py:72
 #, python-format
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,date:0
 #: field:hr.sign.out.project,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Tanggal Awal"
 
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategori"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -265,6 +266,8 @@ msgid ""
 "Through Working Hours you can register your working hours by project every "
 "day."
 msgstr ""
+"Melalui Jam Kerja Anda dapat mendaftarkan jam kerja Anda menurut proyek "
+"setiap hari"
 
 #. module: hr_timesheet
 #: model:ir.module.module,description:hr_timesheet.module_meta_information
@@ -281,31 +284,46 @@ msgid ""
 "to set up a management by affair.\n"
 "    "
 msgstr ""
+"\n"
+"Modul ini menerapkan sistem Timesheet. Setiap karyawan yang dapat "
+"mengkodekan  dan\n"
+"melacak waktu mereka yang digunakan pada proyek yang berbeda. Sebuah proyek "
+"merupakan suatu\n"
+"akun analitik dan waktu yang dihabiskan untuk proyek menghasilkan biaya "
+"pada\n"
+"akun analitik.\n"
+"\n"
+"Banyak pelaporan tepat waktu dan pelacakan karyawan yang disediakan.\n"
+"\n"
+"Ia sepenuhnya terintegrasi dengan modul akuntansi biaya. Ini memungkinkan "
+"Anda\n"
+"untuk mengatur manajemen dengan adil.\n"
+"    "
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:39
 #: code:addons/hr_timesheet/report/users_timesheet.py:72
 #, python-format
 msgid "March"
-msgstr ""
+msgstr "Maret"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Total cost"
-msgstr ""
+msgstr "Total biaya"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
 #: selection:hr.analytical.timesheet.users,month:0
 msgid "décembre"
-msgstr ""
+msgstr "Desember"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:39
 #: code:addons/hr_timesheet/report/users_timesheet.py:72
 #, python-format
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
@@ -315,12 +333,12 @@ msgstr ""
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.users,employee_ids:0
 msgid "employees"
-msgstr ""
+msgstr "Karyawan"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by month"
-msgstr ""
+msgstr "Status Berdasarkan Bulan"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0

addons/hr_timesheet/report/user_timesheet.py

@@ -61,23 +61,25 @@ class report_custom(report_rml):
         date_xml.append('</days>')
         date_xml.append('<cols>2.5cm%s,2cm</cols>\n' % (',0.7cm' * lengthmonth(som.year, som.month)))
 
-        # Computing the attendence by analytical account
-        cr.execute(
-            "select line.date, (unit_amount * unit.factor) as amount, account_id, account.name "\
-            "from account_analytic_line as line, hr_analytic_timesheet as hr, "\
-            "account_analytic_account as account, product_uom as unit "\
-            "where hr.line_id=line.id and line.account_id=account.id "\
-            "and product_uom_id = unit.id "\
-            "and line.user_id=%s and line.date >= %s and line.date < %s "
-            "order by line.date",
-            (user_id, som.strftime('%Y-%m-%d'), eom.strftime('%Y-%m-%d')))
-
         # Sum attendence by account, then by day
         accounts = {}
-        for presence in cr.dictfetchall():
-            day = int(presence['date'][-2:])
-            account = accounts.setdefault((presence['account_id'], presence['name']), {})
-            account[day] = account.get(day, 0.0) + presence['amount']
+        header_xml = ''
+        if user_id:
+            # Computing the attendence by analytical account
+            cr.execute(
+                "select line.date, (unit_amount * unit.factor) as amount, account_id, account.name "\
+                "from account_analytic_line as line, hr_analytic_timesheet as hr, "\
+                "account_analytic_account as account, product_uom as unit "\
+                "where hr.line_id=line.id and line.account_id=account.id "\
+                "and product_uom_id = unit.id "\
+                "and line.user_id=%s and line.date >= %s and line.date < %s "
+                "order by line.date",
+                (user_id, som.strftime('%Y-%m-%d'), eom.strftime('%Y-%m-%d')))
+
+            for presence in cr.dictfetchall():
+                day = int(presence['date'][-2:])
+                account = accounts.setdefault((presence['account_id'], presence['name']), {})
+                account[day] = account.get(day, 0.0) + presence['amount']
 
         xml = '''
         <time-element date="%s">
@@ -85,13 +87,14 @@ class report_custom(report_rml):
         </time-element>
         '''
         rpt_obj = pooler.get_pool(cr.dbname).get('hr.employee')
-        rml_obj=report_sxw.rml_parse(cr, uid, rpt_obj._name,context)
-        header_xml = '''
-        <header>
-        <date>%s</date>
-        <company>%s</company>
-        </header>
-        ''' %  (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,user_id).company_id.name)
+        rml_obj = report_sxw.rml_parse(cr, uid, rpt_obj._name,context)
+        if user_id:
+            header_xml = '''
+            <header>
+            <date>%s</date>
+            <company>%s</company>
+            </header>
+            ''' %  (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,user_id).company_id.name)
 
         account_xml = []
         for account, telems in accounts.iteritems():

addons/l10n_ca/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-02-13 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:38+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
 
 #. module: l10n_ca

addons/l10n_de/i18n/gl.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2011-02-08 10:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-02-14 10:51+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-09 04:55+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
@@ -33,7 +33,7 @@ msgstr "Cliente da Comunidade Europea (sen USt-ID)"
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_purchase_skr03
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_purchase_skr04
 msgid "Lieferant Ausland"
-msgstr ""
+msgstr "Proveedor Estranxeiro"
 
 #. module: l10n_de
 #: model:ir.module.module,shortdesc:l10n_de.module_meta_information
@@ -45,22 +45,22 @@ msgstr "Alemaña - SKR03 e SKR04"
 msgid ""
 "Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem "
 "SKR03."
-msgstr ""
+msgstr "Este módulo implementa un sistema contable Alemán basado no SKR03."
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_purchase_skr03
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_purchase_skr04
 msgid "Lieferant EU Unternehmen (mit USt-ID)"
-msgstr ""
+msgstr "Proveedores da UE (con CIF/NIF)"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_no_id_purchase_skr03
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_no_id_purchase_skr04
 msgid "Lieferant EU (ohne Ust-ID)"
-msgstr ""
+msgstr "Proveedores da UE (sen CIF/NIF)"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_sale_skr03
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_sale_skr04
 msgid "Kunde EU Unternehmen (mit USt-ID)"
-msgstr ""
+msgstr "Clientes da UE (con CIF/NIF)"

addons/l10n_es/i18n/gl.po

@@ -0,0 +1,49 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-02-14 11:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:38+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: l10n_es
+#: model:ir.module.module,shortdesc:l10n_es.module_meta_information
+msgid "Spanish Charts of Accounts (PGCE 2008)"
+msgstr "Plan Contable Español (PGCE 2008)"
+
+#. module: l10n_es
+#: model:ir.module.module,description:l10n_es.module_meta_information
+msgid ""
+"Spanish Charts of Accounts (PGCE 2008)\n"
+"\n"
+"* Defines the following chart of account templates:\n"
+"        * Spanish General Chart of Accounts 2008.\n"
+"        * Spanish General Chart of Accounts 2008 for small and medium "
+"companies.\n"
+"* Defines templates for sale and purchase VAT.\n"
+"* Defines tax code templates.\n"
+"\n"
+"Note: You should install the l10n_ES_account_balance_report module\n"
+"for yearly account reporting (balance, profit & losses).\n"
+msgstr ""
+"Plan Contable Español (PGCE 200(\n"
+"\n"
+"* Define o seguinte plan de contas:\n"
+"        * Plan Contable Español 2008.\n"
+"        * Plan Contable Español 2008 para pequenas e medianas empresas.\n"
+"* Define as plantillas para os impostos de venta e compra.\n"
+"* Define as plantillas para os códigos dos impostos.\n"
+"\n"
+"Nota: Debería instalá-lo módulo \"l10n_ES_account_balance_report\"\n"
+"para os informes financieros anuales (balance, pérdidas e ganancias).\n"

addons/l10n_gr/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-02-13 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:38+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
 
 #. module: l10n_gr

addons/l10n_gr/i18n/gl.po

@@ -0,0 +1,47 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-02-14 10:53+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"Language-Team: Galician <gl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:38+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: l10n_gr
+#: model:ir.module.module,description:l10n_gr.module_meta_information
+msgid "This is the base module to manage the accounting chart for Greece."
+msgstr "Este é o módulo base para xestiona-lo plan contable de Grecia"
+
+#. module: l10n_gr
+#: model:ir.module.module,shortdesc:l10n_gr.module_meta_information
+msgid "Greece - minimal"
+msgstr "Grecia - mínimo"
+
+#. module: l10n_gr
+#: model:ir.actions.todo,note:l10n_gr.config_call_account_template_gr
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Xera un plan de contas a partir dun modelo xenérico. Pediráselle o nome da "
+"compañía, o modelo contable a seguir, o número de díxitos para xera-lo "
+"código das súas contas e da súa conta e divisa bancaria para crea-los "
+"diarios. Así, xerarase unha copia íntegra do modelo contable.\n"
+"\t Este é o mesmo asistente que se executa desde 'Xestión "
+"Financieira/Configuración/Contabilidade Financieira/Contas "
+"Financieiras/Xerar plan de contas dende un modelo base."

addons/l10n_gt/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-02-13 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:38+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
 
 #. module: l10n_gt

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-02-13 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
 
 #. module: l10n_in

addons/l10n_ma/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-02-13 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:38+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
 
 #. module: l10n_ma

addons/l10n_ma/i18n/gl.po

@@ -0,0 +1,89 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-02-14 11:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:38+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: l10n_ma
+#: sql_constraint:l10n.ma.line:0
+msgid "The variable name must be unique !"
+msgstr "¡O nome da variable debe ser único!"
+
+#. module: l10n_ma
+#: field:l10n.ma.line,definition:0
+msgid "Definition"
+msgstr "Definición"
+
+#. module: l10n_ma
+#: model:ir.model,name:l10n_ma.model_l10n_ma_report
+msgid "Report for l10n_ma_kzc"
+msgstr "Informe para 'l10n_ma_kzc'"
+
+#. module: l10n_ma
+#: field:l10n.ma.report,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: l10n_ma
+#: field:l10n.ma.line,name:0
+#: field:l10n.ma.report,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: l10n_ma
+#: model:ir.module.module,description:l10n_ma.module_meta_information
+msgid ""
+"Ce  Module charge le modèle du plan de comptes standard Marocain et permet "
+"de générer les états comptables aux normes marocaines (Bilan, CPC (comptes "
+"de produits et charges), balance générale à 6 colonnes, Grand livre "
+"cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet "
+"d'expertise comptable Seddik au cours du troisième trimestre 2010"
+msgstr ""
+"Este módulo soporta o modelo do Plan Contable estándar de Marrocos e pode "
+"xerar extractos contables estándar (balance, CPC (contas de ingresos e "
+"gastos), balance xeral con ata 6 columnas de contabilidade acumulada...). A "
+"integración contable validouse coa axuda da firma contable Seddik no "
+"terceiro cuarto do 2010."
+
+#. module: l10n_ma
+#: field:l10n.ma.report,line_ids:0
+msgid "Lines"
+msgstr "Liñas"
+
+#. module: l10n_ma
+#: sql_constraint:l10n.ma.report:0
+msgid "The code report must be unique !"
+msgstr "¡O código do informe debe ser único!"
+
+#. module: l10n_ma
+#: model:ir.model,name:l10n_ma.model_l10n_ma_line
+msgid "Report Lines for l10n_ma"
+msgstr "Liñas de informe para 'l10n_ma'"
+
+#. module: l10n_ma
+#: model:ir.module.module,shortdesc:l10n_ma.module_meta_information
+msgid "Maroc - Plan Comptable Général"
+msgstr "Marrocos - Plan Contable Xeral"
+
+#. module: l10n_ma
+#: field:l10n.ma.line,report_id:0
+msgid "Report"
+msgstr "Informe"
+
+#. module: l10n_ma
+#: field:l10n.ma.line,code:0
+msgid "Variable Name"
+msgstr "Nome da Variable"

addons/mail_gateway/i18n/ca.po

@@ -0,0 +1,356 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-02-13 21:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr ""
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:242
+#, python-format
+msgid " wrote on "
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:246
+#, python-format
+msgid " on "
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr ""

addons/marketing_campaign_crm_demo/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-02-13 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
 
 #. module: marketing_campaign_crm_demo

addons/outlook/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-02-13 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
 
 #. module: outlook

addons/pad/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-02-13 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
 
 #. module: pad

addons/point_of_sale/account_statement_view.xml

@@ -149,7 +149,7 @@
             sequence="4"
         />
 
-        <menuitem name="Cash register management" parent="point_of_sale.menu_point_root"
+        <menuitem name="Cash Register Management" parent="point_of_sale.menu_point_root"
             id="menu_point_open_config" sequence="1"/>
         <menuitem
             name="Open Cash Registers" parent="menu_point_open_config"

addons/project_planning/i18n/de.po

@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-10 16:53+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2011-02-13 08:18+0000\n"
+"Last-Translator: Steffi Frank (Bremskerl, DE) <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-15 05:58+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -66,7 +65,7 @@ msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
 #. module: project_planning
 #: view:board.board:0
 msgid "My Project's planning"
-msgstr "Meine geplanten Projekte"
+msgstr "Meine Projektplanung"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,timesheet:0

addons/purchase/purchase.py

@@ -257,9 +257,12 @@ class purchase_order(osv.osv):
     def onchange_dest_address_id(self, cr, uid, ids, adr_id):
         if not adr_id:
             return {}
-        part_id = self.pool.get('res.partner.address').read(cr, uid, [adr_id], ['partner_id'])[0]['partner_id'][0]
-        loc_id = self.pool.get('res.partner').browse(cr, uid, part_id).property_stock_customer.id
-        return {'value':{'location_id': loc_id, 'warehouse_id': False}}
+        values = {'warehouse_id': False}
+        part_id = self.pool.get('res.partner.address').browse(cr, uid, adr_id).partner_id
+        if part_id:
+            loc_id = part_id.property_stock_customer.id
+            values.update({'location_id': loc_id})
+        return {'value':values}
 
     def onchange_warehouse_id(self, cr, uid, ids, warehouse_id):
         if not warehouse_id:

addons/sale_crm/board_sale_crm_view.xml

@@ -65,7 +65,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="crm.board_crm_form"/>
             <field name="arch" type="xml">
-	            <xpath expr="/form/hpaned/child1/action[@name='%(crm.act_my_oppor)d']" position="after">
+	            <xpath expr="/form/hpaned/child1/action[@string='My Open Opportunities']" position="after">
 		            <action
 		                string="My Quotations"
 		                name="%(action_quotation_for_sale_crm)d"
@@ -83,7 +83,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="crm.board_crm_form"/>
             <field name="arch" type="xml">
-	            <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_sales_pipeline)d']" position="replace">
+	            <xpath expr="/form/hpaned/child2/action[@string='My Win/Lost Ratio for the Last Year']" position="replace">
 	                <action
 		                string="Monthly Turnover"
 		                name="%(action_turnover_by_month)d"
@@ -99,7 +99,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="crm.board_crm_form"/>
             <field name="arch" type="xml">
-	            <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_my_oppor_stage)d']" position="attributes">
+	            <xpath expr="/form/hpaned/child2/action[@string='My Planned Revenues by Stage']" position="attributes">
 	                <attribute name="string">Opportunities by Stage</attribute>
 	            </xpath>
             </field>

addons/share/web/controllers.py

@@ -12,18 +12,23 @@ class ShareWizardController(openerp.controllers.SecuredController):
     _cp_path = "/share"
 
     @expose()
-    def index(self, domain, search_domain, context, view_id):
+    def index(self, domain, search_domain, context, view_id, action_id=None):
         context = ast.literal_eval(context)
 
-        action_id = rpc.RPCProxy('ir.actions.act_window').search(
-            [('view_id','=',int(view_id))], context=context)
-        if not action_id: return ""
+        if not action_id:
+            # This should not be needed anymore, but just in case users are
+            # running the module with an order version of the web client...
+
+            # to remove soon-ish
+            action_id = rpc.RPCProxy('ir.actions.act_window').search(
+                [('view_id','=',int(view_id))], context=context)
+            if not action_id: return ""
+
+            action_id = action_id[0]
 
         domain = ast.literal_eval(domain)
         domain.extend(ast.literal_eval(search_domain))
 
-        action_id = action_id[0]
-
         scheme, netloc, _, _, _ = urlparse.urlsplit(cherrypy.request.base)
         share_root_url = urlparse.urlunsplit((
             scheme, netloc, '/openerp/login',

addons/share/web/editors.py

@@ -27,6 +27,7 @@ class ShareActionEditor(openobject.templating.TemplateEditor):
                                            context: jQuery("#_terp_context").val(),
                                            domain: jQuery("#_terp_domain").val(),
                                            view_id: jQuery("#_terp_view_id").val(),
+                                           action_id: jQuery("#_terp_action_id").val(),
                                            search_domain: jQuery("#_terp_search_domain").val(),
                                    }));
                                });

addons/stock_no_autopicking/i18n/id.po

@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2009-11-09 13:58+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-02-14 13:49+0000\n"
+"Last-Translator: moelyana <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-06 05:22+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Produk"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,description:stock_no_autopicking.module_meta_information
@@ -37,26 +37,39 @@ msgid ""
 "    supplier in the routing of the assembly operation.\n"
 "    "
 msgstr ""
+"\n"
+"    Modul ini memungkinkan proses memilih intermediate  untuk  menyediakan  "
+"bahan  baku\n"
+"     untuk pemesanan produksi.\n"
+"\n"
+"     Salah satu contoh penggunaan modul ini adalah untuk mengatur produksi "
+"yang dibuat menurut Anda\n"
+"     pemasok (sub-kontraktor). Untuk mencapai hal ini, mengatur produk "
+"dirakit\n"
+"     yang adalah sub-kontrak untuk \"Tidak Memilih-Auto\" dan menempatkan "
+"lokasi\n"
+"     pemasok dalam routing operasi perakitan.\n"
+"    "
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Pesanan  Pabrikan"
 
 #. module: stock_no_autopicking
 #: field:product.product,auto_pick:0
 msgid "Auto Picking"
-msgstr ""
+msgstr "Pengambilan Otomatis"
 
 #. module: stock_no_autopicking
 #: help:product.product,auto_pick:0
 msgid "Auto picking for raw materials of production orders."
-msgstr ""
+msgstr "Otomatis mengambil bahan baku dari pemesanan produksi."
 
 #. module: stock_no_autopicking
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Ada Kesalahan !! kode EAN tidak sah"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
@@ -66,4 +79,4 @@ msgstr ""
 #. module: stock_no_autopicking
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Order kuantitas tidak boleh negatif  atau nol!"

addons/wiki/web/locales/bg.po

@@ -0,0 +1,22 @@
+# Bulgarian 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: 2010-08-02 17:52+0530\n"
+"PO-Revision-Date: 2011-02-11 01:13+0000\n"
+"Last-Translator: Dimitar Markov <Unknown>\n"
+"Language-Team: Bulgarian <bg@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-02-11 06:26+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+
+#: widgets/wikimarkup/__init__.py:1981
+msgid "Table of Contents"
+msgstr "Съдържание"

addons/wiki/web/locales/ca.po

@@ -0,0 +1,22 @@
+# Catalan 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: 2010-08-02 17:52+0530\n"
+"PO-Revision-Date: 2011-02-06 12:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-07 06:24+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+
+#: widgets/wikimarkup/__init__.py:1981
+msgid "Table of Contents"
+msgstr ""

addons/wiki/web/locales/tr.po

@@ -0,0 +1,22 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-02 17:52+0530\n"
+"PO-Revision-Date: 2011-02-08 21:20+0000\n"
+"Last-Translator: Ahmet Altınışık <Unknown>\n"
+"Language-Team: Turkish <tr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-09 06:02+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+
+#: widgets/wikimarkup/__init__.py:1981
+msgid "Table of Contents"
+msgstr "İçindekiler"

addons/wiki_faq/i18n/gl.po

@@ -0,0 +1,32 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-02-14 12:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: wiki_faq
+#: model:ir.module.module,description:wiki_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Este módulo facilita unha plantilla para as FAQ dunha wiki\n"
+"    "
+
+#. module: wiki_faq
+#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
+msgid "Document Management - Wiki - FAQ"
+msgstr "Xestión Documental - Wiki - FAQ"