pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb.

Browse Source 
bzr revid: dka@tinyerp.com-20131018085850-rgrrkiy0ir2ctxqe
This commit is contained in:
Darshan Kalola (OpenERP)
2013-10-18 14:28:50 +05:30
parent 1b336d74c6 00fa089439
commit a96f1c21a8
6 changed files with 64 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_analytic_analysis/i18n/zh_CN.po
+19 -6
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2013-01-30 03:58+0000\n"
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
"PO-Revision-Date: 2013-10-18 02:59+0000\n"
"Last-Translator: padola <padola@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: 2013-09-12 05:47+0000\n"
"X-Generator: Launchpad (build 16761)\n"
"X-Launchpad-Export-Date: 2013-10-18 05:51+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -67,6 +67,10 @@ msgid ""
"to\n"
" define the customer invoice price rate."
msgstr ""
"当发票符合计工单，OpenERP将使用\n"
" 合同使用价目表价格\n"
" 产品设置应用到每个员工\n"
" 指定客户发票价格率。"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -144,6 +148,15 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" 点击以确立一个新合同\n"
" </p><p>\n"
" 你将发现合同已经更新,由于已过期或者工作流\n"
" 授权超过最大数\n"
" </p><p>\n"
" OpenERP会自动更新挂起状态的合同,商谈结束,\n"
" 销售员必须关闭或更新挂起的合同.\n"
" "
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -153,7 +166,7 @@ msgstr "截止日期"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Account Manager"
msgstr "会计经理"
msgstr "分管会计"
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -595,7 +608,7 @@ msgstr "总时间"
#: model:res.groups,comment:account_analytic_analysis.group_template_required
msgid ""
"the field template of the analytic accounts and contracts will be required."
msgstr ""
msgstr "这个分析账户和合同的字段模板是必填的"
#. module: account_analytic_analysis
#: field:account.analytic.account,invoice_on_timesheets:0
addons/account_bank_statement_extensions/i18n/da.po
+1 -1
View File
@@ -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: 2013-10-15 04:41+0000\n"
"X-Launchpad-Export-Date: 2013-10-16 04:37+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: account_bank_statement_extensions
addons/base_import/controllers.py
+3 -5
View File
@@ -1,12 +1,10 @@
# -*- coding: utf-8 -*-
import simplejson
import openerp
from openerp.addons.web.http import Controller, route
class ImportController(openerp.addons.web.http.Controller):
_cp_path = '/base_import'
@openerp.addons.web.http.httprequest
class ImportController(Controller):
@route('/base_import/set_file')
def set_file(self, req, file, import_id, jsonp='callback'):
import_id = int(import_id)
addons/base_import/models.py
+3 -2
View File
@@ -224,12 +224,13 @@ class ir_import(orm.TransientModel):
headers, matches = self._match_headers(rows, fields, options)
# Match should have consumed the first row (iif headers), get
# the ``count`` next rows for preview
preview = itertools.islice(rows, count)
preview = list(itertools.islice(rows, count))
assert preview, "CSV file seems to have no content"
return {
'fields': fields,
'matches': matches or False,
'headers': headers or False,
'preview': list(preview),
'preview': preview,
}
except Exception, e:
# Due to lazy generators, UnicodeDecodeError (for
addons/contacts/i18n/lv.po
+37
View File
@@ -0,0 +1,37 @@
# Latvian translation for openobject-addons
# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2013-10-16 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Latvian <lv@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: 2013-10-17 05:33+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: contacts
#: model:ir.actions.act_window,help:contacts.action_contacts
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
" Click to add a contact in your address book.\n"
" </p><p>\n"
" OpenERP helps you easily track all activities related to\n"
" a customer; discussions, history of business opportunities,\n"
" documents, etc.\n"
" </p>\n"
" "
msgstr ""
#. module: contacts
#: model:ir.actions.act_window,name:contacts.action_contacts
#: model:ir.ui.menu,name:contacts.menu_contacts
msgid "Contacts"
msgstr "Kontakti"
addons/product/product_view.xml
+1 -1
View File
@@ -37,7 +37,7 @@
<tree colors="red:virtual_available&lt;0;blue:virtual_available&gt;=0 and state in ('draft', 'end', 'obsolete');black:virtual_available&gt;=0 and state not in ('draft', 'end', 'obsolete')" string="Products">
<field name="default_code"/>
<field name="name"/>
<field name="variants"/>
<field name="variants" groups="product.group_product_variant"/>
<field name="categ_id" invisible="1"/>
<field name="type" invisible="1"/>
<field name="uom_id" string="Unit of Measure" groups="product.group_uom"/>