diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 4ab7e6329a9..7ccba2faf9b 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -798,8 +798,8 @@ - - + + diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po index 770b2c920d7..195cc981dbb 100644 --- a/addons/account/i18n/es.po +++ b/addons/account/i18n/es.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-01-02 04:23+0000\n" -"Last-Translator: Federico Vera \n" +"PO-Revision-Date: 2010-02-08 18:04+0000\n" +"Last-Translator: Hilario J. Montoliu (hjmf) \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-01-03 04:45+0000\n" +"X-Launchpad-Export-Date: 2010-02-09 05:11+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -435,7 +435,7 @@ msgstr "Negativo" #. module: account #: rml:account.partner.balance:0 msgid "(Account/Partner) Name" -msgstr "(Cuenta/Socio) Nombre" +msgstr "Nombre de Cuenta/Empresa" #. module: account #: selection:account.move,type:0 diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po index d3b415a807b..9db876ba396 100644 --- a/addons/account/i18n/lv.po +++ b/addons/account/i18n/lv.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-23 08:57+0000\n" -"Last-Translator: Normunds \n" +"PO-Revision-Date: 2010-02-08 18:27+0000\n" +"Last-Translator: sraps (KN dati) \n" "Language-Team: Latvian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-12-24 04:40+0000\n" +"X-Launchpad-Export-Date: 2010-02-09 05:11+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -470,7 +470,7 @@ msgstr "" #: model:ir.actions.wizard,name:account.action_account_bank_reconcile_tree #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_check_tree msgid "Bank reconciliation" -msgstr "Bankas sasaiste" +msgstr "Kontējumu sasaiste" #. module: account #: rml:account.invoice:0 @@ -844,7 +844,7 @@ msgstr "6" #. module: account #: model:ir.ui.menu,name:account.next_id_30 msgid "Bank Reconciliation" -msgstr "Bankas Sasaiste" +msgstr "Kontējumu sasaiste" #. module: account #: model:ir.model,name:account.model_account_account_template @@ -1195,7 +1195,7 @@ msgstr "" #. module: account #: view:res.partner:0 msgid "Bank account" -msgstr "" +msgstr "Bankas konts" #. module: account #: field:account.chart.template,tax_template_ids:0 @@ -1542,7 +1542,7 @@ msgstr "" #. module: account #: field:account.invoice,move_id:0 msgid "Invoice Movement" -msgstr "" +msgstr "Rēķina Grāmatojums" #. module: account #: model:ir.actions.act_window,name:account.action_wizard_multi_chart @@ -2473,7 +2473,7 @@ msgstr "" #: model:process.node,name:account.process_node_bankstatement0 #: model:process.node,name:account.process_node_supplierbankstatement0 msgid "Bank Statement" -msgstr "" +msgstr "Bankas konta izraksts" #. module: account #: wizard_view:account.invoice.pay,addendum:0 @@ -3384,7 +3384,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement msgid "Bank statements" -msgstr "" +msgstr "Bankas konta izraksts" #. module: account #: model:ir.ui.menu,name:account.next_id_22 @@ -3838,7 +3838,7 @@ msgstr "" #. module: account #: selection:account.general.ledger.report,checktype,sortbydate:0 msgid "Movement" -msgstr "" +msgstr "Grāmatojums" #. module: account #: help:account.period,special:0 @@ -4321,7 +4321,7 @@ msgstr "" #. module: account #: selection:account.move,type:0 msgid "Bank Payment" -msgstr "" +msgstr "Bankas maksājums" #. module: account #: selection:account.move,state:0 @@ -4766,7 +4766,7 @@ msgstr "" #: field:account.bank.statement.reconcile,statement_line:0 #: model:ir.model,name:account.model_account_bank_statement_line msgid "Bank Statement Line" -msgstr "" +msgstr "Konta izraksta rinda" #. module: account #: wizard_button:account.automatic.reconcile,reconcile,end:0 @@ -5458,7 +5458,7 @@ msgstr "account.tax.template" #. module: account #: field:wizard.multi.charts.accounts,bank_accounts_id:0 msgid "Bank Accounts" -msgstr "" +msgstr "Bankas Konti" #. module: account #: constraint:account.period:0 @@ -5735,7 +5735,7 @@ msgstr "" #: field:account.chart.template,bank_account_view_id:0 #: field:account.invoice,partner_bank:0 msgid "Bank Account" -msgstr "" +msgstr "Bankas Konts" #. module: account #: model:ir.actions.act_window,name:account.action_model_form diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 7bfc4b702a7..446fea4d0df 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -193,7 +193,7 @@ class account_invoice(osv.osv): temp_lines = map(lambda x: x.id, m.reconcile_partial_id.line_partial_ids) lines += [x for x in temp_lines if x not in lines] src.append(m.id) - + lines = filter(lambda x: x not in src, lines) result[invoice.id] = lines return result @@ -230,7 +230,7 @@ class account_invoice(osv.osv): _order = "number" _columns = { 'name': fields.char('Description', size=64, select=True,readonly=True, states={'draft':[('readonly',False)]}), - 'origin': fields.char('Origin', size=64, help="Reference of the document that produced this invoice."), + 'origin': fields.char('Source Document', size=64, help="Reference of the document that produced this invoice."), 'type': fields.selection([ ('out_invoice','Customer Invoice'), ('in_invoice','Supplier Invoice'), @@ -1000,7 +1000,7 @@ class account_invoice(osv.osv): if invoice.type in ('in_invoice', 'in_refund'): ref = invoice.reference else: - ref = self._convert_ref(cr, uid, invoice.number) + ref = self._convert_ref(cr, uid, invoice.number) # Pay attention to the sign for both debit/credit AND amount_currency l1 = { 'debit': direction * pay_amount>0 and direction * pay_amount, @@ -1240,11 +1240,11 @@ class account_invoice_line(osv.osv): company = self.pool.get('res.company').browse(cr, uid, company_id) currency = self.pool.get('res.currency').browse(cr, uid, currency_id) - + if not currency.company_id.id == company.id: raise osv.except_osv(_('Configration Error !'), _('Can not select currency that is not related to any company.\nPlease select accordingly !.')) - + if company.currency_id.id != currency.id: new_price = res_final['value']['price_unit'] * currency.rate res_final['value']['price_unit'] = new_price diff --git a/addons/account_report/i18n/zh_CN.po b/addons/account_report/i18n/zh_CN.po index b03e6c19ca0..8f08ef1426c 100644 --- a/addons/account_report/i18n/zh_CN.po +++ b/addons/account_report/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-01 15:54+0000\n" +"PO-Revision-Date: 2010-02-08 06:26+0000\n" "Last-Translator: Wei \"oldrev\" Li \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: 2009-12-16 05:04+0000\n" +"X-Launchpad-Export-Date: 2010-02-09 05:10+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_report @@ -154,12 +154,12 @@ msgstr "" #: wizard_button:print.indicators,next,print:0 #: wizard_button:print.indicators.pdf,init,print:0 msgid "Print" -msgstr "" +msgstr "打印" #. module: account_report #: field:account.report.report,type:0 msgid "Type" -msgstr "" +msgstr "类型" #. module: account_report #: model:ir.actions.report.xml,name:account_report.report_indicator_pdf @@ -175,27 +175,27 @@ msgstr "" #: view:account.report.report:0 #: selection:account.report.report,status:0 msgid "Good" -msgstr "" +msgstr "良好" #. module: account_report #: view:account.report.history:0 msgid "Account Report History" -msgstr "" +msgstr "科目报表历史记录" #. module: account_report #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "无效的XML视图结构！" #. module: account_report #: help:account.report.report,badness_limit:0 msgid "This Value sets the limit of badness." -msgstr "" +msgstr "此值设置好坏评估标准的限制" #. module: account_report #: wizard_field:print.indicators,init,select_base:0 msgid "Choose Criteria" -msgstr "" +msgstr "选择标准" #. module: account_report #: view:account.report.report:0 @@ -221,18 +221,18 @@ msgstr "" #: view:account.report.report:0 #: selection:account.report.report,status:0 msgid "Very Good" -msgstr "" +msgstr "非常好" #. module: account_report #: field:account.report.report,note:0 msgid "Note" -msgstr "" +msgstr "备注" #. module: account_report #: rml:accounting.report:0 #: rml:print.indicators:0 msgid "Currency:" -msgstr "" +msgstr "货币：" #. module: account_report #: field:account.report.report,status:0 diff --git a/addons/board_document/i18n/pl.po b/addons/board_document/i18n/pl.po index 0f6c0b614c8..8ffb7aa7a66 100644 --- a/addons/board_document/i18n/pl.po +++ b/addons/board_document/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-04 00:48+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-02-09 17:31+0000\n" +"Last-Translator: Antoni Górski \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: 2009-12-16 05:25+0000\n" +"X-Launchpad-Export-Date: 2010-02-10 04:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board_document @@ -76,7 +76,7 @@ msgstr "" #. module: board_document #: model:ir.ui.menu,name:board_document.menu_board_document msgid "Document" -msgstr "" +msgstr "Dokument" #. module: board_document #: view:board.board:0 diff --git a/addons/board_manufacturing/__terp__.py b/addons/board_manufacturing/__terp__.py index 9aee4983454..9c644262969 100644 --- a/addons/board_manufacturing/__terp__.py +++ b/addons/board_manufacturing/__terp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -27,7 +27,7 @@ 'description': """ This module creates a dashboards for Manufaturing that includes: * List of next production orders - * List of deliveries (out packing) + * List of deliveries (out picking) * Graph of work center load * List of procurement in exception """, diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py index f8c30e10478..b3a5229f27e 100644 --- a/addons/caldav/caldav.py +++ b/addons/caldav/caldav.py @@ -241,8 +241,7 @@ class invite_attendee_wizard(osv.osv_memory): }) att_id = att_obj.create(cr, uid, vals) if model_field: - obj.write(cr, uid, res_obj.id, {model_field: [(4, att_id)], - 'state': 'delegated'}) + obj.write(cr, uid, res_obj.id, {model_field: [(4, att_id)]}) if datas.get('send_mail'): att_obj._send_mail(cr, uid, [att_id], mail_to, \ @@ -665,13 +664,13 @@ or contains the text to be used for display"""), mail_to = [alarm.user_id.address_id.email] for att in alarm.attendee_ids: mail_to.append(att.user_id.address_id.email) - - tools.email_send( - tools.config.get('email_from', False), - mail_to, - sub, - body - ) + if mail_to: + tools.email_send( + tools.config.get('email_from', False), + mail_to, + sub, + body + ) self.write(cr, uid, [alarm.id], {'state':'done'}) return True @@ -756,12 +755,12 @@ rule or repeating pattern for anexception to a recurrence set"), def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv): if not user_id: - return {'value': {'vtimezone': ''}} - value = {} + return {'value': {'vtimezone': None}} + value = {'vtimezone': None} cr.execute('select context_tz from res_users where id=%s' % (user_id)) - timezone = cr.fetchone() + timezone = cr.fetchone()[0] if timezone: - value.update({'vtimezone': timezone[0].lower()}) + value.update({'vtimezone': timezone.lower()}) return {'value': value} def export_cal(self, cr, uid, ids, context={}): diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 33741d7743b..d20b8e47a4a 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -904,7 +904,7 @@ class users(osv.osv): _inherit = 'res.users' _description = "Users" _columns = { - 'context_section_id': fields.selection(_section_get, 'Sales Section'), + 'context_section_id': fields.many2one('crm.case.section', 'Sales Section'), } users() diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml index 9c9045c5f87..09d53676339 100644 --- a/addons/crm/crm_helpdesk_view.xml +++ b/addons/crm/crm_helpdesk_view.xml @@ -9,9 +9,9 @@ Helpdesk Categories crm.case.categ form - - [('object_id.model', '=', 'crm.helpdesk')] - {'object_id':'crm.helpdesk'} + + [('object_id.model', '=', 'crm.helpdesk')] + {'object_id':'crm.helpdesk'} # ------------------------------------------------------ @@ -26,9 +26,9 @@
- + - + @@ -36,10 +36,10 @@ - +