From ee9e8b9b8b1956abf70efcd1d3df34d9f6081221 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 23 Mar 2017 15:42:29 +0100 Subject: [PATCH 01/14] [I18N] final 9.0 synchronisation --- locale/zh_CN/LC_MESSAGES/accounting.po | 58 +++--- locale/zh_CN/LC_MESSAGES/crm.po | 11 +- locale/zh_CN/LC_MESSAGES/discuss.po | 8 +- locale/zh_CN/LC_MESSAGES/getting_started.po | 9 +- locale/zh_CN/LC_MESSAGES/inventory.po | 43 ++-- locale/zh_CN/LC_MESSAGES/point_of_sale.po | 11 +- locale/zh_CN/LC_MESSAGES/project.po | 11 +- locale/zh_CN/LC_MESSAGES/sales.po | 8 +- locale/zh_CN/LC_MESSAGES/website.po | 210 ++++++++++---------- 9 files changed, 188 insertions(+), 181 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/accounting.po b/locale/zh_CN/LC_MESSAGES/accounting.po index 927599c3e..5e7e55885 100644 --- a/locale/zh_CN/LC_MESSAGES/accounting.po +++ b/locale/zh_CN/LC_MESSAGES/accounting.po @@ -10,9 +10,11 @@ # fisher szu , 2015 # Gang LIU , 2016 # Gary Wei , 2016 -# Jeffery Chen Fan , 2015-2016 -# Jeffery Chen Fan , 2016 +# Jeffery CHEN , 2015-2016 +# Jeffery CHEN , 2017 +# Jeffery CHEN , 2016 # lao yi , 2016 +# liAnGjiA , 2017 # mrshelly , 2015-2016 # Richard yang , 2016 # Rona Lin , 2016 @@ -28,8 +30,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-11-22 13:16+0100\n" -"PO-Revision-Date: 2016-11-22 12:23+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2017-03-07 14:30+0000\n" +"Last-Translator: Jeffery CHEN \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9-doc/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -955,7 +957,7 @@ msgstr "备忘录是很重要的, 如果你想自动调节 (`see `_) #: ../../accounting/bank/misc/interbank.rst:81 msgid "Save and confirm the changes to register the payment." -msgstr "保存并确认变更登记付款。" +msgstr "保存并确认变更以登记付款。" #: ../../accounting/bank/misc/interbank.rst:83 msgid "" @@ -1983,7 +1985,7 @@ msgid "" "Make sure you have fully reconciled your **bank account(s)** up to year end " "and confirm that your ending book balances agree with your bank statement " "balances." -msgstr "确保你完全调节了 **银行账户(s)** 直至年底, 同时确认登帐期末余额和银行对账单的期末余额一致。" +msgstr "确保你完全调节了 **银行账户** 直至年底，并且确认期末账面余额符合银行对账单的余额。" #: ../../accounting/others/adviser/fiscalyear.rst:13 msgid "Verify that all **customer invoices** have been entered and approved." @@ -1995,25 +1997,25 @@ msgstr "确认您已输入并同意的所有 **供应商账单** 。" #: ../../accounting/others/adviser/fiscalyear.rst:17 msgid "Validate all **expenses**, ensuring their accuracy." -msgstr "审核所有的费用, 保证其正确。" +msgstr "审核所有的 **费用**，保证其准确性。" #: ../../accounting/others/adviser/fiscalyear.rst:19 msgid "" "Corroborate that all **received payments** have been entered and recorded " "accurately." -msgstr "证实, 所有的 **received payments** 已登记并准确记录。" +msgstr "确认所有**已收到的付款**已输入并准确记录。" #: ../../accounting/others/adviser/fiscalyear.rst:23 msgid "Year-end checklist" -msgstr "年终（科目）余额" +msgstr "年终检查表" #: ../../accounting/others/adviser/fiscalyear.rst:25 msgid "Run a **Tax report**, and verify that your tax information is correct." -msgstr "运行 **税报表** , 并验证你的税务信息是正确的。" +msgstr "运行 **税报告** , 并验证你的税务信息是正确的。" #: ../../accounting/others/adviser/fiscalyear.rst:27 msgid "Reconcile all accounts on your **Balance Sheet**:" -msgstr "调节 **资产负债表** 上所有科目 :" +msgstr "调节 **资产负债表** 上的所有科目；" #: ../../accounting/others/adviser/fiscalyear.rst:29 msgid "" @@ -2041,19 +2043,19 @@ msgid "" "Invoices** with their payments. This step is optional, however it may assist" " the year-end process if all outstanding payments and invoices are " "reconciled, and could lead finding errors or mistakes in the system." -msgstr "运行选项 **付款匹配** 特性, 在仪表盘上的下拉 **更多** , 验证所有 **供应商账单** 和 **客户发票** 以及他们的付款。这一步是可选的, 如果所有未付款和发票已调节, 同时可能会发现系统中的错误, 但是它可能帮助年终操作, 。" +msgstr "在仪表板的 **更多**下拉菜单中，运行可选的**付款匹配**功能，验证任何打开的**供应商帐单**和**客户发票**及其付款。此步骤是可选的，但可以帮助年终过程，假如所有未结的付款和发票都已调节，可能会导致系统中发现错误或麻烦。" #: ../../accounting/others/adviser/fiscalyear.rst:47 msgid "" "Your accountant/bookkeeper will likely verify your balance sheet items and " "book entries for:" -msgstr "你的会计/登记员可能会验证您的资产负债表项目和登记凭证 :" +msgstr "您的会计师/记账员可能会验证您的资产负债表项目，以及为以下交易记账：" #: ../../accounting/others/adviser/fiscalyear.rst:50 msgid "" "Year-end manual adjustments, using the **Adviser Journal Entries** menu (For" " example, the **Current Year Earnings** and **Retained Earnings** reports)." -msgstr "年终手动调整, 使用 **Adviser Journal Entries** 菜单(例如, **当年收入** 和 **留存收益** 报告)。" +msgstr "年底手动调整, 使用 **Adviser Journal Entries** 菜单(例如, **当年收入** 和 **留存收益** 报告)。" #: ../../accounting/others/adviser/fiscalyear.rst:54 msgid "**Work in Progress**." @@ -2065,11 +2067,11 @@ msgstr "**折旧分类账分录**" #: ../../accounting/others/adviser/fiscalyear.rst:58 msgid "**Loans**." -msgstr "贷款" +msgstr "**贷款**" #: ../../accounting/others/adviser/fiscalyear.rst:60 msgid "**Tax adjustments**." -msgstr "纳税调整" +msgstr "**税金调整**。" #: ../../accounting/others/adviser/fiscalyear.rst:62 msgid "" @@ -2077,7 +2079,7 @@ msgid "" "they may want to have paper copies of all balance sheet items (such as " "loans, bank accounts, prepayments, sales tax statements, etc...) to agree " "these against your Odoo balances." -msgstr "如果你的会计正经历今年年底审计, 他们可能想要复印纸质的所有资产负债表项目(如贷款、银行账户、预付款、销项税, 等等…), 这些应与Odoo内的余额一致。" +msgstr "如果您的会计师/记账员正在通过年底审计，他们可能想要所有资产负债表项目（例如贷款，银行帐户，预付款，销售税报表等）的纸质副本，这些应该与Odoo余额一致。" #: ../../accounting/others/adviser/fiscalyear.rst:67 msgid "" @@ -2086,7 +2088,7 @@ msgid "" "under the accounting configuration. This way, the accountant can be " "confident that nobody is changing the previous year transactions while " "auditing the books." -msgstr "在这个过程中, 很好的实用方法就设置会计年度的最后一天, 通过设置 **Lock date for Non-Advisers** , 这个在会计配置下设置。这样, 在审计时, 会计可确保没有人能改变前一年的交易。" +msgstr "在这个过程中，好的做法是将 **Lock date for Non-Advisers** 设置为会计年度的最后一天，在会计配置下设置。这样，在审计时，会计师可确保没有人能改变前一年的交易。" #: ../../accounting/others/adviser/fiscalyear.rst:77 msgid "Closing the fiscal year" @@ -2100,7 +2102,7 @@ msgid "" " date you specify in Odoo. Therefore, any time you generate the **Income " "Statement**, the beginning date will correspond with the beginning of the " "**Fiscal Year** and the account balances will all be 0." -msgstr "在Odoo, 不需要做一个特定的年底关闭凭证以关闭损益表科目。这些报表实时产生, 这意味着 **损益表** 直接对应于您指定的年终Odoo日期。因此, 任何时候你生成 **损益表** , 开始日期与 **财政年度** 一致, 科目余额都是0。" +msgstr "在Odoo中，没有必要做一个特定的年底结账分录，以关闭损益表科目。这些报表实时创建，这意味着 **损益表** 直接对应于您在Odoo中指定的年终日期。因此，任何时候你生成 **损益表**，开始日期将对应于 **财政年度** 的开始，并且 科目余额将全部为0。" #: ../../accounting/others/adviser/fiscalyear.rst:86 msgid "" @@ -2109,7 +2111,7 @@ msgid "" " of the fiscal year. Making sure that before doing so, you confirm whether " "or not the current year earnings in the **Balance Sheet** is correctly " "reporting a 0 balance." -msgstr "一旦会计创建凭证用于分配 **当年利润** , 你应该设置本财政年度的最后一天为 **锁定日期** 。确保在这样做之前, 您确认是否当前年度收入 **资产负债表** 中正确余额为0。" +msgstr "一旦会计师/记账员创建分配 **当年利润**的日记账分录，你应该将 **锁定日期** 设置本财政年度的最后一天 。确保在此之前，您确认**资产负债表** 中当年度收入是否正确报告余额为0。" #: ../../accounting/others/analytic.rst:3 msgid "Analytic" @@ -2203,7 +2205,7 @@ msgstr "我们先登记一个费用。我们的IT技术人员乘火车去看我 #: ../../accounting/others/analytic/purchases_expenses.rst:78 msgid "Create an expense product" -msgstr "创建一个费用产品" +msgstr "创建费用产品" #: ../../accounting/others/analytic/purchases_expenses.rst:80 msgid "" @@ -2397,7 +2399,7 @@ msgid "" "For more information on how to create a sales order based on time and " "material please see: *How to invoice based on time and material* (Work in " "Progress)." -msgstr "有关基于时间和材料, 如何创建销售订单的更多信息请参阅 *How to invoice based on time and material* (Work in Progress)." +msgstr "有关如何根据时间和材料创建销售订单的更多信息，请参阅：*如何根据时间和材料开具发票*（正在进行中）。" #: ../../accounting/others/analytic/timesheets.rst:82 msgid "" @@ -2410,7 +2412,7 @@ msgstr "我们保存一个销售订单, 订单内产品为 **External Consulting #: ../../accounting/others/analytic/timesheets.rst:92 msgid "Fill in timesheet" -msgstr "输入记工单" +msgstr "填写工时表" #: ../../accounting/others/analytic/timesheets.rst:94 msgid "" @@ -3099,7 +3101,7 @@ msgstr "应收" #: ../../accounting/others/configuration/account_type.rst:29 msgid "Payable" -msgstr "应付账款" +msgstr "应付" #: ../../accounting/others/configuration/account_type.rst:31 msgid "Bank and Cash" @@ -3115,7 +3117,7 @@ msgstr "非流动资产" #: ../../accounting/others/configuration/account_type.rst:37 msgid "Prepayments" -msgstr "预付款" +msgstr "预付" #: ../../accounting/others/configuration/account_type.rst:39 #: ../../accounting/overview/main_concepts/terminologies.rst:77 @@ -3156,7 +3158,7 @@ msgstr "折旧" #: ../../accounting/others/configuration/account_type.rst:55 msgid "Expenses" -msgstr "费用报销" +msgstr "费用" #: ../../accounting/others/configuration/account_type.rst:57 msgid "Direct Costs" @@ -3475,7 +3477,7 @@ msgstr "1" #: ../../accounting/others/inventory/avg_price_valuation.rst:90 msgid "Explanation: counter example" -msgstr "解释 :反例" +msgstr "解释：计数器示例" #: ../../accounting/others/inventory/avg_price_valuation.rst:92 msgid "" @@ -8937,7 +8939,7 @@ msgstr "如果您使用这种方法来管理收到的支票，您可使用报告 #: ../../accounting/receivables/customer_payments/credit_cards.rst:3 msgid "How to register credit card payments on invoices?" -msgstr "" +msgstr "如何在发票上登记信用卡付款？" #: ../../accounting/receivables/customer_payments/credit_cards.rst:5 msgid "" diff --git a/locale/zh_CN/LC_MESSAGES/crm.po b/locale/zh_CN/LC_MESSAGES/crm.po index dadfbba9e..4221cd8b1 100644 --- a/locale/zh_CN/LC_MESSAGES/crm.po +++ b/locale/zh_CN/LC_MESSAGES/crm.po @@ -7,9 +7,10 @@ # fausthuang, 2016 # fausthuang, 2016 # Gary Wei , 2016 -# Jeffery Chen Fan , 2016 -# Jeffery Chen Fan , 2016 +# Jeffery CHEN , 2016 +# Jeffery CHEN , 2016 # Joshua Jan , 2016 +# liAnGjiA , 2017 # Melody , 2015 # mrshelly , 2015-2016 msgid "" @@ -17,8 +18,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-11-22 13:16+0100\n" -"PO-Revision-Date: 2016-11-22 12:23+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2017-02-24 01:42+0000\n" +"Last-Translator: liAnGjiA \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9-doc/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -267,7 +268,7 @@ msgid "" "By default, the lead stage is not activated in Odoo CRM. To activate it, go " "to :menuselection:`Sales --> Configuration --> Settings`, select the option " "\"\"use leads if…** as shown below and click on **Apply**." -msgstr "" +msgstr "默认情况下, 线索阶段在Odoo CRM. 里是不激活的. 要激活它的话, 去:menuselection:`销售 --> 配置 --> 设置`, 如下所示选择选项 **选择线索如果...** 并点击 **应用** 。" #: ../../crm/leads/generate/manual.rst:18 msgid "" diff --git a/locale/zh_CN/LC_MESSAGES/discuss.po b/locale/zh_CN/LC_MESSAGES/discuss.po index 56a9df46a..7ee7340a6 100644 --- a/locale/zh_CN/LC_MESSAGES/discuss.po +++ b/locale/zh_CN/LC_MESSAGES/discuss.po @@ -5,7 +5,7 @@ # Translators: # Connie Xiao , 2016 # Gary Wei , 2016 -# Jeffery Chenn , 2016 +# Jeffery CHEN , 2016 # Kate Lee , 2016 # mrshelly , 2016 # 思昀 邹 <1025772003@qq.com>, 2016 @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-18 10:05+0200\n" -"PO-Revision-Date: 2016-10-11 08:48+0000\n" -"Last-Translator: Connie Xiao \n" +"POT-Creation-Date: 2016-11-22 13:16+0100\n" +"PO-Revision-Date: 2017-02-04 04:45+0000\n" +"Last-Translator: liAnGjiA \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9-doc/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/locale/zh_CN/LC_MESSAGES/getting_started.po b/locale/zh_CN/LC_MESSAGES/getting_started.po index a0980ca89..19720b7ae 100644 --- a/locale/zh_CN/LC_MESSAGES/getting_started.po +++ b/locale/zh_CN/LC_MESSAGES/getting_started.po @@ -4,7 +4,8 @@ # # Translators: # Connie Xiao , 2016 -# Jeffery Chen Fan , 2016 +# Jeffery CHEN , 2016 +# liAnGjiA , 2017 # mrshelly , 2016 # Ted Wang , 2016 msgid "" @@ -12,8 +13,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-11-22 13:16+0100\n" -"PO-Revision-Date: 2016-11-22 12:23+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2017-02-24 01:42+0000\n" +"Last-Translator: liAnGjiA \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9-doc/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -527,7 +528,7 @@ msgid "" " system is working smoothly, you will train your users. There will be some " "back and forth with your Odoo project manager to answer questions and " "process your feedback." -msgstr "" +msgstr "**培训:** 若您Odoo实施完成，且已成功导入数据，哈~系统运行顺利啦，您将需要给您的用户们一次培训了啦。培训时会有Odoo项目经理来解答和处理您反馈的问题。" #: ../../getting_started/documentation.rst:326 msgid "**Production**: Once everyone is trained, your users start using Odoo." diff --git a/locale/zh_CN/LC_MESSAGES/inventory.po b/locale/zh_CN/LC_MESSAGES/inventory.po index 539d469b7..7737c7535 100644 --- a/locale/zh_CN/LC_MESSAGES/inventory.po +++ b/locale/zh_CN/LC_MESSAGES/inventory.po @@ -5,8 +5,9 @@ # Translators: # Connie Xiao , 2016 # Gary Wei , 2016 -# Jeffery Chen Fan , 2016 -# Jeffery Chen Fan , 2016 +# Jeffery CHEN , 2016 +# Jeffery CHEN , 2016 +# liAnGjiA , 2017 # mrshelly , 2015-2016 # 宣一敏 , 2015 msgid "" @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-11-22 13:16+0100\n" -"PO-Revision-Date: 2016-11-22 12:23+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2017-02-24 01:42+0000\n" +"Last-Translator: liAnGjiA \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9-doc/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5486,7 +5487,7 @@ msgid "" "to their appropriate destination location. Putaway is the process of taking " "products off the receiving shipment and putting them into the most " "appropriate location." -msgstr "" +msgstr "好的仓库实施会考虑到把产品自动的调拨到正确的目的库位。下架就是把产品从收货的产品发出的过程, 该过程把产品调拨到正确的库位。" #: ../../inventory/routes/strategies/putaway.rst:13 msgid "" @@ -5501,7 +5502,7 @@ msgid "" "affects the destination location. Putaway strategies are defined at the " "location level (unlike removal strategies which are defined at the product " "level)." -msgstr "" +msgstr "上架策略和下架策略有着同样的原则, 但是作用于目标库位。商家策略在库位层面定义(不像下架策略定义在产品层面那样)。" #: ../../inventory/routes/strategies/putaway.rst:25 msgid "" @@ -5555,7 +5556,7 @@ msgstr "等你把所有必要信息输完之后, 点击 **保存** 。" msgid "" "Now, when you purchase products with those categories, they will " "automatically be transferred to the correct location." -msgstr "" +msgstr "现在, 当你要采购这些种类的产品时候, 它们会自动的被移动到正确的库位。" #: ../../inventory/routes/strategies/putaway.rst:64 msgid "" @@ -5569,7 +5570,7 @@ msgstr "在那里　你可以看到库位中当前的库存" #: ../../inventory/routes/strategies/removal.rst:3 msgid "What is a removal strategy (FIFO, LIFO, and FEFO)?" -msgstr "" +msgstr "何为下架策略 (FIFO, LIFO, 及 FEFO)？" #: ../../inventory/routes/strategies/removal.rst:8 msgid "" @@ -7216,63 +7217,63 @@ msgstr ":doc:`../operation/invoicing` " #: ../../inventory/shipping/setup/dhl_credentials.rst:3 msgid "How to get DHL credentials for integration with Odoo?" -msgstr "" +msgstr "如何得到用于集成DHL到Odoo的证书？" #: ../../inventory/shipping/setup/dhl_credentials.rst:5 msgid "In order to use the Odoo DHL API, you will need:" -msgstr "" +msgstr "若您想使用 Odoo 的 DHL API接口，您需要：" #: ../../inventory/shipping/setup/dhl_credentials.rst:7 msgid "A DHL.com SiteID" -msgstr "" +msgstr "DHL.com 网站账号" #: ../../inventory/shipping/setup/dhl_credentials.rst:9 msgid "A DHL Password" -msgstr "" +msgstr "DHL 密码" #: ../../inventory/shipping/setup/dhl_credentials.rst:11 msgid "A DHL Account Number" -msgstr "" +msgstr "DHL 账号" #: ../../inventory/shipping/setup/dhl_credentials.rst:15 msgid "" "Getting SiteID and password for countries other than United States (UK and " "Rest of the world)" -msgstr "" +msgstr "获取美国以外的国家和地区(英国和其他世界各国)的网站ID账号和密码" #: ../../inventory/shipping/setup/dhl_credentials.rst:17 msgid "" "You should contact DHL account manager and request integration for XML " "Express API. The presales should provide you live credentials." -msgstr "" +msgstr "您需要联系DHL账号管理中心请求XML格式的API扩展接口。DHL售前工程师应给您相关接口凭据等信息。" #: ../../inventory/shipping/setup/dhl_credentials.rst:20 msgid "Getting SiteID and Password for United States" -msgstr "" +msgstr "获取美国网站ID账号和密码" #: ../../inventory/shipping/setup/dhl_credentials.rst:22 msgid "" "You need to write to xmlrequests@dhl.com along with your full Account " "details like account number, region, address, etc. to get API Access." -msgstr "" +msgstr "您需要写邮件至 xmlrequests@dhl.com 并且随附您账户的详细信息诸如账号, region区域, 地址, 等访问API 访问信息。" #: ../../inventory/shipping/setup/dhl_credentials.rst:24 msgid "" "In meantime, for testing the solution, you can use the tests credentials as " "given in the demo data:" -msgstr "" +msgstr "同时，为了测试解决方案，您可以使用演示数据中给出的测试凭据：" #: ../../inventory/shipping/setup/dhl_credentials.rst:26 msgid "**SiteID**: CustomerTest" -msgstr "" +msgstr "**用户名**: CustomerTest" #: ../../inventory/shipping/setup/dhl_credentials.rst:28 msgid "**Password**: alkd89nBV" -msgstr "" +msgstr "**密码**: alkd89nBV" #: ../../inventory/shipping/setup/dhl_credentials.rst:30 msgid "**DHL Account Number**: 803921577" -msgstr "" +msgstr "**DHL 账号**: 803921577" #: ../../inventory/shipping/setup/third_party_shipper.rst:3 msgid "How to integrate a third party shipper?" diff --git a/locale/zh_CN/LC_MESSAGES/point_of_sale.po b/locale/zh_CN/LC_MESSAGES/point_of_sale.po index 74760f1f9..230eb6a74 100644 --- a/locale/zh_CN/LC_MESSAGES/point_of_sale.po +++ b/locale/zh_CN/LC_MESSAGES/point_of_sale.po @@ -7,9 +7,10 @@ # fausthuang, 2016 # fausthuang, 2016 # Gary Wei , 2016 -# Jeffery Chen Fan , 2016 +# Jeffery CHEN , 2016 # jun shi, 2016 # jun shi, 2016 +# liAnGjiA , 2017 # LINYUN TONG , 2016 # Melody , 2015 # mrshelly , 2015-2016 @@ -20,8 +21,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-11-22 13:16+0100\n" -"PO-Revision-Date: 2016-11-22 12:23+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2017-02-24 01:42+0000\n" +"Last-Translator: liAnGjiA \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9-doc/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -984,7 +985,7 @@ msgid "" "An Epson USB TM-T20 Printer or another ESC/POS compatible printer " "(officially supported printers are listed at the `POS Hardware page " "`_)" -msgstr "" +msgstr "一台 Epson USB TM-T20 打印机或其他兼容的 ESC/POS 打印机 (官方的 `POS 硬件支持列表 `_)" #: ../../point_of_sale/overview/setup.rst:25 msgid "A Honeywell Eclipse USB Barcode Scanner or another compatible scanner" @@ -1356,7 +1357,7 @@ msgstr "我们必须用正确的设置启动Odoo服务器" msgid "" "``$ ./odoo.py " "--load=web,hw_proxy,hw_posbox_homepage,hw_posbox_upgrade,hw_scale,hw_scanner,hw_escpos``" -msgstr "" +msgstr "``$ ./odoo.py --load=web,hw_proxy,hw_posbox_homepage,hw_posbox_upgrade,hw_scale,hw_scanner,hw_escpos``" #: ../../point_of_sale/overview/setup.rst:279 msgid "Test the instance" diff --git a/locale/zh_CN/LC_MESSAGES/project.po b/locale/zh_CN/LC_MESSAGES/project.po index 9e87d55bd..3264f2807 100644 --- a/locale/zh_CN/LC_MESSAGES/project.po +++ b/locale/zh_CN/LC_MESSAGES/project.po @@ -6,9 +6,10 @@ # fausthuang, 2016 # fausthuang, 2016 # Gary Wei , 2015-2016 -# Jeffery Chen Fan , 2016 -# Jeffery Chen Fan , 2016 +# Jeffery CHEN , 2016 +# Jeffery CHEN , 2016 # Kate Lee , 2016 +# liAnGjiA , 2017 # LINYUN TONG , 2016 # Melody , 2015 # mrshelly , 2015-2016 @@ -18,8 +19,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-11-22 13:16+0100\n" -"PO-Revision-Date: 2016-11-22 12:23+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2017-02-24 01:42+0000\n" +"Last-Translator: liAnGjiA \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9-doc/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -905,7 +906,7 @@ msgid "" "project can be internal or customer-oriented. A task is something to perform" " as part of a project. You will be able to give different tasks to several " "employees working on this project." -msgstr "" +msgstr "它与包含可定制阶段的任务的项目一起工作。项目可以是内部的或客户导向的。任务是项目执行的一部分。你可以给这个项目工作的几个员工提供不同的任务。" #: ../../project/configuration/setup.rst:17 msgid "Installing the Project module" diff --git a/locale/zh_CN/LC_MESSAGES/sales.po b/locale/zh_CN/LC_MESSAGES/sales.po index 9e0e70b03..04b3ccb19 100644 --- a/locale/zh_CN/LC_MESSAGES/sales.po +++ b/locale/zh_CN/LC_MESSAGES/sales.po @@ -6,7 +6,7 @@ # fausthuang, 2016 # fausthuang, 2016 # Gary Wei , 2016 -# Jeffery Chenn , 2016 +# Jeffery CHEN , 2016 # Melody , 2015 # mrshelly , 2015-2016 # udcs , 2016 @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-06 13:42+0200\n" -"PO-Revision-Date: 2016-06-24 01:15+0000\n" -"Last-Translator: Jeffery Chenn \n" +"POT-Creation-Date: 2016-11-22 13:16+0100\n" +"PO-Revision-Date: 2017-02-04 04:45+0000\n" +"Last-Translator: liAnGjiA \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9-doc/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/locale/zh_CN/LC_MESSAGES/website.po b/locale/zh_CN/LC_MESSAGES/website.po index 88c0102b4..a0ab965fd 100644 --- a/locale/zh_CN/LC_MESSAGES/website.po +++ b/locale/zh_CN/LC_MESSAGES/website.po @@ -10,8 +10,8 @@ # fausthuang, 2016 # Gary Wei , 2016 # j d , 2016 -# Jeffery Chenn , 2016 -# Jeffery Chenn , 2016 +# Jeffery CHEN , 2016 +# Jeffery CHEN , 2016 # mrshelly , 2016 # xiaobin wu , 2016 # 思昀 邹 <1025772003@qq.com>, 2016 @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-18 10:05+0200\n" -"PO-Revision-Date: 2016-10-11 09:56+0000\n" -"Last-Translator: Connie Xiao \n" +"POT-Creation-Date: 2016-11-22 13:16+0100\n" +"PO-Revision-Date: 2017-02-04 04:45+0000\n" +"Last-Translator: liAnGjiA \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9-doc/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -262,7 +262,7 @@ msgid "" "that is loaded only when the page using it is requested. An example of this " "is the backend that is only loaded when the visitor logs in and accesses the" " backend (/web)." -msgstr "" +msgstr "Odoo发送的CSS包括所有CSS/Less/Saas /模块。这样，用户不需要下载CSS文件就可浏览更多的页面。但一些模块可能包含巨大的CSS/JavaScript资源，因为太大, 可以不用放在第一页。在这种情况下，Odoo将资源转化为二部分，只加载页面时使用。举个例子, 只有当访问者登录并访问后端(/web)时才加载的后台程序。" #: ../../website/seo.rst:110 msgid "" @@ -356,7 +356,7 @@ msgid "" "nor minified. Thus, it's much slower. But it allows you to easily debug with" " the Chrome debugger as CSS and Javascript resources are not transformed " "from their original versions." -msgstr "" +msgstr "如果在调试模式中工作，CSS和JavaScript没有连接，也不缩小。因此，速度要慢得多。但它可轻松地用Chrome调试器为CSS和JavaScript资源调试, 不是从原来的版本转换。" #: ../../website/seo.rst:168 msgid "Images" @@ -367,7 +367,7 @@ msgid "" "When you upload new images using the website builder, Odoo automatically " "compresses them to reduce their sizes. (lossless compression for .PNG and " ".GIF and lossy compression for .JPG)" -msgstr "" +msgstr "当用网站建设者上传新的图片，Odoo自动压缩以减少大小。(PNG和GIF无损压缩, JPG有损压缩)" #: ../../website/seo.rst:174 msgid "" @@ -382,14 +382,14 @@ msgid "" "requested by the visitor. Thus, it's possible that, if you use a third-party" " theme, it will provide images that are not compressed efficiently. But all " "images used in Odoo official themes have been compressed by default." -msgstr "" +msgstr "当上传图片时, Odoo会自动压缩图片。因此，如果使用一个第三方的主题，它将提供有效地压缩的图像。但用于Odoo官方主题所有的图像会被压缩，这是默认的。" #: ../../website/seo.rst:188 msgid "" "When you click on an image, Odoo shows you the Alt and title attributes of " "the ```` tag. You can click on it to set your own title and Alt " "attributes for the image." -msgstr "" +msgstr "当点击图像，Odoo显示````的ALT和TITLE属性。可点击图像, 设置自己的标题和ALT属性。" #: ../../website/seo.rst:195 msgid "When you click on this link, the following window will appear:" @@ -401,7 +401,7 @@ msgid "" "`__ in most Odoo themes)." " Thus, you can use as many pictograms as you want in your page, they will " "not result in extra requests to load the page." -msgstr "" +msgstr "Odoo的象形文字字体的实现(`Font Awesome `__ 大多数Odoo主题)。因此，可尽情在网页上使用象形文字，这不会导致页面额外加载。" #: ../../website/seo.rst:209 msgid "CDN" @@ -412,13 +412,13 @@ msgid "" "If you activate the CDN feature in Odoo, static resources (Javascript, CSS, " "images) are loaded from a Content Delivery Network. Using a Content Delivery" " Network has three advantages:" -msgstr "" +msgstr "如果你激活Odoo的CDN功能，静态资源 (Javascript, CSS, images)从内容分发网络下载。使用内容分发网络有三个优点：" #: ../../website/seo.rst:215 msgid "" "Load resources from a nearby server (most CDN have servers in main countries" " around the globe)" -msgstr "" +msgstr "从附近的一个服务器下载资源(大多数CDN已经在主要国家的服务器上)" #: ../../website/seo.rst:218 msgid "" @@ -431,13 +431,13 @@ msgid "" "Split the resource loading on different services allowing to load more " "resources in parallel (since the Chrome limit of 6 parallel requests is by " "domain)" -msgstr "" +msgstr "不同的服务，允许加载更多的资源并行的资源加载(域限制浏览器的6个并行请求)" #: ../../website/seo.rst:225 msgid "" "You can configure your CDN options from the **Website Admin** app, using the" " Configuration menu. Here is an example of configuration you can use:" -msgstr "" +msgstr "你可从**网站管理员*程序中使用配置菜单配置CDN选项。这是配置示例：" #: ../../website/seo.rst:232 msgid "HTML Pages" @@ -448,27 +448,27 @@ msgid "" "Odoo allows to minify HTML pages, from the **Website Admin** app, using the " ":menuselection:`Configuration` menu. This will automatically remove extra " "space and tabs in your HTML code, reduce some tags code, etc." -msgstr "" +msgstr "可从**网站管理员*程序中配置更低的HTML页面，使用:menuselection:`Configuration` menu. 这将自动在HTML代码中删除额外的空间和标签，减少标签的代码，等等。" #: ../../website/seo.rst:241 msgid "" "On top of that, the HTML pages can be compressed, but this is usually " "handled by your web server (NGINX or Apache)." -msgstr "" +msgstr "最重要的是，HTML页面可压缩，但这通常由Web服务器处理(Nginx或Apache)。" #: ../../website/seo.rst:244 msgid "" "The Odoo Website builder has been optimized to guarantee clean and short " "HTML code. Building blocks have been developed to produce clean HTML code, " "usually using bootstrap and the HTML editor." -msgstr "" +msgstr "Odoo网站建设者进行了优化，确保简短而干净的HTML代码。模块已开发, 用于制作干净的HTML代码，通常使用bootstrap和HTML编辑器。" #: ../../website/seo.rst:248 msgid "" "As an example, if you use the color picker to change the color of a " "paragraph to the primary color of your website, Odoo will produce the " "following code:" -msgstr "" +msgstr "例如，如果你使用颜色选择器来改变一个段落的颜色, 同网站的主色调，Odoo将产生以下代码：" #: ../../website/seo.rst:252 msgid "``

My Text

``" @@ -478,7 +478,7 @@ msgstr "``

文字

``" msgid "" "Whereas most HTML editors (such as CKEditor) will produce the following " "code:" -msgstr "" +msgstr "而大多数的HTML编辑器(如CKEditor)会产生下面的代码：" #: ../../website/seo.rst:257 msgid "``

My Text

``" @@ -493,7 +493,7 @@ msgid "" "As of 2015, websites that are not mobile-friendly are negatively impacted in" " Google Page ranking. All Odoo themes rely on Bootstrap 3 to render " "efficiently according to the device: desktop, tablet or mobile phone." -msgstr "" +msgstr "截至2015，网站受Google的负面影响。Odoo依靠引导3提供有效地根据, 设备有：台式机，平板电脑或手机。" #: ../../website/seo.rst:270 msgid "" @@ -501,7 +501,7 @@ msgid "" "website are mobile friendly. (as opposed to traditional CMS which have " "mobile friendly themes, but some specific modules or pages are not designed " "to be mobile friendly as they all have their own CSS frameworks)" -msgstr "" +msgstr "Odoo模块共享相同的技术，网站上的所有页面绝对支持移动。(传统的CMS支持移动，但一些具体模块或页面设计不支持移动, 因他们都有自己的CSS框架)" #: ../../website/seo.rst:277 msgid "Browser caching" @@ -516,13 +516,13 @@ msgid "" "`__. " "The ``457-0da1d9d`` part of this URL will change if you modify the CSS of " "your website." -msgstr "" +msgstr "JavaScript、图片和CSS资源有一个URL，当内容变化时, URL会动态变化。举个例子，所有CSS文件通过这个网址下载: `http://localhost:8069/web/content/457-0da1d9d/web.assets\\_common.0.css `__. 如果修改网站的CSS, URL的``457-0da1d9d`` 部分URL会改变。" #: ../../website/seo.rst:286 msgid "" "This allows Odoo to set a very long cache delay (XXX) on these resources: " "XXX secs, while being updated instantly if you update the resource." -msgstr "" +msgstr "这让Odoo树立了一个很长的缓存延迟 (XXX) , 对这些资源：XXX秒，即时更新如果你更新资源。" #: ../../website/seo.rst:294 msgid "Scalability" @@ -534,19 +534,19 @@ msgid "" "and eCommerce (Drupal, Wordpress, Magento, Prestashop). The following link " "provides an analysis of the major open source CMS and eCommerce compared to " "Odoo when it comes to high query volumes." -msgstr "" +msgstr "除了速度快，Odoo也比传统的CMS和电子商务更具可扩展性 (Drupal, Wordpress, Magento, Prestashop). 以下链接提供了主要的开源CMS和电子商务与Odoo的分析相比，当高查询量时。" #: ../../website/seo.rst:301 msgid "" "`*https://www.odoo.com/slides/slide/197* `__" -msgstr "" +msgstr "`*https://www.odoo.com/slides/slide/197* `__" #: ../../website/seo.rst:303 msgid "" "Here is the slide that summarizes the scalability of Odoo eCommerce and Odoo" " CMS. (based on Odoo version 8, Odoo 9 is even faster)" -msgstr "" +msgstr "这些幻灯片总结了可扩展性的Odoo电子商务和 Odoo CMS。(基于Odoo 8版，Odoo 9更快)" #: ../../website/seo.rst:310 msgid "URLs handling" @@ -558,15 +558,15 @@ msgstr "URL结构" #: ../../website/seo.rst:315 msgid "A typical Odoo URL will look like this:" -msgstr "" +msgstr "一个典型的Odoo URL看起来是：" #: ../../website/seo.rst:317 msgid "https://www.mysite.com/fr\\_FR/shop/product/my-great-product-31" -msgstr "" +msgstr "https://www.mysite.com/fr\\_FR/shop/product/my-great-product-31" #: ../../website/seo.rst:319 msgid "With the following components:" -msgstr "" +msgstr "有以下组件：" #: ../../website/seo.rst:321 msgid "**https://** = Protocol" @@ -574,7 +574,7 @@ msgstr "**https://** = 协议" #: ../../website/seo.rst:323 msgid "**www.mysite.com** = your domain name" -msgstr "" +msgstr "**www.mysite.com** = 你的域名" #: ../../website/seo.rst:325 msgid "" @@ -582,14 +582,14 @@ msgid "" "the visitor browses the main language of the website (english by default, " "but you can set another language as the main one). Thus, the English version" " of this page is: https://www.mysite.com/shop/product/my-great-product-31" -msgstr "" +msgstr "**/fr\\_FR** =网页的语言。URL这部分将删除，如果访问者浏览网站的主要语言(英语被默认为主要语言，但是你可以设置一个语言为主要语言)。因此，这一页的英文版本是：https://www.mysite.com/shop/product/my-great-product-31" #: ../../website/seo.rst:331 msgid "" "**/shop/product** = every module defines its own namespace (/shop is for the" " catalog of the eCommerce module, /shop/product is for a product page). This" " name can not be customized to avoid conflicts in different URLs." -msgstr "" +msgstr "**/商店/产品**=每个模块定义了命名空间(/商店是为电子商务模块的目录，/商店/产品是为产品页)。此名称不能定制，以避免在不同URL中引起冲突。" #: ../../website/seo.rst:336 msgid "" @@ -598,43 +598,43 @@ msgid "" "product named \"Pain carré\" will be slugified to \"pain-carre\". Depending " "on the namespace, this could be different objects (blog post, page title, " "forum post, forum comment, product category, etc)" -msgstr "" +msgstr "**伟大的产品* *=默认情况下，这是指slugified称号的产品。但你可以自定义。产品名为 \"Pain carré\"。根据命名空间，这可能是不同的对象(博客文章，网页标题，论坛帖子，论坛评论，产品类别等)" #: ../../website/seo.rst:343 msgid "**-31** = the unique ID of the product" -msgstr "" +msgstr "**-31** = 产品的唯一ID号" #: ../../website/seo.rst:345 msgid "" "Note that any dynamic component of an URL can be reduced to its ID. As an " "example, the following URLs all do a 301 redirect to the above URL:" -msgstr "" +msgstr "请注意，任何一个网址的动态组件都可以减少它的ID。举个例子，下面的URL重定了301：" #: ../../website/seo.rst:348 msgid "https://www.mysite.com/fr\\_FR/shop/product/31 (short version)" -msgstr "" +msgstr "https://www.mysite.com/fr\\_FR/shop/product/31 (短的版本)" #: ../../website/seo.rst:350 msgid "http://mysite.com/fr\\_FR/shop/product/31 (even shorter version)" -msgstr "" +msgstr "http://mysite.com/fr\\_FR/shop/product/31 (更短版本)" #: ../../website/seo.rst:352 msgid "" "http://mysite.com/fr\\_FR/shop/product/other-product-name-31 (old product " "name)" -msgstr "" +msgstr "http://mysite.com/fr\\_FR/shop/product/other-product-name-31 (旧产品名)" #: ../../website/seo.rst:355 msgid "" "This could be useful to easily get shorter version of an URL and handle " "efficiently 301 redirects when the name of your product changes over time." -msgstr "" +msgstr "当产品随着时间变化, URL的较短的版本非常游泳, 并高效处理301重定向。" #: ../../website/seo.rst:359 msgid "" "Some URLs have several dynamic parts, like this one (a blog category and a " "post):" -msgstr "" +msgstr "一些URL有几个动态部分，如这个(一个博客类别和一个职位)：" #: ../../website/seo.rst:362 msgid "https://www.odoo.com/blog/company-news-5/post/the-odoo-story-56" @@ -650,14 +650,14 @@ msgstr "公司新闻 :博客的标题" #: ../../website/seo.rst:368 msgid "The Odoo Story: is the title of a specific blog post" -msgstr "" +msgstr "Odoo故事：是一个特定的博客文章的标题" #: ../../website/seo.rst:370 msgid "" "When an Odoo page has a pager, the page number is set directly in the URL " "(does not have a GET argument). This allows every page to be indexed by " "search engines. Example:" -msgstr "" +msgstr "当Odoo页面有一个寻呼机，页码直接在URL设置(没有得到GET论证)。这使得搜索引擎可索引每个页面。例如:" #: ../../website/seo.rst:374 msgid "https://www.odoo.com/blog/page/3" @@ -668,31 +668,31 @@ msgid "" "Having the language code as fr\\_FR is not perfect in terms of SEO. Although" " most search engines treat now \"\\_\" as a word separator, it has not " "always been the case. We plan to improve that for Odoo 10." -msgstr "" +msgstr "像fr\\_FR 的语言代码并不完美。虽然大多数搜索引擎把\"\\_\"作为分离器，但并非一直如此。我们计划在Odoo 10改进。" #: ../../website/seo.rst:382 msgid "Changes in URLs & Titles" -msgstr "" +msgstr "在URLs & Titles中改进" #: ../../website/seo.rst:384 msgid "" "When the URL of a page changes (e.g. a more SEO friendly version of your " "product name), you don't have to worry about updating all links:" -msgstr "" +msgstr "当页面的网址改变(例如，一个你的产品名称的更友好的版本)，不必担心更新所有链接：" #: ../../website/seo.rst:387 msgid "Odoo will automatically update all its links to the new URL" -msgstr "" +msgstr "Odoo将自动在新的URL更新所有链接" #: ../../website/seo.rst:389 msgid "" "If external websites still points to the old URL, a 301 redirect will be " "done to route visitors to the new website" -msgstr "" +msgstr "如果外部网站仍然用旧的网址，301重定向将引导访问者到新的网站" #: ../../website/seo.rst:392 msgid "As an example, this URL:" -msgstr "" +msgstr "举个例子, 这 URL:" #: ../../website/seo.rst:394 msgid "http://mysite.com/shop/product/old-product-name-31" @@ -712,7 +712,7 @@ msgid "" " the changes will apply automatically everywhere in your website. The old " "link still works for links coming from external website. (with a 301 " "redirect to not lose the SEO link juice)" -msgstr "" +msgstr "总之，只要改变博客的标题或产品的名称，变化将自动应用于在网站所有地方。旧的链接仍适用于外部网站的链接。(用301重定向, 为了不丢失SEO链接)" #: ../../website/seo.rst:406 msgid "HTTPS" @@ -724,7 +724,7 @@ msgid "" " websites. So, by default all Odoo Online instances are fully based on " "HTTPS. If the visitor accesses your website through a non HTTPS url, it gets" " a 301 redirect to its HTTPS equivalent." -msgstr "" +msgstr "截至2014年8月，谷歌提升排名添加到安全的HTTPS / SSL的网站。因此，默认情况下, 所有Odoo在线实例是完全基于HTTPS来实现。如果访问者通过非HTTPS URL访问您的网站，它产生一个与HTTPS同等效果的301重定向。" #: ../../website/seo.rst:414 msgid "Links: nofollow strategy" @@ -735,38 +735,38 @@ msgid "" "Having website that links to your own page plays an important role on how " "your page ranks in the different search engines. The more your page is " "linked from external and quality websites, the better is it for your SEO." -msgstr "" +msgstr "链接到你自己的页面的网站在你的页面如何在不同的搜索引擎中排名起着重要的作用。越多从外部和高质量的网站链接到你的页面，你的SEO更优化。" #: ../../website/seo.rst:421 msgid "Odoo follows the following strategies to manage links:" -msgstr "" +msgstr "Odoo以下的策略来管理链接：" #: ../../website/seo.rst:423 msgid "" "Every link you create manually when creating page in Odoo is \"dofollow\", " "which means that this link will contribute to the SEO Juice for the linked " "page." -msgstr "" +msgstr "你手动创建的每一个链接, 在Odoo是\"dofollow\"，这意味着，这链接将有助于SEO。" #: ../../website/seo.rst:427 msgid "" "Every link created by a contributor (forum post, blog comment, ...) that " "links to your own website is \"dofollow\" too." -msgstr "" +msgstr "每个由贡献者创建的环节(论坛，博客评论，…)，链接到自己的网站也是“dofollow”。" #: ../../website/seo.rst:430 msgid "" "But every link posted by a contributor that links to an external website is " "\"nofollow\". In that way, you do not run the risk of people posting links " "on your website to third-party websites which have a bad reputation." -msgstr "" +msgstr "但贡献者的每个链接到外部网站的是“nofollow”。这样，你就不会有你的网站链接到坏名声的第三方网站的风险。" #: ../../website/seo.rst:435 msgid "" "Note that, when using the forum, contributors having a lot of Karma can be " "trusted. In such case, their links will not have a ``rel=\"nofollow\"`` " "attribute." -msgstr "" +msgstr "请注意，当使用该论坛时，可放心使用很多贡献者的Karma。在这种情况下，他们的链接将不会有``rel=\"nofollow\"``的属性。" #: ../../website/seo.rst:440 msgid "Multi-language support" @@ -780,7 +780,7 @@ msgstr "多国语言 URL" msgid "" "If you run a website in multiple languages, the same content will be " "available in different URLs, depending on the language used:" -msgstr "" +msgstr "如果在多个语言中运行一个网站，在不同的URL将看到相同的内容，这取决于所使用的语言：" #: ../../website/seo.rst:448 msgid "" @@ -799,11 +799,11 @@ msgid "" "In this example, fr\\_FR is the language of the page. You can even have " "several variations of the same language: pt\\_BR (Portuguese from Brazil) , " "pt\\_PT (Portuguese from Portugal)." -msgstr "" +msgstr "在这个例子中，fr\\_FR是网页的语言。你甚至可以有同一语言的一些变化：pt\\_BR(巴西的葡萄牙语)，pt\\_PT(葡萄牙的葡萄牙语)。" #: ../../website/seo.rst:457 msgid "Language annotation" -msgstr "" +msgstr "语言诠释" #: ../../website/seo.rst:459 msgid "" @@ -811,17 +811,17 @@ msgid "" "URL, Odoo will add an HTML link element in the header. In the HTML " "section of the English version, Odoo automatically adds a link element " "pointing to the other versions of that webpage;" -msgstr "" +msgstr "告诉谷歌，第二个URL是第一个URL的法语翻译，Odoo将在文件顶端增加HTML链接元素。英文版本的HTML 部分，Odoo自动添加可指向其他网页的链接元素；" #: ../../website/seo.rst:464 msgid "" "" -msgstr "" +msgstr "" #: ../../website/seo.rst:467 msgid "With this approach:" -msgstr "" +msgstr "用这种方法：" #: ../../website/seo.rst:469 msgid "" @@ -834,7 +834,7 @@ msgid "" "You do not get penalized by Google if your page is not translated yet, since" " it is not a duplicated content, but a different version of the same " "content." -msgstr "" +msgstr "如果页面还没有翻译，就不会被谷歌惩罚，因为它不是一个重复的内容，而是在不同版本中相同的内容。" #: ../../website/seo.rst:478 msgid "Language detection" @@ -846,14 +846,14 @@ msgid "" "yourwebsite.com/shop), his may automatically be redirected to a translated " "version according to his browser language preference: (e.g. " "yourwebsite.com/fr\\_FR/shop)." -msgstr "" +msgstr "当访客首次登陆你的网站(例如yourwebsite.com/shop)，可能会自动链接到他所用的语言的网页：(例如yourwebsite.com/fr\\_FR/shop)。" #: ../../website/seo.rst:485 msgid "" "Odoo redirects visitors to their prefered language only the first time " "visitors land at your website. After that, it keeps a cookie of the current " "language to avoid any redirection." -msgstr "" +msgstr "只有访客第一次登陆网页时, Odoo才会重定向访客所用的语言。在那之后，它保留了当前语言，以避免任何重定向。" #: ../../website/seo.rst:489 msgid "" @@ -861,7 +861,7 @@ msgid "" " the default language in your link, example: yourwebsite.com/en\\_US/shop. " "This will always land visitors to the English version of the page, without " "using the browser language preferences." -msgstr "" +msgstr "迫使客人使用默认语言，您可在链接中使用语言的默认编码，例如: yourwebsite.com/en\\_US/shop. 这将让访问者只登陆英文版本的页面，而不使用浏览器语言。" #: ../../website/seo.rst:496 msgid "Meta Tags" @@ -869,7 +869,7 @@ msgstr "元标签" #: ../../website/seo.rst:499 msgid "Titles, Keywords and Description" -msgstr "" +msgstr "标题，关键字和描述" #: ../../website/seo.rst:501 msgid "" @@ -878,7 +878,7 @@ msgid "" "engines to rank and categorize your website according to a specific search " "query. So, it is important to have titles and keywords in line with what " "people search in Google." -msgstr "" +msgstr "每一个网页都应该定义 ````, ``<description>`` 和 ``<keywords>`` 。这些信息便于搜索引擎根据一个特定的搜索查询用来对你的网站进行排名和分类。因此，重要的是要有符合人们谷歌搜索的标题和关键字。" #: ../../website/seo.rst:507 msgid "" @@ -886,13 +886,13 @@ msgid "" "website, Odoo provides a **Promote** tool, in the top bar of the website " "builder. This tool will contact Google to give you information about your " "keywords and do the matching with titles and contents in your page." -msgstr "" +msgstr "写出高质量的Meta标签，这将提升您的网站流量，在高级网站建设者吧, Odoo提供**促进**的工具。这个工具将与谷歌联系，给你关于你的关键字的信息，并在页面中匹配标题和内容。" #: ../../website/seo.rst:516 msgid "" "If your website is in multiple languages, you can use the Promote tool for " "every language of a single page;" -msgstr "" +msgstr "如果你的网站是在多语言，你可在每个单页使用对每一种语言使用Promote 工具；" #: ../../website/seo.rst:519 msgid "" @@ -900,14 +900,14 @@ msgid "" " content strategy. In order to help you optimize all your blog post, Odoo " "provides a page that allows you to quickly scan the meta tags of all your " "blog posts." -msgstr "" +msgstr "在SEO方面，内容为王。因此，博客在你的内容战略中发挥着重要的作用。为了帮助你优化你的博客文章，Odoo提供的页面可让你快速浏览你所有博客文章的meta标签。" #: ../../website/seo.rst:528 msgid "" "This /blog page renders differently for public visitors that are not logged " "in as website administrator. They do not get the warnings and keyword " "information." -msgstr "" +msgstr "此/博客页面为那些作为未登陆的网站管理员呈现不同的信息。他们没有得到警告和关键字信息。" #: ../../website/seo.rst:533 msgid "Sitemap" @@ -917,7 +917,7 @@ msgstr "站点地图" msgid "" "Odoo will generate a ``/sitemap.xml`` file automatically for you. For " "performance reasons, this file is cached and updated every 12 hours." -msgstr "" +msgstr "Odoo将自动生成``/sitemap.xml``文件。基于性能原因，该文件被缓存，并将每12小时更新一次。" #: ../../website/seo.rst:538 msgid "" @@ -926,22 +926,22 @@ msgid "" "respecting the `sitemaps.org protocol " "<http://www.sitemaps.org/protocol.html>`__ grouping sitemap URL's in 45000 " "chunks per file." -msgstr "" +msgstr "默认情况下，所有的URL将在``/sitemap.xml``文件，但是如果有很多页，Odoo将自动创建一个Sitemap索引文件，遵守`sitemaps.org protocol <http://www.sitemaps.org/protocol.html>`__ 在每个文件的45000中分组Sitemap URL。" #: ../../website/seo.rst:544 msgid "Every sitemap entry has 4 attributes that are computed automatically:" -msgstr "" +msgstr "每一个网站的入口有4个属性，自动计算：" #: ../../website/seo.rst:546 msgid "``<loc>`` : the URL of a page" -msgstr "" +msgstr "``<loc>`` : 一页的 URL" #: ../../website/seo.rst:548 msgid "" "``<lastmod>`` : last modification date of the resource, computed " "automatically based on related object. For a page related to a product, this" " could be the last modification date of the product or the page" -msgstr "" +msgstr "``<lastmod>`` : 资源的最后修改日期，基于相关对象自动计算。一页关联一个产品，这可能是该产品或页面的最后修改日期" #: ../../website/seo.rst:553 msgid "" @@ -949,11 +949,11 @@ msgid "" " their content (example: a forum might assign a priority based on the number" " of votes on a specific post). The priority of a static page is defined by " "it's priority field, which is normalized. (16 is the default)" -msgstr "" +msgstr "``<priority>`` : 模块可以基于自己的内容有优先级算法(例如：一个论坛可能基于投票的数量分配优先权)。静态页面的优先级是由它的优先级字段定义的，常规化。(16是默认值)" #: ../../website/seo.rst:560 msgid "Structured Data Markup" -msgstr "" +msgstr "结构化数据标记" #: ../../website/seo.rst:562 msgid "" @@ -961,13 +961,13 @@ msgid "" "results. It is a way for website owners to send structured data to search " "engine robots; helping them to understand your content and create well-" "presented search results." -msgstr "" +msgstr "结构化数据标记是用来在搜索引擎中产生Rich Snippets的。这是网站所有者用来把结构化数据发送给搜索引擎机器人;帮助他们了解你的内容，并产生良好的搜索结果。" #: ../../website/seo.rst:567 msgid "" "Google supports a number of rich snippets for content types, including: " "Reviews, People, Products, Businesses, Events and Organizations." -msgstr "" +msgstr "谷歌支持许多内容类型的丰富片段，包括：审核人、人、产品、企业、活动和组织。" #: ../../website/seo.rst:570 msgid "" @@ -975,7 +975,7 @@ msgid "" "<http://schema.org>`__ specification for events, eCommerce products, forum " "posts and contact addresses. This allows your product pages to be displayed " "in Google using extra information like the price and rating of a product:" -msgstr "" +msgstr "Odoo实现微观数据在`schema.org <http://schema.org>`__ 中定义，对活动, 电子商务产品，论坛帖子和联系地址的描述。这可以让你的产品页面显示在谷歌信息栏，如产品的价格和评级：" #: ../../website/seo.rst:580 msgid "robots.txt" @@ -985,11 +985,11 @@ msgstr "robots.txt" msgid "" "Odoo automatically creates a ``/robots.txt`` file for your website. Its " "content is:" -msgstr "" +msgstr "Odoo为网站自动创建``/robots.txt`` 文件。其内容是：" #: ../../website/seo.rst:585 msgid "User-agent: \\*" -msgstr "" +msgstr "用户代理: \\*" #: ../../website/seo.rst:587 msgid "Sitemap: https://www.odoo.com/sitemap.xml" @@ -1003,7 +1003,7 @@ msgstr "内容为王" msgid "" "When it comes to SEO, content is usually king. Odoo provides several modules" " to help you build your contents on your website:" -msgstr "" +msgstr "当谈到搜索引擎优化，内容为王。Odoo提供了几个模块, 帮助你在网站上建立内容：" #: ../../website/seo.rst:595 msgid "" @@ -1011,46 +1011,46 @@ msgid "" "content is automatically indexed on the web page. Example: " "`https://www.odoo.com/slides/public-channel-1 <https://www.odoo.com/slides" "/public-channel-1>`__" -msgstr "" +msgstr "* * Odoo幻灯片* *：发表所有的PowerPoint或者PDF演示文稿。内容将自动在网页上进行索引。例如: `https://www.odoo.com/slides/public-channel-1 <https://www.odoo.com/slides/public-channel-1>`__" #: ../../website/seo.rst:599 msgid "" "**Odoo Forum**: let your community create contents for you. Example: " "`https://odoo.com/forum/1 <https://odoo.com/forum/1>`__ (accounts for 30% of" " Odoo.com landing pages)" -msgstr "" +msgstr "* *Odoo论坛 * *：让社区创建内容。例如: `https://odoo.com/forum/1 <https://odoo.com/forum/1>`__(登陆odoo.com页面的30%账户)" #: ../../website/seo.rst:603 msgid "" "**Odoo Mailing List Archive**: publish mailing list archives on your " "website. Example: `https://www.odoo.com/groups/community-59 " "<https://www.odoo.com/groups/community-59>`__ (1000 pages created per month)" -msgstr "" +msgstr "** Odoo邮件列表存档**：在网站上发布邮件列表档案。例如: `https://www.odoo.com/groups/community-59 <https://www.odoo.com/groups/community-59>`__ (每月的1000页)" #: ../../website/seo.rst:608 msgid "**Odoo Blogs**: write great contents." -msgstr "" +msgstr "* * Odoo博客* *：写的内容。" #: ../../website/seo.rst:611 msgid "" "The 404 page is a regular page, that you can edit like any other page in " "Odoo. That way, you can build a great 404 page to redirect to the top " "content of your website." -msgstr "" +msgstr "404页是一个普通的网页，你可以编辑它。这样，你可以建立一个404页，重定向到你网站的内容顶部。" #: ../../website/seo.rst:616 msgid "Social Features" -msgstr "" +msgstr "社区功能" #: ../../website/seo.rst:619 msgid "Twitter Cards" -msgstr "" +msgstr "Twitter 卡" #: ../../website/seo.rst:621 msgid "" "Odoo does not implement twitter cards yet. It will be done for the next " "version." -msgstr "" +msgstr "Odoo没有实施推特卡。将在下一个版本完成。" #: ../../website/seo.rst:625 msgid "Social Network" @@ -1061,7 +1061,7 @@ msgid "" "Odoo allows to link all your social network accounts in your website. All " "you have to do is to refer all your accounts in the **Settings** menu of the" " **Website Admin** application." -msgstr "" +msgstr "Odoo允许将所有的社交网络帐户链接到您的网站。在**设置**菜单下设置所有的帐户。" #: ../../website/seo.rst:632 msgid "Test Your Website" @@ -1071,11 +1071,11 @@ msgstr "测试你的网站" msgid "" "You can compare how your website rank, in terms of SEO, against Odoo using " "WooRank free services: `https://www.woorank.com <https://www.woorank.com>`__" -msgstr "" +msgstr "你可以比较你的网站排名，对SEO而言，反对Odoo用woorank免费服务: `https://www.woorank.com <https://www.woorank.com>`__" #: ../../website/translate_website.rst:3 msgid "How can I translate my website?" -msgstr "" +msgstr "我怎么翻译我的网站？" #: ../../website/translate_website.rst:6 msgid "Overview" @@ -1085,7 +1085,7 @@ msgstr "概述" msgid "" "In addition to creating great modern websites, Odoo gives you the " "possibility to translate it in different languages." -msgstr "" +msgstr "除了创造伟大的现代网站，Odoo让你尽可能用不同语言翻译。" #: ../../website/translate_website.rst:12 msgid "Process" @@ -1104,13 +1104,13 @@ msgid "" "the **App** module and Install **Automated translations through Gengo Api** " "and **Website Gengo Translator**. If you want to do it manually, don't " "install anything, and follow the next step." -msgstr "" +msgstr "有两种方法可翻译你的网站，可以手动或用Gengo App自动翻译。如果你想自动做，去* *App * *模块, 安装**Automated translations through Gengo Api** 和**Website Gengo Translator**。如果你想手动做，不要安装任何东西，并按照下一步。" #: ../../website/translate_website.rst:23 msgid "" "Now go to your website. On the bottom right corner of the page, click on " "**Add a language**." -msgstr "" +msgstr "现在去你的网站。在页面的右下角，单击**添加一个语言**。" #: ../../website/translate_website.rst:29 msgid "" @@ -1123,13 +1123,13 @@ msgid "" "You will see that Now, next to English there is also French, which means " "that the page for the translation has been created. You can also see that " "some of the text has been translated automatically." -msgstr "" +msgstr "你会看到，英语的旁边是法语，这意味着该网页已翻译。你也可以看到，一些文本已自动翻译。" #: ../../website/translate_website.rst:42 msgid "" "To translate the content of the website, click on **Translate** (here " "**Traduire** since we want to translate the website in French)." -msgstr "" +msgstr "翻译网站的内容，点击**翻译**(这里 **Traduire** , 是因为我们想把网站翻译成法国)。" #: ../../website/translate_website.rst:45 msgid "" @@ -1140,12 +1140,12 @@ msgid "" "`*https://gengo.com/auth/form/login/* " "<https://gengo.com/auth/form/login/>`__ in order to create one. You need to " "ask for a public key and a private key." -msgstr "" +msgstr "还有，如果你已安装了Gengo翻译，**Translate** 的按钮旁边还有按钮**Translate automatically**。一旦你点击这个按钮，会问你一些关于账户上的信息。如果你还没有帐号，去 `*https://gengo.com/auth/form/login/* <https://gengo.com/auth/form/login/>`__创建一个。你需要一个公钥和一个私钥。" #: ../../website/translate_website.rst:53 msgid "" "The content you wish to translate will then be translated automatically." -msgstr "" +msgstr "你希望翻译的内容将会被自动翻译。" #: ../../website/translate_website.rst:58 msgid "" @@ -1153,4 +1153,4 @@ msgid "" "green. The yellow represents the content that you have to translate by " "yourself. The green represents the content that has already been translated " "automatically." -msgstr "" +msgstr "现在你可以看到，大部分的内容已用黄色或绿色突出了。黄色代表必须自己翻译。绿色代表已自动翻译。" From 8aba74fda6b3a2453c37ba57eb7599ed9b17b210 Mon Sep 17 00:00:00 2001 From: Damien Bouvy <dbo@odoo.com> Date: Wed, 5 Apr 2017 17:22:44 +0200 Subject: [PATCH 02/14] [ADD] legal: terms of sales + pdf versions --- conf.py | 2 + legal.rst | 12 +++++ legal/terms.rst | 1 + legal/terms/i18n/terms_of_sale_fr.rst | 60 +++++++++++++++++++++++ legal/terms/i18n/terms_of_sale_tex_fr.rst | 6 +++ legal/terms/terms_of_sale.rst | 50 +++++++++++++++++++ legal/terms/terms_of_sale_tex.rst | 6 +++ 7 files changed, 137 insertions(+) create mode 100644 legal/terms/i18n/terms_of_sale_fr.rst create mode 100644 legal/terms/i18n/terms_of_sale_tex_fr.rst create mode 100644 legal/terms/terms_of_sale.rst create mode 100644 legal/terms/terms_of_sale_tex.rst diff --git a/conf.py b/conf.py index 87ff4f1f0..6af164a54 100644 --- a/conf.py +++ b/conf.py @@ -225,6 +225,8 @@ latex_documents = [ ('legal/terms/enterprise_tex', 'odoo_enterprise_agreement_v5.tex', 'Odoo Enterprise Subscription Agreement', '', 'howto'), ('legal/terms/i18n/enterprise_tex_fr', 'odoo_enterprise_agreement_v5_fr.tex', 'Odoo Enterprise Subscription Agreement (FR)', '', 'howto'), ('legal/terms/partnership_tex', 'odoo_partnership_agreement_v5.tex', 'Odoo Partnership Agreement', '', 'howto'), + ('legal/terms/terms_of_sale', 'terms_of_sale_v1.tex', 'Odoo Terms of Sale', '', 'howto'), + ('legal/terms/i18n/terms_of_sale_fr', 'terms_of_sale_v1_fr.tex', u'Conditions Générales de Vente Odoo', '', 'howto'), #('index', 'UnderstandingAccountingForEntrepreneurs.tex', u'Understanding Accounting For Entrepreneurs Documentation', u'fp, xmo', 'manual'), ] diff --git a/legal.rst b/legal.rst index d11692342..3acd2f1a5 100644 --- a/legal.rst +++ b/legal.rst @@ -31,12 +31,24 @@ Terms and Conditions :alt: Download Odoo Enterprise Agreement (FR) :target: odoo_enterprise_agreement_v5_fr.pdf +.. |download_terms_of_sale| image:: _static/banners/pdf-icon.png + :alt: Download Odoo Terms of Sale + :target: terms_of_sale_v1.pdf + +.. |download_terms_of_sale_fr| image:: _static/banners/pdf-icon.png + :alt: Download Odoo Terms of Sale (FR) + :target: terms_of_sale_v1_fr.pdf + .. |download_partnership| image:: _static/banners/pdf-icon.png :alt: Download Odoo Partnership Agreement :target: odoo_partnership_agreement_v5.pdf - :ref:`enterprise_agreement` |nbsp| |nbsp| |download_enterprise| - :ref:`enterprise_agreement_fr` |nbsp| |nbsp| |download_enterprise_fr| + +- :ref:`terms_of_sale` |nbsp| |nbsp| |download_terms_of_sale| +- :ref:`terms_of_sale_fr` |nbsp| |nbsp| |download_terms_of_sale_fr| + .. - :ref:`partnership_agreement` |nbsp| |nbsp| |download_partnership| diff --git a/legal/terms.rst b/legal/terms.rst index 0269e7398..e95d4b077 100644 --- a/legal/terms.rst +++ b/legal/terms.rst @@ -10,3 +10,4 @@ Terms and Conditions terms/online terms/enterprise terms/partnership + terms/terms_of_sale diff --git a/legal/terms/i18n/terms_of_sale_fr.rst b/legal/terms/i18n/terms_of_sale_fr.rst new file mode 100644 index 000000000..9ba3fea64 --- /dev/null +++ b/legal/terms/i18n/terms_of_sale_fr.rst @@ -0,0 +1,60 @@ +.. _terms_of_sale_fr: + +============================= +Conditions Générales de Vente +============================= + +Le client renonce explicitement à ses propres conditions générales, même dans le +cas où celles-ci seraient postérieures aux présentes conditions générales. Toute +dérogation doit, pour être valable, être convenue de manière expresse, préalable +et par écrit. Les présentes conditions sont une prolongation du contrat signé +entre parties et font en tant que telles partie intégrante de la relation +contractuelle entre parties. + +Toutes les offres, tarifs ou listes de prix d’Odoo S.A. s’entendent, sauf +stipulation contraire, sans engagement. Sauf stipulation contraire, toutes les +factures sont payables à Odoo S.A. au comptant, au moment de la livraison. +L'endroit de paiement est le siège social de Odoo S.A. peut envoyer des factures +pour des marchandises déjà livrées même avant la livraison complète des +marchandises. Le Client ne peut en aucun cas compenser une quelconque créance +sur Odoo S.A. avec son obligation de paiement, sauf stipulation contraire. + +Si la facture n’est pas payée à son échéance, elle sera, à titre d’indemnité +forfaitaire, majorée de 15% et majorée d'autres indemnités, éventuellement dues +pour tout préjudice, à démontrer par Odoo S.A.. Le non-paiement de tout ou +partie d’une facture à son échéance rend immédiatement exigibles toutes sommes +ou toutes factures dues non-encore échue. En cas de non-paiement d’une facture, +Odoo S.A.  a le droit de rompre toutes les conventions de vente qui restent +encore à exécuter. + +Si le Client est autorisé à effectuer des paiements à terme, l’absence de +paiement d’un seul terme entraînera de plein droit et sans mise en demeure +l’exigibilité de toute la dette, nonobstant toute indemnité supplémentaire. + +Certains pays appliquent une retenue à la source sur le montant de la facture, +conformément à leur législation interne. La retenue à la source sera réglée par +le client, auprès de l'administration fiscale. En aucun cas, Odoo S.A. ne sera +impliquée dans les coûts liés à la législation du pays. Le montant de la facture +est donc dû à Odoo S.A. dans son intégralité et n’inclus pas les coûts relatifs +à la législation du pays où se trouve le client. + +Odoo S.A. s'engage à faire ses meilleurs efforts en vue de fournir en temps +utile des services performants. Toutefois, aucune de ses obligations ne peut +être considérée comme étant une obligation de résultat. Odoo S.A. ne peut, en +aucun cas, être appelée en garantie par le client dans le cadre de demandes en +dommages et intérêts formulée par le consommateur final à l'encontre du client. + +Dans la limite autorisée par la loi, la responsabilité globale de chaque partie, +ainsi que de ses filiales ne dépassera pas 50% du montant total réglé par le +Client en vertu du présent Contrat au cours des 12 mois précédant la date de +l'événement donnant lieu à une telle réclamation. Des réclamations multiples +n'augmenteront pas cette limite. + +Toute réclamation doit, pour être recevable, être notifiée à Odoo S.A., à son +siège social, par courrier recommandé dans les 8 jours suivant la livraison des +marchandises ou la prestation des services. + +Tout litige résultant de la présente convention ressort de l’application du +droit belge et est de la compétence des Tribunaux de l’arrondissement du siège +social d’Odoo S.A. hormis le droit d’Odoo S.A. de porter le litige devant une +autre juridiction compétente. \ No newline at end of file diff --git a/legal/terms/i18n/terms_of_sale_tex_fr.rst b/legal/terms/i18n/terms_of_sale_tex_fr.rst new file mode 100644 index 000000000..6a0c8fb00 --- /dev/null +++ b/legal/terms/i18n/terms_of_sale_tex_fr.rst @@ -0,0 +1,6 @@ + +.. toctree:: + :maxdepth: 4 + :hidden: + + terms_of_sale_fr \ No newline at end of file diff --git a/legal/terms/terms_of_sale.rst b/legal/terms/terms_of_sale.rst new file mode 100644 index 000000000..9bcf3b891 --- /dev/null +++ b/legal/terms/terms_of_sale.rst @@ -0,0 +1,50 @@ +.. _terms_of_sale: + +===================== +General Terms of Sale +===================== + +The client explicitly waives its own standard terms and conditions, even if +these were drawn up after these standard terms and conditions of sale. In +order to be valid, any derogation must be expressly agreed to in advance in +writing. + +Our invoices are payable within 21 working days, unless another payment +timeframe is indicated on either the invoice or the order. In the event of +non-payment by the due date, Odoo S.A. reserves the right to request a fixed +interest payment amounting to 15% of the sum remaining due. Odoo S.A. will be +authorised to suspend any provision of services without prior warning in the +event of late payment. + +If a payment is still outstanding more than sixty (60) days after the due +payment date, Odoo S.A. reserves the right to call on the services of a debt +recovery company. All legal expenses will be payable by the client. + +Certain countries apply withholding at source on the amount of invoices, in +accordance with their internal legislation. Any withholding at source will be +paid by the client to the tax authorities. Under no circumstances can Odoo S.A. +become involved in costs related to a country's legislation. The amount of the +invoice will therefore be due to Odoo S.A. in its entirety and does not include +any costs relating to the legislation of the country in which the client is +located. + +Odoo S.A. undertakes to do its best to supply services in due time in accordance +with the agreed timeframes. However, none of its obligations can be considered +as being an obligation to achieve results. Odoo S.A. cannot, under any +circumstances, be required by the client to appear as a third party in the +context of any claim for damages filed against the client by an end consumer. + +In order for it to be admissible, Odoo S.A. must be notified of any claim by +means of a letter sent by recorded delivery to its registered office within 8 +days of the delivery of the goods or the provision of the services. + +To the maximum extent permitted by law, the aggregate liability of each party +together with its affiliates arising will not exceed 50% of the total amount +paid by the Customer under this Agreement during the 12 months immediately +preceding the date of the event giving rise to such claim. Multiple claims shall +not enlarge this limitation. + +All our contractual relations will be governed exclusively by Belgian law. +Moreover, any dispute that may arise will be subject exclusively to the +jurisdiction of the courts of the Nivelles arrondissement (Belgium). + diff --git a/legal/terms/terms_of_sale_tex.rst b/legal/terms/terms_of_sale_tex.rst new file mode 100644 index 000000000..76e630b0f --- /dev/null +++ b/legal/terms/terms_of_sale_tex.rst @@ -0,0 +1,6 @@ + +.. toctree:: + :maxdepth: 4 + :hidden: + + terms_of_sale From 11609153cdddd04b12d165cd51846b7c6800eed9 Mon Sep 17 00:00:00 2001 From: Damien Bouvy <dbo@odoo.com> Date: Wed, 3 May 2017 16:19:23 +0200 Subject: [PATCH 03/14] [IMP] legal: ToS superseeding, implicit agreement, right to modify and versioning --- legal/terms/i18n/terms_of_sale_fr.rst | 21 +++++++++++++++++++-- legal/terms/terms_of_sale.rst | 18 +++++++++++++++++- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/legal/terms/i18n/terms_of_sale_fr.rst b/legal/terms/i18n/terms_of_sale_fr.rst index 9ba3fea64..fc4b920d4 100644 --- a/legal/terms/i18n/terms_of_sale_fr.rst +++ b/legal/terms/i18n/terms_of_sale_fr.rst @@ -4,6 +4,19 @@ Conditions Générales de Vente ============================= +.. note:: Dernière modification: 3 mai 2017. + +Ces conditions régissent la vente de produits et services entre +Odoo S.A. et le client. Des conditions supplémentaires peuvent s'appliquer pour +d'autres services offerts par Odoo S.A. (par exemple, l'Odoo Enterprise +Subscription Agreement). Si ces conditions supplémentaires entrent en +contradiction avec les Conditions Générales de Vente, les conditions +supplémentaires prévaudront. + +Veuillez lire ces conditions attentivement avant de faire une commande +auprès d'Odoo S.A. En commandant auprès d'Odoo S.A., le client marque son +accord avec les présentes conditions. + Le client renonce explicitement à ses propres conditions générales, même dans le cas où celles-ci seraient postérieures aux présentes conditions générales. Toute dérogation doit, pour être valable, être convenue de manière expresse, préalable @@ -46,14 +59,18 @@ dommages et intérêts formulée par le consommateur final à l'encontre du clie Dans la limite autorisée par la loi, la responsabilité globale de chaque partie, ainsi que de ses filiales ne dépassera pas 50% du montant total réglé par le -Client en vertu du présent Contrat au cours des 12 mois précédant la date de -l'événement donnant lieu à une telle réclamation. Des réclamations multiples +Client en vertu des présentes conditions au cours des 12 mois précédant la date +de l'événement donnant lieu à une telle réclamation. Des réclamations multiples n'augmenteront pas cette limite. Toute réclamation doit, pour être recevable, être notifiée à Odoo S.A., à son siège social, par courrier recommandé dans les 8 jours suivant la livraison des marchandises ou la prestation des services. +Odoo S.A. se réserve le droit de modifier ces conditions à n'importe quel moment +et sans notification préalable. Le client est soumis aux conditions en +application au moment de votre acceptation de ces conditions. + Tout litige résultant de la présente convention ressort de l’application du droit belge et est de la compétence des Tribunaux de l’arrondissement du siège social d’Odoo S.A. hormis le droit d’Odoo S.A. de porter le litige devant une diff --git a/legal/terms/terms_of_sale.rst b/legal/terms/terms_of_sale.rst index 9bcf3b891..50a2aeebc 100644 --- a/legal/terms/terms_of_sale.rst +++ b/legal/terms/terms_of_sale.rst @@ -4,6 +4,18 @@ General Terms of Sale ===================== +.. note:: Last revision: May 3, 2017. + +These General Terms of Sale govern the sale of products and services by +Odoo S.A. to the client. Additional terms may apply for services provided by +Odoo S.A. (for example, the Enterprise Subscription Agreement). If these +additional terms are inconsistent with the General Terms of Sale, the additional +terms will prevail over these General Terms of Sale. + +Please read these terms carefully before placing an order with Odoo S.A. By +accepting an order with Odoo S.A., the client marks his acceptance with these +terms. + The client explicitly waives its own standard terms and conditions, even if these were drawn up after these standard terms and conditions of sale. In order to be valid, any derogation must be expressly agreed to in advance in @@ -40,10 +52,14 @@ days of the delivery of the goods or the provision of the services. To the maximum extent permitted by law, the aggregate liability of each party together with its affiliates arising will not exceed 50% of the total amount -paid by the Customer under this Agreement during the 12 months immediately +paid by the Customer under these terms during the 12 months immediately preceding the date of the event giving rise to such claim. Multiple claims shall not enlarge this limitation. +Odoo S.A. reserves the right to modify these terms at any time without prior +notice. The client will be subject to the terms in force at the time of +acceptation of those terms. + All our contractual relations will be governed exclusively by Belgian law. Moreover, any dispute that may arise will be subject exclusively to the jurisdiction of the courts of the Nivelles arrondissement (Belgium). From a641ca38ebec102e85c13e79c4070883512785c6 Mon Sep 17 00:00:00 2001 From: Damien Bouvy <dbo@odoo.com> Date: Fri, 5 May 2017 14:28:02 +0200 Subject: [PATCH 04/14] [IMP] legal: include subsidiaries in Odoo S.A. denomination + French typo --- legal/terms/i18n/terms_of_sale_fr.rst | 14 +++++++------- legal/terms/terms_of_sale.rst | 11 ++++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/legal/terms/i18n/terms_of_sale_fr.rst b/legal/terms/i18n/terms_of_sale_fr.rst index fc4b920d4..c7861406d 100644 --- a/legal/terms/i18n/terms_of_sale_fr.rst +++ b/legal/terms/i18n/terms_of_sale_fr.rst @@ -4,14 +4,14 @@ Conditions Générales de Vente ============================= -.. note:: Dernière modification: 3 mai 2017. +.. note:: Dernière modification: 5 mai 2017. Ces conditions régissent la vente de produits et services entre -Odoo S.A. et le client. Des conditions supplémentaires peuvent s'appliquer pour -d'autres services offerts par Odoo S.A. (par exemple, l'Odoo Enterprise -Subscription Agreement). Si ces conditions supplémentaires entrent en -contradiction avec les Conditions Générales de Vente, les conditions -supplémentaires prévaudront. +Odoo S.A. et ses filiales (collectivement, "Odoo S.A.") et le client. +Des conditions supplémentaires peuvent s'appliquer pour d'autres services +offerts par Odoo S.A. (par exemple, l'Odoo Enterprise Subscription Agreement). +Si ces conditions supplémentaires entrent en contradiction avec les Conditions +Générales de Vente, les conditions supplémentaires prévaudront. Veuillez lire ces conditions attentivement avant de faire une commande auprès d'Odoo S.A. En commandant auprès d'Odoo S.A., le client marque son @@ -69,7 +69,7 @@ marchandises ou la prestation des services. Odoo S.A. se réserve le droit de modifier ces conditions à n'importe quel moment et sans notification préalable. Le client est soumis aux conditions en -application au moment de votre acceptation de ces conditions. +application au moment de son acceptation de ces conditions. Tout litige résultant de la présente convention ressort de l’application du droit belge et est de la compétence des Tribunaux de l’arrondissement du siège diff --git a/legal/terms/terms_of_sale.rst b/legal/terms/terms_of_sale.rst index 50a2aeebc..3eb4096f9 100644 --- a/legal/terms/terms_of_sale.rst +++ b/legal/terms/terms_of_sale.rst @@ -4,13 +4,14 @@ General Terms of Sale ===================== -.. note:: Last revision: May 3, 2017. +.. note:: Last revision: May 5, 2017. These General Terms of Sale govern the sale of products and services by -Odoo S.A. to the client. Additional terms may apply for services provided by -Odoo S.A. (for example, the Enterprise Subscription Agreement). If these -additional terms are inconsistent with the General Terms of Sale, the additional -terms will prevail over these General Terms of Sale. +Odoo S.A. and its affiliates (collectively, "Odoo S.A.") to the client. +Additional terms may apply for services provided by Odoo S.A. (for example, the +Enterprise Subscription Agreement). If these additional terms are inconsistent +with the General Terms of Sale, the additional terms will prevail over these +General Terms of Sale. Please read these terms carefully before placing an order with Odoo S.A. By accepting an order with Odoo S.A., the client marks his acceptance with these From d5b001debc325c7a06b5923e5bdefe220b3465a8 Mon Sep 17 00:00:00 2001 From: lap-odoo <lap@odoo.com> Date: Tue, 16 May 2017 16:04:08 +0200 Subject: [PATCH 05/14] [IMP] accounting: Improve Credit Card Documentation Add additional information on the documentation (if the account type is "Bank and Cash", the reconciliation doesn't work). --- accounting/receivables/customer_payments/credit_cards.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/accounting/receivables/customer_payments/credit_cards.rst b/accounting/receivables/customer_payments/credit_cards.rst index 8831b2459..6d0a6b2bf 100644 --- a/accounting/receivables/customer_payments/credit_cards.rst +++ b/accounting/receivables/customer_payments/credit_cards.rst @@ -47,6 +47,7 @@ Create a Journal called 'Credit card payments' with the following data: - **Default debit account**: Credit cards - **Default credit account**: Credit cards +Be careful that the account type should not be "Bank and Cash". Once it's done, don't forget to set the "Credit cards" account as "Allow Reconciliation". From 5f20e2638afb09e6744b175dd31ea30c94f66edc Mon Sep 17 00:00:00 2001 From: Olivier Dony <odo@openerp.com> Date: Tue, 3 Oct 2017 00:47:12 +0200 Subject: [PATCH 06/14] [FIX] legal: update enterprise contract for new pricing - Pricing can be per User and per App now - Extra 50% fee for older version is not systematically applied Backport of 54a7c4b --- legal/terms/enterprise.rst | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/legal/terms/enterprise.rst b/legal/terms/enterprise.rst index ec2d138fc..a430e09b7 100644 --- a/legal/terms/enterprise.rst +++ b/legal/terms/enterprise.rst @@ -5,7 +5,9 @@ Odoo Enterprise Subscription Agreement ====================================== -.. note:: Version 5b - Last revision: June 30, 2016. +.. note:: Version 6 - Last revision: October 3, 2017. + +.. v6: add "App" definition + update pricing per-App By subscribing to the Odoo Enterprise services (the "Services") provided by Odoo SA and its affiliates (collectively, "Odoo SA") in relation with Odoo Enterprise Edition or @@ -33,6 +35,11 @@ User limited access to the Software through the portal facilities (known as "portal Users") are not counted as Users. +App + An "App" is a specialized group of features available for installation in the Software, + and listed in the public Pricing section of `Odoo SA's website <https://www.odoo.com>`_ at the + signature of this Agreement. + Bug Is considered a Bug any failure of the Software that results in a complete stop, error traceback or security breach, and is not directly caused by a defective installation or @@ -115,7 +122,7 @@ Security Advisories include a complete description of the Bug, its cause, its po on the Customer's systems, and the corresponding remedy for each Covered Version. The Customer understands that the Bug and the information in the Security Advisory must be treated -are Confidential Information as described in :ref:`confidentiality` during the embargo period prior to +as Confidential Information as described in :ref:`confidentiality` during the embargo period prior to the public disclosure. .. _upgrade: @@ -179,16 +186,16 @@ upgraded version of all installed third-party modules along with the upgraded da -------------------- The standard charges for the Odoo Enterprise subscription, the Bug Fixing Service, Security Advisories -Service and the Upgrade Service are based on the number of Users and the Software version used by -the Customer, and specified in writing at the signature of the Agreement. +Service and the Upgrade Service are based on the number of Users, the number of installed +Apps, the Software version used by the Customer, and specified in writing at the signature of the Agreement. -When during the Term, the Customer has more Users than specified at the time of signature of -this Agreement, the Customer agrees to pay an extra fee equivalent to the applicable list price -(at the beginning of the Term) for the additional Users, for the remainder of the Term. +When during the Term, the Customer has more Users or more installed Apps than specified at the time +of signature of this Agreement, the Customer agrees to pay an extra fee equivalent to the applicable +list price (at the beginning of the Term) for the additional Users or Apps, for the remainder of the Term. If at the time of the signature of this Agreement, the Customer uses a Covered Version -that is not the most recent one, the standard charges will be increased by 50% for the duration -of the first Term. +that is not the most recent one, the standard charges may be increased by 50% for the duration +of the first Term, at the sole discretion of Odoo SA, to cover the extra maintenance costs. .. _charges_renewal: @@ -246,9 +253,9 @@ The Customer agrees to: - pay Odoo SA any applicable charges for the Services of the present Agreement, in accordance with the payment conditions specified in the corresponding invoice ; -- immediately notify Odoo SA when the actual number of Users exceeds the number of Users specified at - the signature of the Agreement, and in this event, pay the applicable additional fee as described - in section :ref:`charges_standard`; +- immediately notify Odoo SA when their actual number of Users or installed Apps exceeds the numbers + specified at the signature of the Agreement, and in this event, pay the applicable additional fee + as described in section :ref:`charges_standard`; - take all measures necessary to guarantee the unmodified execution of the part of the Software that verifies the validity of the Odoo Enterprise Edition usage, as described in :ref:`enterprise_access` ; From a54feb17ca41980c73ad56de62a4776ab79d1726 Mon Sep 17 00:00:00 2001 From: rsh-odoo <rsh@odoo.com> Date: Fri, 13 Oct 2017 09:54:36 -0700 Subject: [PATCH 07/14] Update documentation.rst --- getting_started/documentation.rst | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/getting_started/documentation.rst b/getting_started/documentation.rst index d35cc62c7..f856e9995 100644 --- a/getting_started/documentation.rst +++ b/getting_started/documentation.rst @@ -242,9 +242,16 @@ fill our `online support form <https://www.odoo.com/help>`__ to make this reques Success Pack Services --------------------- -The Success Pack is a package of premium hour-based services performed -by a dedicated project manager and business analyst. The list of -services according to your success pack is detailed online: +The Success Pack is a package of premium hour-based services performed by +a dedicated project manager and business analyst. The initial alloted hours +you purchased is purely an estimate and we do not guarantee completion of +your project within the first pack. We always strive to complete projects +within the initial allottement however any number of factors can contribute +to us not being able to do so, for example a scope expansion or "Scope Creep" +in the middle of your implementation, new detail descoveries, or an increase +in complexity that was not apparent from the beginning. + +The list of services according to your success pack is detailed online: `https://www.odoo.com/pricing-packs <https://www.odoo.com/pricing-packs>`__ The goal of the project manager is to help you get to production within From c8ab03fcfee72579e3cdaf62f483b8da4e142f4c Mon Sep 17 00:00:00 2001 From: rsh-odoo <rsh@odoo.com> Date: Mon, 16 Oct 2017 12:14:27 -0700 Subject: [PATCH 08/14] Update documentation.rst --- getting_started/documentation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getting_started/documentation.rst b/getting_started/documentation.rst index f856e9995..acff726b7 100644 --- a/getting_started/documentation.rst +++ b/getting_started/documentation.rst @@ -246,7 +246,7 @@ The Success Pack is a package of premium hour-based services performed by a dedicated project manager and business analyst. The initial alloted hours you purchased is purely an estimate and we do not guarantee completion of your project within the first pack. We always strive to complete projects -within the initial allottement however any number of factors can contribute +within the initial allotement however any number of factors can contribute to us not being able to do so, for example a scope expansion or "Scope Creep" in the middle of your implementation, new detail descoveries, or an increase in complexity that was not apparent from the beginning. From eb3868624b23a75947f200351095051c0563ac30 Mon Sep 17 00:00:00 2001 From: Olaiday <30783866+Olaiday@users.noreply.github.com> Date: Sun, 6 Aug 2017 23:50:28 +0100 Subject: [PATCH 09/14] [FIX] accounting: Fix typo --- accounting/others/adviser/assets.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accounting/others/adviser/assets.rst b/accounting/others/adviser/assets.rst index 3a7955799..5acc67a0e 100644 --- a/accounting/others/adviser/assets.rst +++ b/accounting/others/adviser/assets.rst @@ -107,7 +107,7 @@ before posting them to your accounts. .. tip:: if you put the asset on the product, the asset category will automatically be filled in the supplier bill. -How to deprecate an asset? +How to depreciate an asset? ========================== Odoo will create depreciation journal entries automatically at the right From b1f253724b226ac14dd602ab0a983e9e339dc416 Mon Sep 17 00:00:00 2001 From: Yannick Tivisse <yti@odoo.com> Date: Wed, 3 Jan 2018 14:16:01 +0100 Subject: [PATCH 10/14] [FIX] accounting: Remove wrong sentences in budget.rst --- accounting/others/adviser/budget.rst | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/accounting/others/adviser/budget.rst b/accounting/others/adviser/budget.rst index 2b9fa2df0..e4fb019d7 100644 --- a/accounting/others/adviser/budget.rst +++ b/accounting/others/adviser/budget.rst @@ -31,11 +31,6 @@ management** feature .. image:: media/budget02.png :align: center -If we want to be precise and point specific invoices and vendors bills -to our budget, you should enable the Analytic accounting as well. If we -don't we will only be able to budget the total amount of general -accounts. - Budgetary Positions ------------------- @@ -73,8 +68,7 @@ case select the relevant income accounts. Analytical account ------------------ -If you wish to point specific invoices or vendor bills to your budget -you need to use analytical accounting. Odoo needs to know which costs or +Odoo needs to know which costs or expenses are relevant to a specified budget. To do so we need to link our invoices and expenses to a defined analytical account. Create an analytical account by entering the Accounting module and clicking From 9e74bdc32c6cbe0af525d826c6cb2375bdb85b89 Mon Sep 17 00:00:00 2001 From: Victor Oliveira da Silva <victor_o_silva@hotmail.com> Date: Mon, 19 Feb 2018 12:21:00 -0300 Subject: [PATCH 11/14] [FIX] accounting: Fix typos Closes #262 --- accounting/overview/main_concepts/in_odoo.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/accounting/overview/main_concepts/in_odoo.rst b/accounting/overview/main_concepts/in_odoo.rst index ea1a40e48..20e5fe4c5 100644 --- a/accounting/overview/main_concepts/in_odoo.rst +++ b/accounting/overview/main_concepts/in_odoo.rst @@ -22,14 +22,14 @@ entries are automatically balanced (sum of debits = sum of credits). Accrual and Cash Basis Methods ============================== -Odoo support both accrual and cash basis reporting. This allows you to +Odoo supports both accrual and cash basis reporting. This allows you to report income / expense at the time transactions occur (i.e., accrual basis), or when payment is made or received (i.e., cash basis). Multi-companies =============== -Odoo allows to manage several companies within the same database. Each +Odoo allows one to manage several companies within the same database. Each company has its own chart of accounts and rules. You can get consolidation reports following your consolidation rules. @@ -51,9 +51,9 @@ web-service. International Standards ======================= -Odoo accounting support more than 50 countries. The Odoo core -accounting implement accounting standards that is common to all -countries and specific modules exists per country for the +Odoo accounting supports more than 50 countries. The Odoo core +accounting implements accounting standards that are common to all +countries. Specific modules exist per country for the specificities of the country like the chart of accounts, taxes, or bank interfaces. @@ -61,7 +61,7 @@ In particular, Odoo's core accounting engine supports: * Anglo-Saxon Accounting (U.S., U.K.,, and other English-speaking countries including Ireland, Canada, Australia, and New Zealand) - where cost of good sold are reported when products are + where costs of good sold are reported when products are sold/delivered. * European accounting where expenses are accounted at the supplier bill. @@ -115,8 +115,8 @@ bank statement lines to your accounting transactions. Odoo also remembers how you've treated other bank statement lines and provides suggested general ledger transactions. -Calculates the tax you owe your tax authority -============================================= +Calculate the tax you owe your tax authority +============================================ Odoo totals all your accounting transactions for your tax period and uses these totals to calculate your tax obligation. You can then check @@ -136,7 +136,7 @@ average price, LIFO (for countries allowing it) and FIFO. Easy retained earnings ====================== -Retained earnings is the portion of income retained by your +Retained earnings are the portion of income retained by your business. Odoo automatically calculates your current year earnings in real time so no year-end journal or rollover is required. This is calculated by reporting the profit and loss balance to your balance From 8b1799a3aacf04bf7fff7733bfc041955db991b0 Mon Sep 17 00:00:00 2001 From: Yannick Tivisse <yti@odoo.com> Date: Thu, 8 Mar 2018 14:21:23 +0100 Subject: [PATCH 12/14] [FIX] sales: Remove incorrect sentence --- sales/advanced/portal.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sales/advanced/portal.rst b/sales/advanced/portal.rst index 1e776d1ff..3faca8e7d 100644 --- a/sales/advanced/portal.rst +++ b/sales/advanced/portal.rst @@ -9,9 +9,7 @@ A portal access is given to a user who has the necessity to have access to Odoo instance, to view certain documents or information in the system. -For Example: -1. A long term client who needs to view online quotations. -2. Accounting consultant who needs to keep track of the company's financials. +For Example, a long term client who needs to view online quotations. A portal user has only read/view access. He or she will not be able to edit any document in the system. From 36cda45b301ab4cb9d27b300450d10d73d782d66 Mon Sep 17 00:00:00 2001 From: Martin Trigaux <mat@odoo.com> Date: Tue, 3 Apr 2018 08:30:28 +0200 Subject: [PATCH 13/14] [FIX] conf: set release version Allow to have a title Odoo 9.0 documentation instead of Odoo Business 0.1 documentation opw-1832694 --- conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.py b/conf.py index 6af164a54..39c8b439d 100644 --- a/conf.py +++ b/conf.py @@ -50,7 +50,7 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'Odoo Business' +project = u'Odoo' copyright = u'2015-TODAY, Odoo S.A.' # The version info for the project you're documenting, acts as replacement for @@ -58,7 +58,7 @@ copyright = u'2015-TODAY, Odoo S.A.' # built documents. # # The full version, including alpha/beta/rc tags. -release = '0.1' +release = '9.0' version = '9.0' # The language for content autogenerated by Sphinx. Refer to documentation From 1ee489b704f23aa05000488ab2eb41367d85c402 Mon Sep 17 00:00:00 2001 From: Xavier Brochard <xavier@alternatif.org> Date: Thu, 26 Jul 2018 14:08:46 +0200 Subject: [PATCH 14/14] [FIX] sales: English price included => tax included price excluded => tax excluded Closes #276 --- sales/products_prices/prices/B2B_B2C.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sales/products_prices/prices/B2B_B2C.rst b/sales/products_prices/prices/B2B_B2C.rst index 34ef03bfd..e4a0f4926 100644 --- a/sales/products_prices/prices/B2B_B2C.rst +++ b/sales/products_prices/prices/B2B_B2C.rst @@ -88,15 +88,15 @@ must: For the purpose of this documentation, we will use the above use case: -- your product default sale price is 8.26€ price excluded +- your product default sale price is 8.26€ tax excluded -- but we want to sell it at 10€, price included, in our shops or +- but we want to sell it at 10€, tax included, in our shops or eCommerce website Setting your products --------------------- -Your company must be configured with price excluded by default. This is +Your company must be configured with tax excluded by default. This is usually the default configuration, but you can check your **Default Sale Tax** from the menu :menuselection:`Configuration --> Settings` of the Accounting application. @@ -155,8 +155,8 @@ This is the expected behavior for a customer of your shop. Avoid changing every sale order =============================== -If you negotiate a contract with a customer, whether you negotiate price -included or price excluded, you can set the pricelist and the fiscal +If you negotiate a contract with a customer, whether you negotiate tax +included or tax excluded, you can set the pricelist and the fiscal position on the customer form so that it will be applied automatically at every sale of this customer.