8000 [MERGE] Forward port branch 9.0 up to 8b8e6c5916031fe4c75bcd3f74d633d… · getodoochina/documentation-user@a0e9466 · GitHub
[go: up one dir, main page]
Skip to content

Commit a0e9466

Browse files
tivissetivisse
committed
[MERGE] Forward port branch 9.0 up to 8b8e6c5 
2 parents 4a6fd8b + 8b8e6c5 commit a0e9466

26 files changed

+2816
-1052
lines changed

‎getting_started/documentation.rst

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -318,20 +318,14 @@ For every phase, the steps are the following:
318318
You are responsible to export the data from your existing system
319319
and Odoo's project manager will import them in Odoo.
320320

321-
3. **Training:** once the applications are set up and the data imported,
322-
you have to train your users on the environment that is perfectly
323-
working. There will be some back and forth with Odoo's project
324-
manager to answer questions and process your feedback. (\*)
321+
3. **Training:** once your applications are set up, your data imported, and
322+
the system is working smoothly, you will train your users. There will
323+
be some back and forth with your Odoo project manager to answer questions
324+
and process your feedback.
325325

326326
4. **Production**: Once everyone is trained, your users start using
327327
Odoo.
328328

329-
(\*) *Before the training, our project manager will have done the
330-
customizations that are required to go into production. If you can use
331-
the software without these customizations (even if it requires extra
332-
manual tasks), we will push these customizations after going into
333-
production (see phase below).*
334-
335329
Once you are comfortable using Odoo, we will fine-tune the process and
336330
**automate** some tasks and do the remaining customizations (**extra
337331
screens and reports**).

‎locale/fr/LC_MESSAGES/inventory.po

Lines changed: 231 additions & 231 deletions
Large diffs are not rendered by default.

‎locale/sources/accounting.pot

Lines changed: 1 addition & 190 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Odoo Business 9.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2016-08-31 16:02+0200\n"
11+
"POT-Creation-Date: 2016-11-22 13:16+0100\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1066,95 +1066,6 @@ msgstr ""
10661066
msgid "In the tab Journal Entries, the Default Debit and Credit Account can be configured as well as the currency of the journal"
10671067
msgstr ""
10681068

1069-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1070-
msgid "Select 'Sale' for customer invoices journals. Select 'Purchase' for vendor bills journals. Select 'Cash' or 'Bank' for journals that are used in customer or vendor payments. Select 'General' for miscellaneous operations journals. Select 'Opening/Closing Situation' for entries generated for new fiscal years."
1071-
msgstr ""
1072-
1073-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1074-
msgid "Company related to this journal"
1075-
msgstr ""
1076-
1077-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1078-
msgid "The journal entries of this journal will be named using this prefix."
1079-
msgstr ""
1080-
1081-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1082-
msgid "Check this box if you don't want to share the same sequence for invoices and refunds made from this journal"
1083-
msgstr ""
1084-
1085-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1086-
msgid "This field contains the information related to the numbering of the journal entries of this journal."
1087-
msgstr ""
1088-
1089-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1090-
msgid "This field contains the information related to the numbering of the refund entries of this journal."
1091-
msgstr ""
1092-
1093-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1094-
msgid "It acts as a default account for debit amount"
1095-
msgstr ""
1096-
1097-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1098-
msgid "It acts as a default account for credit amount"
1099-
msgstr ""
1100-
1101-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1102-
msgid "The currency used to enter statement"
1103-
msgstr ""
1104-
1105-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1106-
msgid "Means of payment for collecting money. Odoo modules offer various payments handling facilities, but you can always use the 'Manual' payment method in order to manage payments outside of the software."
1107-
msgstr ""
1108-
1109-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1110-
msgid "Means of payment for sending money. Odoo modules offer various payments handling facilities, but you can always use the 'Manual' payment method in order to manage payments outside of the software."
1111-
msgstr ""
1112-
1113-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1114-
msgid "If this box is checked, the system will try to group the accounting lines when generating them from invoices."
1115-
msgstr ""
1116-
1117-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1118-
msgid "Used to register a profit when the ending balance of a cash register differs from what the system computes"
1119-
msgstr ""
1120-
1121-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1122-
msgid "Used to register a loss when the ending balance of a cash register differs from what the system computes"
1123-
msgstr ""
1124-
1125-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1126-
msgid "Whether this journal should be displayed on the dashboard or not"
1127-
msgstr ""
1128-
1129-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1130-
msgid "Technical feature used to know whether check printing was enabled as payment method."
1131-
msgstr ""
1132-
1133-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1134-
msgid "Checks numbering sequence."
1135-
msgstr ""
1136-
1137-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1138-
#: ../../accounting/payables/pay/check.rst:0
1139-
msgid "Check this option if your pre-printed checks are not numbered."
1140-
msgstr ""
1141-
1142-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1143-
msgid "Sequence number of the next printed check."
1144-
msgstr ""
1145-
1146-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1147-
msgid "Display this bank account on the footer of printed documents like invoices and sales orders."
1148-
msgstr ""
1149-
1150-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1151-
msgid "Check this box if this journal define a payment method that can be used in a point of sale."
1152-
msgstr ""
1153-
1154-
#: ../../accounting/bank/setup/manage_cash_register.rst:0
1155-
msgid "This field depicts the maximum difference allowed between the ending balance and the theoretical cash when closing a session, for non-POS managers. If this maximum is reached, the user will have an error message at the closing of his session saying that he needs to contact his manager."
1156-
msgstr ""
1157-
11581069
#: ../../accounting/bank/setup/manage_cash_register.rst:25
11591070
msgid "Usage"
11601071
msgstr ""
@@ -1292,70 +1203,6 @@ msgstr ""
12921203
msgid "Explanation of the fields:"
12931204
msgstr ""
12941205

1295-
#: ../../accounting/others/adviser/assets.rst:0
1296-
msgid "When an asset is created, the status is 'Draft'."
1297-
msgstr ""
1298-
1299-
#: ../../accounting/others/adviser/assets.rst:0
1300-
msgid "If the asset is confirmed, the status goes in 'Running' and the depreciation lines can be posted in the accounting."
1301-
msgstr ""
1302-
1303-
#: ../../accounting/others/adviser/assets.rst:0
1304-
msgid "You can manually close an asset when the depreciation is over. If the last line of depreciation is posted, the asset automatically goes in that status."
1305-
msgstr ""
1306-
1307-
#: ../../accounting/others/adviser/assets.rst:0
1308-
msgid "Category of asset"
1309-
msgstr ""
1310-
1311-
#: ../../accounting/others/adviser/assets.rst:0
1312-
msgid "Date of asset"
1313-
msgstr ""
1314-
1315-
#: ../../accounting/others/adviser/assets.rst:0
1316-
msgid "Gross value of asset"
1317-
msgstr ""
1318-
1319-
#: ../../accounting/others/adviser/assets.rst:0
1320-
msgid "It is the amount you plan to have that you cannot depreciate."
1321-
msgstr ""
1322-
1323-
#: ../../accounting/others/adviser/assets.rst:0
1324-
msgid "Choose the method to use to compute the amount of depreciation lines."
1325-
msgstr ""
1326-
1327-
#: ../../accounting/others/adviser/assets.rst:0
1328-
msgid "* Linear: Calculated on basis of: Gross Value / Number of Depreciations"
1329-
msgstr ""
1330-
1331-
#: ../../accounting/others/adviser/assets.rst:0
1332-
msgid "* Degressive: Calculated on basis of: Residual Value * Degressive Factor"
1333-
msgstr ""
1334-
1335-
#: ../../accounting/others/adviser/assets.rst:0
1336-
msgid "Choose the method to use to compute the dates and number of depreciation lines."
1337-
msgstr ""
1338-
1339-
#: ../../accounting/others/adviser/assets.rst:0
1340-
msgid "* Number of Depreciations: Fix the number of depreciation lines and the time between 2 depreciations."
1341-
msgstr ""
1342-
1343-
#: ../../accounting/others/adviser/assets.rst:0
1344-
msgid "* Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond."
1345-
msgstr ""
1346-
1347-
#: ../../accounting/others/adviser/assets.rst:0
1348-
msgid "Indicates that the first depreciation entry for this asset have to be done from the purchase date instead of the first January / Start date of fiscal year"
1349-
msgstr ""
1350-
1351-
#: ../../accounting/others/adviser/assets.rst:0
1352-
msgid "The number of depreciations needed to depreciate your asset"
1353-
msgstr ""
1354-
1355-
#: ../../accounting/others/adviser/assets.rst:0
1356-
msgid "The amount of time between two depreciations, in months"
1357-
msgstr ""
1358-
13591206
#: ../../accounting/others/adviser/assets.rst:88
13601207
msgid "Try creating an *Asset* in our online demonstration"
13611208
msgstr ""
@@ -2484,26 +2331,6 @@ msgstr ""
24842331
msgid "To create a new accounts, go to the Accounting application. Open the menu :menuselection:`Adviser --> Chart of Accounts`, the click on the **Create** button."
24852332
msgstr ""
24862333

2487-
#: ../../accounting/others/configuration/account_type.rst:0
2488-
msgid "Account Type is used for information purpose, to generate country-specific legal reports, and set the rules to close a fiscal year and generate opening entries."
2489-
msgstr ""
2490-
2491-
#: ../../accounting/others/configuration/account_type.rst:0
2492-
msgid "Optional tags you may want to assign for custom reporting"
2493-
msgstr ""
2494-
2495-
#: ../../accounting/others/configuration/account_type.rst:0
2496-
msgid "Forces all moves for this account to have this account currency."
2497-
msgstr ""
2498-
2499-
#: ../../accounting/others/configuration/account_type.rst:0
2500-
msgid "The 'Internal Type' is used for features available on different types of accounts: liquidity type is for cash or bank accounts, payable/receivable is for vendor/customer accounts."
2501-
msgstr ""
2502-
2503-
#: ../../accounting/others/configuration/account_type.rst:0
2504-
msgid "Check this box if this account allows invoices & payments matching of journal items."
2505-
msgstr ""
2506-
25072334
#: ../../accounting/others/configuration/account_type.rst:86
25082335
msgid "View *Create Account* in our Online Demonstration"
25092336
msgstr ""
@@ -5361,22 +5188,6 @@ msgstr ""
53615188
msgid "Explanation of the fields of the payment screen:"
53625189
msgstr ""
53635190

5364-
#: ../../accounting/payables/pay/check.rst:0
5365-
msgid "Technical field used for usability purposes"
5366-
msgstr ""
5367-
5368-
#: ../../accounting/payables/pay/check.rst:0
5369-
msgid "Technical field used to hide the payment method if the selected journal has only one available which is 'manual'"
5370-
msgstr ""
5371-
5372-
#: ../../accounting/payables/pay/check.rst:0
5373-
msgid "Technical field used to adapt the interface to the payment type selected."
5374-
msgstr ""
5375-
5376-
#: ../../accounting/payables/pay/check.rst:0
5377-
msgid "The selected journal is configured to print check numbers. If your pre-printed check paper already has numbers or if the current numbering is wrong, you can change it in the journal configuration page."
5378-
msgstr ""
5379-
53805191
#: ../../accounting/payables/pay/check.rst:80
53815192
msgid "Try paying a supplier bill with a check"
53825193
msgstr ""

‎locale/sources/applications.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Odoo Business 9.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2016-08-18 10:05+0200\n"
11+
"POT-Creation-Date: 2016-11-22 13:16+0100\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"

‎locale/sources/crm.pot

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Odoo Business 9.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2016-08-18 10:05+0200\n"
11+
"POT-Creation-Date: 2016-11-22 13:16+0100\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -178,7 +178,7 @@ msgid "Odoo CRM allows you to manually add contacts into your pipeline. It can b
178178
msgstr ""
179179

180180
#: ../../crm/leads/generate/manual.rst:11
181-
msgid "By default, the lead stage is not activated in Odoo CRM. To activate it, go to :menuselection:`Configuration --> Settings`, select the option \"\"use leads if…** as shown below and click on **Apply**."
181+
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**."
182182
msgstr ""
183183

184184
#: ../../crm/leads/generate/manual.rst:18

‎locale/sources/db_management.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Odoo Business 9.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2016-08-18 10:05+0200\n"
11+
"POT-Creation-Date: 2016-11-22 13:16+0100\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"

‎locale/sources/discuss.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Odoo Business 9.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2016-08-18 10:05+0200\n"
11+
"POT-Creation-Date: 2016-11-22 13:16+0100\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"

0 commit comments

Comments
 (0)
0