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

[MERGE] forward port branch saas-17 up to 3d4238f71e

Browse Source
This commit is contained in:
Christophe Simonis
2017-07-26 23:35:06 +02:00
parent faf7225022 3d4238f71e
commit 8a1311bca1
139 changed files with 6974 additions and 3704 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.tx/config
+35
View File
@@ -187,6 +187,11 @@ file_filter = addons/crm_livechat/i18n/<lang>.po
source_file = addons/crm_livechat/i18n/crm_livechat.pot
source_lang = en
[odoo-master.crm_phone_validation]
file_filter = addons/crm_phone_validation/i18n/<lang>.po
source_file = addons/crm_phone_validation/i18n/crm_phone_validation.pot
source_lang = en
[odoo-master.crm_project_issue]
file_filter = addons/crm_project_issue/i18n/<lang>.po
source_file = addons/crm_project_issue/i18n/crm_project_issue.pot
@@ -297,6 +302,11 @@ file_filter = addons/hr_maintenance/i18n/<lang>.po
source_file = addons/hr_maintenance/i18n/hr_maintenance.pot
source_lang = en
[odoo-master.hr_org_chart]
file_filter = addons/hr_org_chart/i18n/<lang>.po
source_file = addons/hr_org_chart/i18n/hr_org_chart.pot
source_lang = en
[odoo-master.hr_payroll]
file_filter = addons/hr_payroll/i18n/<lang>.po
source_file = addons/hr_payroll/i18n/hr_payroll.pot
@@ -372,6 +382,16 @@ file_filter = addons/mass_mailing/i18n/<lang>.po
source_file = addons/mass_mailing/i18n/mass_mailing.pot
source_lang = en
[odoo-master.mass_mailing_event]
file_filter = addons/mass_mailing_event/i18n/<lang>.po
source_file = addons/mass_mailing_event/i18n/mass_mailing_event.pot
source_lang = en
[odoo-master.mass_mailing_event_track]
file_filter = addons/mass_mailing_event_track/i18n/<lang>.po
source_file = addons/mass_mailing_event_track/i18n/mass_mailing_event_track.pot
source_lang = en
[odoo-master.membership]
file_filter = addons/membership/i18n/<lang>.po
source_file = addons/membership/i18n/membership.pot
@@ -462,6 +482,11 @@ file_filter = addons/payment_transfer/i18n/<lang>.po
source_file = addons/payment_transfer/i18n/payment_transfer.pot
source_lang = en
[odoo-master.phone_validation]
file_filter = addons/phone_validation/i18n/<lang>.po
source_file = addons/phone_validation/i18n/phone_validation.pot
source_lang = en
[odoo-master.point_of_sale]
file_filter = addons/point_of_sale/i18n/<lang>.po
source_file = addons/point_of_sale/i18n/point_of_sale.pot
@@ -552,6 +577,11 @@ file_filter = addons/project_issue_sheet/i18n/<lang>.po
source_file = addons/project_issue_sheet/i18n/project_issue_sheet.pot
source_lang = en
[odoo-master.project_timesheet_holidays]
file_filter = addons/project_timesheet_holidays/i18n/<lang>.po
source_file = addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot
source_lang = en
[odoo-master.purchase]
file_filter = addons/purchase/i18n/<lang>.po
source_file = addons/purchase/i18n/purchase.pot
@@ -862,6 +892,11 @@ file_filter = addons/website_portal_sale/i18n/<lang>.po
source_file = addons/website_portal_sale/i18n/website_portal_sale.pot
source_lang = en
[odoo-master.website_portal_purchase]
file_filter = addons/website_portal_purchase/i18n/<lang>.po
source_file = addons/website_portal_purchase/i18n/website_portal_purchase.pot
source_lang = en
[odoo-master.website_project]
file_filter = addons/website_project/i18n/<lang>.po
source_file = addons/website_project/i18n/website_project.pot
addons/account/i18n/account.pot
+564 -549
View File
File diff suppressed because it is too large Load Diff
addons/account/models/account_config_settings.py
+2 -2
View File
@@ -65,8 +65,8 @@ class AccountConfigSettings(models.TransientModel):
res = super(AccountConfigSettings, self).get_values()
params = self.env['ir.config_parameter'].sudo()
res.update(
default_purchase_tax_id=params.get_param('account.default_purchase_tax_id', default=False),
default_sale_tax_id=params.get_param('account.default_sale_tax_id', default=False)
default_purchase_tax_id=int(params.get_param('account.default_purchase_tax_id', default=False)) or False,
default_sale_tax_id=int(params.get_param('account.default_sale_tax_id', default=False)) or False
)
return res
addons/account/report/account_balance.py
+1 -1
View File
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import time
from odoo import api, models
from odoo import api, models, _
from odoo.exceptions import UserError
addons/account/report/account_general_ledger.py
+1 -1
View File
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import time
from odoo import api, models
from odoo import api, models, _
from odoo.exceptions import UserError
addons/account/report/account_journal.py
+1 -1
View File
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import time
from odoo import api, models
from odoo import api, models, _
from odoo.exceptions import UserError
addons/account/report/account_partner_ledger.py
+1 -1
View File
@@ -2,7 +2,7 @@
from datetime import datetime
import time
from odoo import api, models
from odoo import api, models, _
from odoo.exceptions import UserError
from odoo.tools import DEFAULT_SERVER_DATE_FORMAT
addons/account/report/account_report_financial.py
+1 -1
View File
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import time
from odoo import api, models
from odoo import api, models, _
from odoo.exceptions import UserError
from odoo.tools import pycompat
addons/account/views/account_invoice_view.xml
+2 -2
View File
@@ -278,7 +278,7 @@
<field name="uom_id" groups="product.group_uom"/>
<field name="price_unit"/>
<field name="discount" groups="base.group_no_one"/>
<field name="invoice_line_tax_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" context="{'type':parent.type}"
<field name="invoice_line_tax_ids" widget="many2many_tags" options="{'no_create': True}" context="{'type':parent.type}"
domain="[('type_tax_use','=','purchase'),('company_id', '=', parent.company_id)]"/>
<field name="price_subtotal"/>
<field name="currency_id" invisible="1"/>
@@ -421,7 +421,7 @@
<field name="uom_id" groups="product.group_uom"/>
<field name="price_unit"/>
<field name="discount" groups="base.group_no_one"/>
<field name="invoice_line_tax_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" context="{'type':parent.type}"
<field name="invoice_line_tax_ids" widget="many2many_tags" options="{'no_create': True}" context="{'type':parent.type}"
domain="[('type_tax_use','=','sale'),('company_id', '=', parent.company_id)]"/>
<field name="price_subtotal"/>
<field name="currency_id" invisible="1"/>
addons/account/views/account_view.xml
+4 -4
View File
@@ -304,8 +304,8 @@
<group>
<group string="Control-Access" groups="base.group_no_one">
<div class="text-muted" colspan="2">Keep empty for no control</div>
<field name="type_control_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
<field name="account_control_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
<field name="type_control_ids" widget="many2many_tags"/>
<field name="account_control_ids" widget="many2many_tags"/>
</group>
<group string="Miscellaneous">
<field name="inbound_payment_method_ids" widget="many2many_checkboxes" attrs="{'invisible': [('type', 'not in', ['bank', 'cash'])]}"/>
@@ -2046,8 +2046,8 @@
<field name="name"/>
<field name="attribute_value_ids" widget="many2many_tags" groups="product.group_product_variant"/>
<field name="lst_price"/>
<field name="taxes_id" widget="many2many_tags" options="{'color_field': 'color'}"/>
<field name="supplier_taxes_id" widget="many2many_tags" options="{'color_field': 'color'}"/>
<field name="taxes_id" widget="many2many_tags"/>
<field name="supplier_taxes_id" widget="many2many_tags"/>
</tree>
</field>
</record>
addons/account/views/product_view.xml
+2 -2
View File
@@ -11,13 +11,13 @@
<page string="Invoicing" name="invoicing">
<group name="properties">
<group string="Receivables">
<field name="taxes_id" widget="many2many_tags" options="{'color_field': 'color'}"/>
<field name="taxes_id" widget="many2many_tags"/>
<field name="property_account_income_id"
domain="[('internal_type','=','other'),('deprecated','=',False)]"
groups="account.group_account_user"/>
</group>
<group string="Payables" name="payables">
<field name="supplier_taxes_id" widget="many2many_tags" options="{'color_field': 'color'}"/>
<field name="supplier_taxes_id" widget="many2many_tags"/>
<field name="property_account_expense_id"
domain="[('internal_type','=','other'),('deprecated','=',False)]"
groups="account.group_account_user"/>
addons/account_accountant/i18n/account_accountant.pot
+4 -4
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~14\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-15 09:49+0000\n"
"PO-Revision-Date: 2017-02-15 09:49+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -82,7 +82,7 @@ msgstr ""
#. module: account_accountant
#: model:ir.ui.view,arch_db:account_accountant.account_config_settings_view_form_inherit_account_accountant
msgid "Last day of your fiscal year"
msgid "Last day of your fiscal year, for automatic opening entries"
msgstr ""
#. module: account_accountant
addons/account_accountant/views/account_config_settings_views.xml
+1 -1
View File
@@ -71,7 +71,7 @@
<div class="content-group">
<div class="row mt16">
<label for="transfer_account_id" class="col-md-3 o_light_label"/>
<field name="transfer_account_id" attrs="{'required': [('chart_template_id','!=',False)]}"/>
<field name="transfer_account_id" attrs="{'required': [('has_chart_of_accounts','=',True)]}"/>
</div>
</div>
</div>
addons/account_asset/i18n/account_asset.pot
+28 -19
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~14\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-15 09:49+0000\n"
"PO-Revision-Date: 2017-02-15 09:49+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_asset
#: code:addons/account_asset/models/account_asset.py:399
#: code:addons/account_asset/models/account_asset.py:404
#, python-format
msgid " (copy)"
msgstr ""
#. module: account_asset
#: code:addons/account_asset/models/account_asset.py:534
#: code:addons/account_asset/models/account_asset.py:538
#, python-format
msgid " (grouped)"
msgstr ""
@@ -74,6 +74,13 @@ msgstr ""
msgid "Account used to record the purchase of the asset at its original price."
msgstr ""
#. module: account_asset
#. openerp-web
#: code:addons/account_asset/static/src/js/account_asset.js:41
#, python-format
msgid "Accounting entries waiting for manual verification"
msgstr ""
#. module: account_asset
#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_active
#: model:ir.model.fields,field_description:account_asset.field_account_asset_category_active
@@ -86,7 +93,7 @@ msgid "Additional Options"
msgstr ""
#. module: account_asset
#: code:addons/account_asset/models/account_asset.py:591
#: code:addons/account_asset/models/account_asset.py:595
#, python-format
msgid "Amount"
msgstr ""
@@ -155,6 +162,7 @@ msgstr ""
#. module: account_asset
#: model:ir.model.fields,field_description:account_asset.field_account_asset_category_name
#: model:ir.model.fields,field_description:account_asset.field_product_product_asset_category_id
#: model:ir.model.fields,field_description:account_asset.field_product_template_asset_category_id
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
msgid "Asset Type"
@@ -187,7 +195,7 @@ msgid "Asset depreciation line"
msgstr ""
#. module: account_asset
#: code:addons/account_asset/models/account_asset.py:319
#: code:addons/account_asset/models/account_asset.py:318
#, python-format
msgid "Asset sold or disposed. Accounting entry awaiting for validation."
msgstr ""
@@ -375,7 +383,7 @@ msgid "Cumulative Depreciation"
msgstr ""
#. module: account_asset
#: code:addons/account_asset/models/account_asset.py:591
#: code:addons/account_asset/models/account_asset.py:595
#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_currency_id
#, python-format
msgid "Currency"
@@ -418,6 +426,7 @@ msgid "Deferred Revenue Account"
msgstr ""
#. module: account_asset
#: model:ir.model.fields,field_description:account_asset.field_product_product_deferred_revenue_category_id
#: model:ir.model.fields,field_description:account_asset.field_product_template_deferred_revenue_category_id
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
msgid "Deferred Revenue Type"
@@ -504,7 +513,7 @@ msgid "Depreciation board modified"
msgstr ""
#. module: account_asset
#: code:addons/account_asset/models/account_asset.py:594
#: code:addons/account_asset/models/account_asset.py:598
#, python-format
msgid "Depreciation line posted."
msgstr ""
@@ -520,19 +529,19 @@ msgid "Display Name"
msgstr ""
#. module: account_asset
#: code:addons/account_asset/models/account_asset.py:322
#: code:addons/account_asset/models/account_asset.py:327
#, python-format
msgid "Disposal Move"
msgstr ""
#. module: account_asset
#: code:addons/account_asset/models/account_asset.py:325
#: code:addons/account_asset/models/account_asset.py:330
#, python-format
msgid "Disposal Moves"
msgstr ""
#. module: account_asset
#: code:addons/account_asset/models/account_asset.py:573
#: code:addons/account_asset/models/account_asset.py:577
#, python-format
msgid "Document closed."
msgstr ""
@@ -657,7 +666,7 @@ msgid "Journal"
msgstr ""
#. module: account_asset
#: code:addons/account_asset/models/account_asset.py:433
#: code:addons/account_asset/models/account_asset.py:438
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
#, python-format
msgid "Journal Entries"
@@ -764,7 +773,7 @@ msgid "One Entry Every"
msgstr ""
#. module: account_asset
#: code:addons/account_asset/models/account_asset.py:593
#: code:addons/account_asset/models/account_asset.py:597
#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_partner_id
#: model:ir.model.fields,field_description:account_asset.field_asset_asset_report_partner_id
#, python-format
@@ -789,7 +798,7 @@ msgstr ""
#. module: account_asset
#. openerp-web
#: code:addons/account_asset/static/src/js/account_asset.js:28
#: code:addons/account_asset/static/src/js/account_asset.js:38
#: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_move_posted_check
#: model:ir.model.fields,field_description:account_asset.field_asset_asset_report_move_check
#: model:ir.ui.view,arch_db:account_asset.view_asset_asset_report_search
@@ -819,7 +828,7 @@ msgid "Prorata Temporis"
msgstr ""
#. module: account_asset
#: code:addons/account_asset/models/account_asset.py:365
#: code:addons/account_asset/models/account_asset.py:370
#, python-format
msgid "Prorata temporis can be applied only for time method \"number of depreciations\"."
msgstr ""
@@ -965,7 +974,7 @@ msgstr ""
#. module: account_asset
#. openerp-web
#: code:addons/account_asset/static/src/js/account_asset.js:28
#: code:addons/account_asset/static/src/js/account_asset.js:44
#, python-format
msgid "Unposted"
msgstr ""
@@ -1007,13 +1016,13 @@ msgid "You cannot delete a document that contains posted entries."
msgstr ""
#. module: account_asset
#: code:addons/account_asset/models/account_asset.py:602
#: code:addons/account_asset/models/account_asset.py:606
#, python-format
msgid "You cannot delete posted depreciation lines."
msgstr ""
#. module: account_asset
#: code:addons/account_asset/models/account_asset.py:604
#: code:addons/account_asset/models/account_asset.py:608
#, python-format
msgid "You cannot delete posted installment lines."
msgstr ""
addons/account_bank_statement_import/i18n/account_bank_statement_import.pot
+73 -28
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~14\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-15 09:49+0000\n"
"PO-Revision-Date: 2017-02-15 09:49+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_bank_statement_import
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:240
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:245
#, python-format
msgid "%d transactions had already been imported and were ignored."
msgstr ""
#. module: account_bank_statement_import
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:240
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:245
#, python-format
msgid "1 transaction had already been imported and was ignored."
msgstr ""
@@ -53,7 +53,7 @@ msgid "Allow Cancelling Entries"
msgstr ""
#. module: account_bank_statement_import
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:242
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:247
#, python-format
msgid "Already imported items"
msgstr ""
@@ -69,7 +69,7 @@ msgid "At Least One Outbound"
msgstr ""
#. module: account_bank_statement_import
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:76
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:78
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_bank_id
#, python-format
msgid "Bank"
@@ -112,14 +112,24 @@ msgid "Cancel"
msgstr ""
#. module: account_bank_statement_import
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:165
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:167
#, python-format
msgid "Cannot find in which journal import this statement. Please manually select a journal."
msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_printing_payment_method_selected
msgid "Check Printing Payment Method Selected"
msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_sequence_id
msgid "Check Sequence"
msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence
msgid "Check this box if you don't want to share the same sequence for invoices and refunds made from this journal"
msgid "Check this box if you don't want to share the same sequence for invoices and credit notes made from this journal"
msgstr ""
#. module: account_bank_statement_import
@@ -127,11 +137,26 @@ msgstr ""
msgid "Check this box if you want to allow the cancellation the entries related to this journal or of the invoice related to this journal"
msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_manual_sequencing
msgid "Check this option if your pre-printed checks are not numbered."
msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_sequence_id
msgid "Checks numbering sequence."
msgstr ""
#. module: account_bank_statement_import
#: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_view
msgid "Choose a file to import..."
msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_color
msgid "Color Index"
msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_company_id
msgid "Company"
@@ -143,7 +168,7 @@ msgid "Company related to this journal"
msgstr ""
#. module: account_bank_statement_import
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:106
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:108
#, python-format
msgid "Could not make sense of the given file.\n"
"Did you install the module to support this type of file ?"
@@ -161,6 +186,11 @@ msgstr ""
msgid "Created on"
msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence_id
msgid "Credit Note Entry Sequence"
msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_currency_id
msgid "Currency"
@@ -173,7 +203,7 @@ msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence
msgid "Dedicated Refund Sequence"
msgid "Dedicated Credit Note Sequence"
msgstr ""
#. module: account_bank_statement_import
@@ -275,7 +305,7 @@ msgid "Journal"
msgstr ""
#. module: account_bank_statement_import
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:67
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:69
#: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_journal_creation_view
#, python-format
msgid "Journal Creation"
@@ -324,6 +354,11 @@ msgstr ""
msgid "Loss Account"
msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_manual_sequencing
msgid "Manual Numbering"
msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_inbound_payment_method_ids
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."
@@ -335,7 +370,12 @@ msgid "Means of payment for sending money. Odoo modules offer various payments h
msgstr ""
#. module: account_bank_statement_import
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:136
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_next_number
msgid "Next Check Number"
msgstr ""
#. module: account_bank_statement_import
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:138
#, python-format
msgid "No currency found matching '%s'."
msgstr ""
@@ -355,11 +395,6 @@ msgstr ""
msgid "Profit Account"
msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence_id
msgid "Refund Entry Sequence"
msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_type
msgid "Select 'Sale' for customer invoices journals.\n"
@@ -378,6 +413,11 @@ msgstr ""
msgid "Sequence"
msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_next_number
msgid "Sequence number of the next printed check."
msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_code
msgid "Short Code"
@@ -388,19 +428,24 @@ msgstr ""
msgid "Show journal on dashboard"
msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_printing_payment_method_selected
msgid "Technical feature used to know whether check printing was enabled as payment method."
msgstr ""
#. module: account_bank_statement_import
#: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_journal_creation_view
msgid "The account of the statement you are importing is not yet recorded in Odoo. In order to proceed with the import, you need to create a bank journal for this account."
msgstr ""
#. module: account_bank_statement_import
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:151
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:153
#, python-format
msgid "The account of this statement (%s) is not the same as the journal (%s)."
msgstr ""
#. module: account_bank_statement_import
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:161
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:163
#, python-format
msgid "The currency of the bank statement (%s) is not the same as the currency of the journal (%s) !"
msgstr ""
@@ -415,24 +460,24 @@ msgstr ""
msgid "The journal entries of this journal will be named using this prefix."
msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence_id
msgid "This field contains the information related to the numbering of the credit note entries of this journal."
msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_sequence_id
msgid "This field contains the information related to the numbering of the journal entries of this journal."
msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence_id
msgid "This field contains the information related to the numbering of the refund entries of this journal."
msgstr ""
#. module: account_bank_statement_import
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:111
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:113
#, python-format
msgid "This file doesn't contain any statement."
msgstr ""
#. module: account_bank_statement_import
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:119
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:121
#, python-format
msgid "This file doesn't contain any transaction."
msgstr ""
@@ -463,7 +508,7 @@ msgid "Whether this journal should be displayed on the dashboard or not"
msgstr ""
#. module: account_bank_statement_import
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:232
#: code:addons/account_bank_statement_import/account_bank_statement_import.py:237
#, python-format
msgid "You have already imported that file."
msgstr ""
addons/account_check_printing/i18n/account_check_printing.pot
+14 -15
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~14\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-15 09:49+0000\n"
"PO-Revision-Date: 2017-02-15 09:49+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,14 +22,13 @@ msgid " : Check Number Sequence"
msgstr ""
#. module: account_check_printing
#: code:addons/account_check_printing/models/account_payment.py:37
#: code:addons/account_check_printing/models/account_payment.py:74
#: code:addons/account_check_printing/models/account_payment.py:59
#, python-format
msgid " and %s/100"
msgstr ""
#. module: account_check_printing
#: code:addons/account_check_printing/models/account_payment.py:83
#: code:addons/account_check_printing/models/account_payment.py:81
#, python-format
msgid "A check memo cannot exceed 60 characters."
msgstr ""
@@ -45,11 +44,6 @@ msgstr ""
msgid "Cancel"
msgstr ""
#. module: account_check_printing
#: model:account.payment.method,name:account_check_printing.account_payment_method_check
msgid "Check"
msgstr ""
#. module: account_check_printing
#: model:ir.model.fields,field_description:account_check_printing.field_account_payment_check_number
#: model:ir.model.fields,field_description:account_check_printing.field_account_register_payments_check_number
@@ -83,6 +77,11 @@ msgstr ""
msgid "Check to print"
msgstr ""
#. module: account_check_printing
#: model:account.payment.method,name:account_check_printing.account_payment_method_check
msgid "Checks"
msgstr ""
#. module: account_check_printing
#: model:ir.ui.view,arch_db:account_check_printing.view_payment_check_printing_search
msgid "Checks To Print"
@@ -125,7 +124,7 @@ msgid "ID"
msgstr ""
#. module: account_check_printing
#: code:addons/account_check_printing/models/account_payment.py:103
#: code:addons/account_check_printing/models/account_payment.py:101
#, python-format
msgid "In order to print multiple checks at once, they must belong to the same bank journal."
msgstr ""
@@ -174,7 +173,7 @@ msgid "Payments"
msgstr ""
#. module: account_check_printing
#: code:addons/account_check_printing/models/account_payment.py:100
#: code:addons/account_check_printing/models/account_payment.py:98
#, python-format
msgid "Payments to print as a checks must have 'Check' selected as payment method and not have already been reconciled"
msgstr ""
@@ -200,7 +199,7 @@ msgid "Print Checks"
msgstr ""
#. module: account_check_printing
#: code:addons/account_check_printing/models/account_payment.py:113
#: code:addons/account_check_printing/models/account_payment.py:111
#: model:ir.model,name:account_check_printing.model_print_prenumbered_checks
#: model:ir.ui.view,arch_db:account_check_printing.print_pre_numbered_checks_view
#, python-format
@@ -234,7 +233,7 @@ msgid "The selected journal is configured to print check numbers. If your pre-pr
msgstr ""
#. module: account_check_printing
#: code:addons/account_check_printing/models/account_payment.py:136
#: code:addons/account_check_printing/models/account_payment.py:133
#, python-format
msgid "There is no check layout configured.\n"
"Make sure the proper check printing module is installed and its configuration (in company settings > 'Configuration' tab) is correct."
addons/account_voucher/views/account_voucher_views.xml
+2 -2
View File
@@ -253,7 +253,7 @@
<field name="account_analytic_id" domain="[('company_id', '=', parent.company_id)]" groups="analytic.group_analytic_accounting"/>
<field name="quantity"/>
<field name="price_unit"/>
<field name="tax_ids" widget="many2many_tags" options="{'color_field': 'color'}" domain="[('type_tax_use','=','sale')]"/>
<field name="tax_ids" widget="many2many_tags" domain="[('type_tax_use','=','sale')]"/>
<field name="price_subtotal"/>
<field name="currency_id" invisible="1"/>
<field name="company_id" invisible="1"/>
@@ -369,7 +369,7 @@
<field name="account_analytic_id" domain="[('company_id', '=', parent.company_id)]" groups="analytic.group_analytic_accounting"/>
<field name="quantity"/>
<field name="price_unit"/>
<field name="tax_ids" widget="many2many_tags" options="{'color_field': 'color'}" domain="[('type_tax_use','=','purchase')]"/>
<field name="tax_ids" widget="many2many_tags" domain="[('type_tax_use','=','purchase')]"/>
<field name="price_subtotal"/>
<field name="currency_id" invisible="1"/>
<field name="company_id" invisible="1"/>
addons/barcodes/i18n/barcodes.pot
+24 -10
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~14\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-15 09:49+0000\n"
"PO-Revision-Date: 2017-02-15 09:49+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -52,6 +52,13 @@ msgstr ""
msgid "A barcode nomenclature defines how the point of sale identify and interprets barcodes"
msgstr ""
#. module: barcodes
#. openerp-web
#: code:addons/barcodes/static/src/js/barcode_form_view.js:323
#, python-format
msgid "Action currently unavailable"
msgstr ""
#. module: barcodes
#: code:addons/barcodes/models/barcodes.py:183
#: selection:barcode.rule,type:0
@@ -143,7 +150,7 @@ msgstr ""
#. module: barcodes
#. openerp-web
#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:102
#: code:addons/barcodes/static/src/js/barcode_form_view.js:286
#, python-format
msgid "Discard"
msgstr ""
@@ -182,14 +189,21 @@ msgstr ""
#. module: barcodes
#. openerp-web
#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:64
#: code:addons/barcodes/static/src/js/barcode_form_view.js:233
#, python-format
msgid "Error : Barcode command is undefined"
msgstr ""
#. module: barcodes
#. openerp-web
#: code:addons/barcodes/static/src/js/barcode_form_view.js:59
#, python-format
msgid "Error : Document not editable"
msgstr ""
#. module: barcodes
#. openerp-web
#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:68
#: code:addons/barcodes/static/src/js/barcode_form_view.js:259
#, python-format
msgid "Error : No last scanned barcode"
msgstr ""
@@ -272,7 +286,7 @@ msgstr ""
#. module: barcodes
#. openerp-web
#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:88
#: code:addons/barcodes/static/src/js/barcode_form_view.js:279
#, python-format
msgid "Select"
msgstr ""
@@ -284,7 +298,7 @@ msgstr ""
#. module: barcodes
#. openerp-web
#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:87
#: code:addons/barcodes/static/src/js/barcode_form_view.js:278
#, python-format
msgid "Set quantity"
msgstr ""
@@ -324,14 +338,14 @@ msgstr ""
#. module: barcodes
#. openerp-web
#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:64
#: code:addons/barcodes/static/src/js/barcode_form_view.js:60
#, python-format
msgid "To modify this document, please first start edition."
msgstr ""
#. module: barcodes
#. openerp-web
#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:68
#: code:addons/barcodes/static/src/js/barcode_form_view.js:260
#, python-format
msgid "To set the quantity please scan a barcode first."
msgstr ""
addons/base_address_extended/i18n/base_address_extended.pot
+15 -3
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:45+0000\n"
"PO-Revision-Date: 2017-04-18 14:45+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,6 +20,11 @@ msgstr ""
msgid "Change how the system computes the full street field based on the different street subfields"
msgstr ""
#. module: base_address_extended
#: model:ir.model,name:base_address_extended.model_res_company
msgid "Companies"
msgstr ""
#. module: base_address_extended
#: model:ir.model,name:base_address_extended.model_res_partner
msgid "Contact"
@@ -31,7 +36,9 @@ msgid "Country"
msgstr ""
#. module: base_address_extended
#: model:ir.model.fields,field_description:base_address_extended.field_res_company_street_number2
#: model:ir.model.fields,field_description:base_address_extended.field_res_partner_street_number2
#: model:ir.model.fields,field_description:base_address_extended.field_res_users_street_number2
msgid "Door Number"
msgstr ""
@@ -46,7 +53,9 @@ msgid "Format to use for streets belonging to this country.\n"
msgstr ""
#. module: base_address_extended
#: model:ir.model.fields,field_description:base_address_extended.field_res_company_street_number
#: model:ir.model.fields,field_description:base_address_extended.field_res_partner_street_number
#: model:ir.model.fields,field_description:base_address_extended.field_res_users_street_number
msgid "House Number"
msgstr ""
@@ -56,13 +65,16 @@ msgid "Street Format"
msgstr ""
#. module: base_address_extended
#: model:ir.model.fields,field_description:base_address_extended.field_res_company_street_name
#: model:ir.model.fields,field_description:base_address_extended.field_res_partner_street_name
#: model:ir.model.fields,field_description:base_address_extended.field_res_users_street_name
msgid "Street Name"
msgstr ""
#. module: base_address_extended
#: model:ir.ui.view,arch_db:base_address_extended.view_partner_address_structured_form
#: model:ir.ui.view,arch_db:base_address_extended.view_partner_structured_form
#: model:ir.ui.view,arch_db:base_address_extended.view_res_company_extended_form
msgid "Street Name..."
msgstr ""
addons/base_sparse_field/i18n/base_sparse_field.pot
+135
View File
@@ -0,0 +1,135 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * base_sparse_field
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: base_sparse_field
#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_boolean
msgid "Boolean"
msgstr ""
#. module: base_sparse_field
#: code:addons/base_sparse_field/models/models.py:24
#, python-format
msgid "Changing the storing system for field \"%s\" is not allowed."
msgstr ""
#. module: base_sparse_field
#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_char
msgid "Char"
msgstr ""
#. module: base_sparse_field
#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_create_uid
msgid "Created by"
msgstr ""
#. module: base_sparse_field
#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_create_date
msgid "Created on"
msgstr ""
#. module: base_sparse_field
#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_data
msgid "Data"
msgstr ""
#. module: base_sparse_field
#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_display_name
msgid "Display Name"
msgstr ""
#. module: base_sparse_field
#: model:ir.model,name:base_sparse_field.model_ir_model_fields
msgid "Fields"
msgstr ""
#. module: base_sparse_field
#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_float
msgid "Float"
msgstr ""
#. module: base_sparse_field
#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_id
msgid "ID"
msgstr ""
#. module: base_sparse_field
#: model:ir.model.fields,help:base_sparse_field.field_ir_model_fields_serialization_field_id
msgid "If set, this field will be stored in the sparse structure of the serialization field, instead of having its own database column. This cannot be changed after creation."
msgstr ""
#. module: base_sparse_field
#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_integer
msgid "Integer"
msgstr ""
#. module: base_sparse_field
#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test___last_update
msgid "Last Modified on"
msgstr ""
#. module: base_sparse_field
#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_write_uid
msgid "Last Updated by"
msgstr ""
#. module: base_sparse_field
#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_write_date
msgid "Last Updated on"
msgstr ""
#. module: base_sparse_field
#: selection:sparse_fields.test,selection:0
msgid "One"
msgstr ""
#. module: base_sparse_field
#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_partner
msgid "Partner"
msgstr ""
#. module: base_sparse_field
#: code:addons/base_sparse_field/models/models.py:26
#, python-format
msgid "Renaming sparse field \"%s\" is not allowed"
msgstr ""
#. module: base_sparse_field
#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_selection
msgid "Selection"
msgstr ""
#. module: base_sparse_field
#: model:ir.model.fields,field_description:base_sparse_field.field_ir_model_fields_serialization_field_id
msgid "Serialization Field"
msgstr ""
#. module: base_sparse_field
#: code:addons/base_sparse_field/models/models.py:38
#, python-format
msgid "Serialization field `%s` not found for sparse field `%s`!"
msgstr ""
#. module: base_sparse_field
#: selection:sparse_fields.test,selection:0
msgid "Two"
msgstr ""
#. module: base_sparse_field
#: model:ir.model,name:base_sparse_field.model_sparse_fields_test
msgid "sparse_fields.test"
msgstr ""
addons/board/i18n/board.pot
+12 -12
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~14\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-15 09:49+0000\n"
"PO-Revision-Date: 2017-02-15 09:49+0000\n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgstr ""
#. module: board
#. openerp-web
#: code:addons/board/static/src/js/dashboard.js:423
#: code:addons/board/static/src/js/favorite_menu.js:97
#, python-format
msgid "'%s' added to dashboard"
msgstr ""
@@ -36,23 +36,23 @@ msgstr ""
#. module: board
#. openerp-web
#: code:addons/board/static/src/xml/board.xml:70
#: code:addons/board/static/src/xml/board.xml:69
#, python-format
msgid "Add"
msgstr ""
#. module: board
#. openerp-web
#: code:addons/board/static/src/xml/board.xml:64
#: code:addons/board/static/src/xml/board.xml:63
#, python-format
msgid "Add to my Dashboard"
msgstr ""
#. module: board
#. openerp-web
#: code:addons/board/static/src/js/dashboard.js:141
#: code:addons/board/static/src/js/dashboard.js:332
#, python-format
msgid "Are you sure you want to remove this item ?"
msgid "Are you sure you want to remove this item?"
msgstr ""
#. module: board
@@ -76,14 +76,14 @@ msgstr ""
#. module: board
#. openerp-web
#: code:addons/board/static/src/xml/board.xml:37
#: code:addons/board/static/src/xml/board.xml:36
#, python-format
msgid "Choose dashboard layout"
msgstr ""
#. module: board
#. openerp-web
#: code:addons/board/static/src/js/dashboard.js:425
#: code:addons/board/static/src/js/favorite_menu.js:99
#, python-format
msgid "Could not add filter to dashboard"
msgstr ""
@@ -95,7 +95,7 @@ msgstr ""
#. module: board
#. openerp-web
#: code:addons/board/static/src/js/dashboard.js:96
#: code:addons/board/static/src/js/dashboard.js:86
#, python-format
msgid "Edit Layout"
msgstr ""
@@ -112,7 +112,7 @@ msgstr ""
#. module: board
#. openerp-web
#: code:addons/board/static/src/js/dashboard.js:32
#: code:addons/board/static/src/js/dashboard.js:49
#: model:ir.actions.act_window,name:board.open_board_my_dash_action
#: model:ir.ui.menu,name:board.menu_board_my_dash
#: model:ir.ui.view,arch_db:board.board_my_dash_view
addons/calendar/i18n/calendar.pot
+21 -54
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:47+0000\n"
"PO-Revision-Date: 2017-04-18 14:47+0000\n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -140,7 +140,7 @@ msgid "\n"
" ${object.event_id.user_id.partner_id.name} invited you for the ${object.event_id.name} meeting of ${object.event_id.user_id.company_id.name}.</p>\n"
" <table style=\"margin-top: 20px;\"><tr>\n"
" <td>\n"
" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#875A7B;padding-top: 4px;\">\n"
" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#875A7B;padding-top: 4px;border:1px solid #875A7B;\">\n"
" ${object.event_id.get_interval('dayname', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
" </div>\n"
" <div style=\"font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #F8F8F8;width: 130px;border:1px solid #875A7B;\">\n"
@@ -272,13 +272,6 @@ msgid "\n"
"</div>"
msgstr ""
#. module: calendar
#. openerp-web
#: code:addons/calendar/static/src/js/base_calendar.js:98
#, python-format
msgid " [Me]"
msgstr ""
#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event_is_highlighted
msgid "# Meetings Highlight"
@@ -300,26 +293,26 @@ msgid "${object.event_id.name}: Date updated"
msgstr ""
#. module: calendar
#: code:addons/calendar/models/calendar.py:658
#: code:addons/calendar/models/calendar.py:671
#, python-format
msgid "%s at %s To\n"
" %s at %s (%s)"
msgstr ""
#. module: calendar
#: code:addons/calendar/models/calendar.py:656
#: code:addons/calendar/models/calendar.py:669
#, python-format
msgid "%s at (%s To %s) (%s)"
msgstr ""
#. module: calendar
#: code:addons/calendar/models/calendar.py:196
#: code:addons/calendar/models/calendar.py:206
#, python-format
msgid "%s has accepted invitation"
msgstr ""
#. module: calendar
#: code:addons/calendar/models/calendar.py:204
#: code:addons/calendar/models/calendar.py:214
#, python-format
msgid "%s has declined invitation"
msgstr ""
@@ -347,20 +340,13 @@ msgstr ""
msgid "Active"
msgstr ""
#. module: calendar
#. openerp-web
#: code:addons/calendar/static/src/js/base_calendar.js:78
#, python-format
msgid "Add Favorite Calendar"
msgstr ""
#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event_allday
msgid "All Day"
msgstr ""
#. module: calendar
#: code:addons/calendar/models/calendar.py:653
#: code:addons/calendar/models/calendar.py:666
#, python-format
msgid "AllDay , %s"
msgstr ""
@@ -399,7 +385,7 @@ msgid "Availability"
msgstr ""
#. module: calendar
#: code:addons/calendar/models/calendar.py:1506
#: code:addons/calendar/models/calendar.py:1508
#: selection:calendar.attendee,availability:0
#: selection:calendar.event,show_as:0
#, python-format
@@ -447,11 +433,6 @@ msgstr ""
msgid "Click to schedule a new meeting."
msgstr ""
#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event_color_partner_id
msgid "Color index of creator"
msgstr ""
#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_attendee_common_name
msgid "Common name"
@@ -547,13 +528,6 @@ msgstr ""
msgid "Display Name"
msgstr ""
#. module: calendar
#. openerp-web
#: code:addons/calendar/static/src/js/base_calendar.js:159
#, python-format
msgid "Do you really want to delete this filter from favorites ?"
msgstr ""
#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event_duration
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_form
@@ -604,13 +578,13 @@ msgid "Ending at"
msgstr ""
#. module: calendar
#: code:addons/calendar/models/calendar.py:848
#: code:addons/calendar/models/calendar.py:854
#, python-format
msgid "Ending date cannot be set before starting date."
msgstr ""
#. module: calendar
#: code:addons/calendar/models/calendar.py:846
#: code:addons/calendar/models/calendar.py:852
#, python-format
msgid "Ending datetime cannot be set before starting datetime."
msgstr ""
@@ -636,13 +610,6 @@ msgstr ""
msgid "Event recurrence interval cannot be negative."
msgstr ""
#. module: calendar
#. openerp-web
#: code:addons/calendar/static/src/js/base_calendar.js:99
#, python-format
msgid "Everybody's calendars"
msgstr ""
#. module: calendar
#: selection:calendar.event,privacy:0
msgid "Everyone"
@@ -659,7 +626,7 @@ msgid "First"
msgstr ""
#. module: calendar
#: code:addons/calendar/models/calendar.py:888
#: code:addons/calendar/models/calendar.py:894
#, python-format
msgid "First you have to specify the date of the invitation."
msgstr ""
@@ -791,6 +758,7 @@ msgstr ""
#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_res_partner_calendar_last_notif_ack
#: model:ir.model.fields,field_description:calendar.field_res_users_calendar_last_notif_ack
msgid "Last notification marked as read from base Calendar"
msgstr ""
@@ -961,6 +929,11 @@ msgstr ""
msgid "Participant"
msgstr ""
#. module: calendar
#: model:ir.model.fields,help:calendar.field_calendar_event_partner_id
msgid "Partner-related data of the user"
msgstr ""
#. module: calendar
#: code:addons/calendar/models/calendar.py:1110
#, python-format
@@ -1018,13 +991,6 @@ msgstr ""
msgid "Reminders"
msgstr ""
#. module: calendar
#. openerp-web
#: code:addons/calendar/static/src/xml/base_calendar.xml:26
#, python-format
msgid "Remove this favorite from the list"
msgstr ""
#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event_count
msgid "Repeat"
@@ -1051,6 +1017,7 @@ msgid "Repeat x times"
msgstr ""
#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event_partner_id
#: model:ir.model.fields,field_description:calendar.field_calendar_event_user_id
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_search
msgid "Responsible"
@@ -1281,7 +1248,7 @@ msgid "Yes I'm going."
msgstr ""
#. module: calendar
#: code:addons/calendar/models/calendar.py:128
#: code:addons/calendar/models/calendar.py:137
#, python-format
msgid "You cannot duplicate a calendar attendee."
msgstr ""
addons/crm/i18n/crm.pot
+95 -42
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:45+0000\n"
"PO-Revision-Date: 2017-04-18 14:45+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -657,11 +657,7 @@ msgid "Active"
msgstr ""
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_activity_report_action_tree
#: model:ir.model.fields,field_description:crm.field_res_partner_activities_count
#: model:ir.model.fields,field_description:crm.field_res_users_activities_count
#: model:ir.ui.menu,name:crm.crm_activity_report_menu
#: model:ir.ui.view,arch_db:crm.view_partners_form_crm1
msgid "Activities"
msgstr ""
@@ -751,7 +747,7 @@ msgid "All contacts must have the same email. Only the Administrator can merge c
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_lead.py:844
#: code:addons/crm/models/crm_lead.py:856
#, python-format
msgid "All email incoming to %s will automatically\n"
" create new opportunity. Update your business card, phone book, social media,...\n"
@@ -991,7 +987,7 @@ msgid "Click on an opportunity to zoom to it."
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_lead.py:847
#: code:addons/crm/models/crm_lead.py:859
#, python-format
msgid "Click to add a new opportunity"
msgstr ""
@@ -1168,7 +1164,7 @@ msgid "Convert to opportunities"
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_lead.py:1018
#: code:addons/crm/models/crm_lead.py:1031
#: selection:crm.lead2opportunity.partner,name:0
#: selection:crm.lead2opportunity.partner.mass,name:0
#: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
@@ -1344,7 +1340,7 @@ msgid "Current Line"
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_lead.py:1062
#: code:addons/crm/models/crm_lead.py:1075
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass_partner_id
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_partner_id
#: model:ir.model.fields,field_description:crm.field_crm_lead2projectissue_wizard_partner_id
@@ -1360,7 +1356,7 @@ msgid "Customer"
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_lead.py:1064
#: code:addons/crm/models/crm_lead.py:1077
#, python-format
msgid "Customer Email"
msgstr ""
@@ -1383,7 +1379,7 @@ msgid "Customizations"
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_team.py:83
#: code:addons/crm/models/crm_team.py:121
#, python-format
msgid "Dashboard graph content cannot be Pipeline if the sales channel doesn't use it. (Pipeline is unchecked.)"
msgstr ""
@@ -1638,9 +1634,22 @@ msgid "Expected Closing Date"
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_team.py:190
#: selection:crm.team,dashboard_graph_group_pipeline:0
msgid "Expected Closing Day"
msgstr ""
#. module: crm
#: selection:crm.team,dashboard_graph_group_pipeline:0
msgid "Expected Closing Month"
msgstr ""
#. module: crm
#: selection:crm.team,dashboard_graph_group_pipeline:0
msgid "Expected Closing Week"
msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead_planned_revenue
#, python-format
msgid "Expected Revenue"
msgstr ""
@@ -1649,6 +1658,11 @@ msgstr ""
msgid "Expected Revenues"
msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_team_dashboard_graph_period_pipeline
msgid "Expected to Close"
msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
msgid "Expiration Closing Month"
@@ -1714,7 +1728,7 @@ msgid "Force assignation"
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_lead.py:515
#: code:addons/crm/models/crm_lead.py:527
#, python-format
msgid "From %s : %s"
msgstr ""
@@ -1772,6 +1786,11 @@ msgstr ""
msgid "Group By"
msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_team_dashboard_graph_group_pipeline
msgid "Group by"
msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_automatic_wizard_number_group
msgid "Group of Contacts"
@@ -1829,6 +1848,11 @@ msgstr ""
msgid "High"
msgstr ""
#. module: crm
#: model:ir.model.fields,help:crm.field_crm_team_dashboard_graph_group_pipeline
msgid "How this channel's dashboard graph will group the results."
msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_automatic_wizard_id
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_line_id
@@ -2021,7 +2045,7 @@ msgid "Last Updated on"
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_lead.py:821
#: code:addons/crm/models/crm_lead.py:833
#: selection:crm.activity.report,lead_type:0
#: selection:crm.lead,type:0
#: selection:crm.opportunity.report,type:0
@@ -2092,7 +2116,7 @@ msgid "Leads & Opportunities"
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_lead.py:56
#: code:addons/crm/models/crm_lead.py:55
#, python-format
msgid "Leads / Opportunities"
msgstr ""
@@ -2192,7 +2216,7 @@ msgstr ""
#. module: crm
#. openerp-web
#: code:addons/crm/models/crm_lead.py:1024
#: code:addons/crm/models/crm_lead.py:1037
#: code:addons/crm/static/src/js/web_planner_crm.js:33
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
@@ -2267,7 +2291,7 @@ msgid "Medium"
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_lead.py:863
#: code:addons/crm/models/crm_lead.py:875
#, python-format
msgid "Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)"
msgstr ""
@@ -2351,25 +2375,25 @@ msgid "Merge with existing opportunities"
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_lead.py:466
#: code:addons/crm/models/crm_lead.py:478
#, python-format
msgid "Merged lead"
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_lead.py:497
#: code:addons/crm/models/crm_lead.py:509
#, python-format
msgid "Merged leads"
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_lead.py:497
#: code:addons/crm/models/crm_lead.py:509
#, python-format
msgid "Merged opportunities"
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_lead.py:466
#: code:addons/crm/models/crm_lead.py:478
#, python-format
msgid "Merged opportunity"
msgstr ""
@@ -2472,11 +2496,6 @@ msgstr ""
msgid "New propspect assigned to the right salesperson"
msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead_date_action_next
msgid "Next Action"
msgstr ""
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_lead_action_activities
#: model:ir.ui.menu,name:crm.crm_lead_menu_activities
@@ -2495,7 +2514,7 @@ msgid "Next activity late"
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_lead.py:1084
#: code:addons/crm/models/crm_lead.py:1097
#, python-format
msgid "No Subject"
msgstr ""
@@ -2667,7 +2686,7 @@ msgid "Opportunities that are assigned to me"
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_lead.py:796
#: code:addons/crm/models/crm_lead.py:808
#: selection:crm.activity.report,lead_type:0
#: selection:crm.lead,type:0
#: selection:crm.opportunity.report,type:0
@@ -2821,6 +2840,11 @@ msgstr ""
msgid "Phone"
msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_sale_config_settings_module_crm_phone_validation
msgid "Phone Validation"
msgstr ""
#. module: crm
#. openerp-web
#: code:addons/crm/static/src/js/web_planner_crm.js:23
@@ -2834,7 +2858,7 @@ msgid "Phone scripts"
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_team.py:134
#: code:addons/crm/models/crm_team.py:172
#: model:ir.model.fields,field_description:crm.field_crm_team_use_opportunities
#: model:ir.ui.menu,name:crm.crm_opportunity_report_menu
#: model:ir.ui.view,arch_db:crm.crm_planner
@@ -2869,6 +2893,12 @@ msgid "Pipeline Analysis gives you an instant access to\n"
"with the the sales channel."
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_team.py:238
#, python-format
msgid "Pipeline: Expected Revenue"
msgstr ""
#. module: crm
#: model:web.planner,tooltip_planner:crm.planner_crm
msgid "Plan your sales strategy: objectives, leads, KPIs, and much more!"
@@ -2880,7 +2910,7 @@ msgid "Planner"
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_lead.py:569
#: code:addons/crm/models/crm_lead.py:581
#, python-format
msgid "Please select more than one element (lead or opportunity) from the list view."
msgstr ""
@@ -2900,6 +2930,7 @@ msgid "Pricing &amp; Discounts"
msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead_priority
#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_priority
msgid "Priority"
msgstr ""
@@ -2999,11 +3030,6 @@ msgstr ""
msgid "Quotation signed by the customer"
msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead_priority
msgid "Rating"
msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "Read the documentation about pricing &amp; discounts"
@@ -3111,6 +3137,7 @@ msgid "Salesmen"
msgstr ""
#. module: crm
#: selection:crm.team,dashboard_graph_group_pipeline:0
#: model:ir.model.fields,field_description:crm.field_crm_activity_report_user_id
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass_user_id
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_user_id
@@ -3297,6 +3324,7 @@ msgid "Specific team that uses this stage. Other teams will not be able to see o
msgstr ""
#. module: crm
#: selection:crm.team,dashboard_graph_group_pipeline:0
#: model:ir.model.fields,field_description:crm.field_crm_activity_report_stage_id
#: model:ir.model.fields,field_description:crm.field_crm_lead_stage_id
#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_stage_id
@@ -3500,6 +3528,11 @@ msgid "The three main practices to develop a sales force are\n"
" <strong>good sales tools</strong>."
msgstr ""
#. module: crm
#: model:ir.model.fields,help:crm.field_crm_team_dashboard_graph_period_pipeline
msgid "The time period this channel's dashboard graph will consider."
msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "The whole process may take a few hours. But it's worth doing\n"
@@ -3570,7 +3603,7 @@ msgid "This stage is folded in the kanban view when there are no records in that
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_lead.py:990
#: code:addons/crm/models/crm_lead.py:1003
#, python-format
msgid "This target does not exist."
msgstr ""
@@ -3784,6 +3817,11 @@ msgstr ""
msgid "VIP letter to potential sponsors"
msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.sale_config_settings_view_form_inherit_crm
msgid "Validate and normalize phone numbers."
msgstr ""
#. module: crm
#: selection:crm.lead,priority:0
#: selection:crm.opportunity.report,priority:0
@@ -3883,6 +3921,21 @@ msgstr ""
msgid "Win / Loss Ratio"
msgstr ""
#. module: crm
#: selection:crm.team,dashboard_graph_period_pipeline:0
msgid "Within a Month"
msgstr ""
#. module: crm
#: selection:crm.team,dashboard_graph_period_pipeline:0
msgid "Within a Week"
msgstr ""
#. module: crm
#: selection:crm.team,dashboard_graph_period_pipeline:0
msgid "Within a Year"
msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_line_wizard_id
msgid "Wizard"
@@ -3890,7 +3943,7 @@ msgstr ""
#. module: crm
#. openerp-web
#: code:addons/crm/models/crm_lead.py:1023
#: code:addons/crm/models/crm_lead.py:1036
#: code:addons/crm/static/src/js/web_planner_crm.js:15
#: code:addons/crm/static/src/js/web_planner_crm.js:22
#: code:addons/crm/static/src/js/web_planner_crm.js:27
@@ -4067,7 +4120,7 @@ msgid "e.g. www.odoo.com"
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_lead.py:851
#: code:addons/crm/models/crm_lead.py:863
#, python-format
msgid "opportunities"
msgstr ""
@@ -4129,7 +4182,7 @@ msgid "to setup your own domain\n"
msgstr ""
#. module: crm
#: code:addons/crm/models/crm_lead.py:857
#: code:addons/crm/models/crm_lead.py:869
#, python-format
msgid "unknown"
msgstr ""
addons/crm_phone_validation/i18n/crm_phone_validation.pot
+42
View File
@@ -0,0 +1,42 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * crm_phone_validation
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-25 10:05+0000\n"
"PO-Revision-Date: 2017-07-25 10:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: crm_phone_validation
#: model:ir.model.fields,help:crm_phone_validation.field_sale_config_settings_crm_phone_valid_method
msgid "Always encode phone numbers using international format. Otherwisenumbers coming from the company's country are nationaly formatted.International numbers are always using international format."
msgstr ""
#. module: crm_phone_validation
#: model:ir.model,name:crm_phone_validation.model_res_partner
msgid "Contact"
msgstr ""
#. module: crm_phone_validation
#: model:ir.model.fields,field_description:crm_phone_validation.field_sale_config_settings_crm_phone_valid_method
msgid "Enforce International Format"
msgstr ""
#. module: crm_phone_validation
#: model:ir.model,name:crm_phone_validation.model_crm_lead
msgid "Lead/Opportunity"
msgstr ""
#. module: crm_phone_validation
#: model:ir.model,name:crm_phone_validation.model_sale_config_settings
msgid "sale.config.settings"
msgstr ""
addons/delivery/i18n/delivery.pot
+27 -16
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:46+0000\n"
"PO-Revision-Date: 2017-04-18 14:46+0000\n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -82,12 +82,12 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier_description_sale
msgid "A description of the Product that you want to communicate to your customers. This description will be copied to every Sales Order, Delivery Order and Customer Invoice/Refund"
msgid "A description of the Product that you want to communicate to your customers. This description will be copied to every Sales Order, Delivery Order and Customer Invoice/Credit Note"
msgstr ""
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier_description_purchase
msgid "A description of the Product that you want to communicate to your vendors. This description will be copied to every Purchase Order, Receipt and Vendor Bill/Refund."
msgid "A description of the Product that you want to communicate to your vendors. This description will be copied to every Purchase Order, Receipt and Vendor Bill/Credit Note."
msgstr ""
#. module: delivery
@@ -423,6 +423,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_res_partner_property_delivery_carrier_id
#: model:ir.model.fields,field_description:delivery.field_res_users_property_delivery_carrier_id
#: model:ir.model.fields,field_description:delivery.field_sale_order_carrier_id
msgid "Delivery Method"
msgstr ""
@@ -441,8 +442,15 @@ msgid "Delivery Package Selection Wizard"
msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_delivery_packaging_id
#: model:ir.actions.act_window,name:delivery.action_delivery_packaging_view
#: model:ir.ui.menu,name:delivery.menu_delivery_packagings
#: model:ir.ui.view,arch_db:delivery.product_packaging_delivery_tree
msgid "Delivery Packages"
msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_delivery_packaging_id
#: model:ir.ui.view,arch_db:delivery.product_packaging_delivery_form
msgid "Delivery Packaging"
msgstr ""
@@ -617,6 +625,7 @@ msgstr ""
#. module: delivery
#: model:delivery.carrier,name:delivery.free_delivery_carrier
#: model:product.product,name:delivery.free_delivery_carrier_product_product
#: model:product.template,name:delivery.free_delivery_carrier_product_template
msgid "Free delivery charges"
msgstr ""
@@ -652,6 +661,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_hs_code
#: model:ir.model.fields,field_description:delivery.field_product_product_hs_code
#: model:ir.model.fields,field_description:delivery.field_product_template_hs_code
msgid "HS Code"
msgstr ""
@@ -1034,7 +1044,7 @@ msgstr ""
#. module: delivery
#: code:addons/delivery/models/stock_picking.py:36
#: code:addons/delivery/models/stock_picking.py:128
#: code:addons/delivery/models/stock_picking.py:129
#, python-format
msgid "Package Details"
msgstr ""
@@ -1046,15 +1056,9 @@ msgstr ""
#. module: delivery
#: model:ir.model,name:delivery.model_product_packaging
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_packaging_ids
msgid "Packaging"
msgstr ""
#. module: delivery
#: model:ir.actions.act_window,name:delivery.action_delivery_packaging_view
msgid "Packagings"
msgstr ""
#. module: delivery
#: model:ir.model,name:delivery.model_stock_pack_operation
msgid "Packing Operation"
@@ -1143,6 +1147,11 @@ msgstr ""
msgid "Product Life Time"
msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_packaging_ids
msgid "Product Packages"
msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_removal_time
msgid "Product Removal Time"
@@ -1354,7 +1363,7 @@ msgid "Set to True if your credentials are certified for production."
msgstr ""
#. module: delivery
#: code:addons/delivery/models/stock_picking.py:147
#: code:addons/delivery/models/stock_picking.py:150
#, python-format
msgid "Shipment sent to carrier %s for shipping with tracking number %s<br/>Cost: %.2f %s"
msgstr ""
@@ -1395,6 +1404,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier_hs_code
#: model:ir.model.fields,help:delivery.field_product_product_hs_code
#: model:ir.model.fields,help:delivery.field_product_template_hs_code
msgid "Standardized code for international shipping and goods declaration"
msgstr ""
@@ -1521,6 +1531,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,help:delivery.field_res_partner_property_delivery_carrier_id
#: model:ir.model.fields,help:delivery.field_res_users_property_delivery_carrier_id
msgid "This delivery method will be used when invoicing from picking."
msgstr ""
@@ -1747,14 +1758,14 @@ msgid "Width must be positive"
msgstr ""
#. module: delivery
#: code:addons/delivery/models/stock_picking.py:187
#: code:addons/delivery/models/stock_picking.py:190
#, python-format
msgid "You are shipping different packaging types in the same shipment.\n"
"Packaging Types: %s"
msgstr ""
#. module: delivery
#: code:addons/delivery/models/stock_picking.py:163
#: code:addons/delivery/models/stock_picking.py:166
#, python-format
msgid "Your delivery method has no redirect on courier provider's website to track this order."
msgstr ""
addons/delivery/views/delivery_view.xml
+2 -2
View File
@@ -116,8 +116,8 @@
</group>
<group>
<group>
<field name="country_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
<field name="state_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
<field name="country_ids" widget="many2many_tags"/>
<field name="state_ids" widget="many2many_tags"/>
</group>
<group></group>
<group>
addons/document/i18n/document.pot
+26 -5
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~14\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-15 09:49+0000\n"
"PO-Revision-Date: 2017-02-15 09:49+0000\n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,18 +17,39 @@ msgstr ""
#. module: document
#. openerp-web
#: code:addons/document/static/src/js/document.js:26
#: code:addons/document/static/src/js/document.js:69
#, python-format
msgid "%s (%s)"
msgstr ""
#. module: document
#. openerp-web
#: code:addons/document/static/src/js/document.js:14
#: code:addons/document/static/src/js/document.js:18
#, python-format
msgid "Attachment(s)"
msgstr ""
#. module: document
#. openerp-web
#: code:addons/document/static/src/js/document.js:163
#, python-format
msgid "Do you really want to delete this attachment ?"
msgstr ""
#. module: document
#. openerp-web
#: code:addons/document/static/src/js/document.js:176
#, python-format
msgid "Uploading Error"
msgstr ""
#. module: document
#. openerp-web
#: code:addons/document/static/src/js/document.js:138
#, python-format
msgid "Uploading..."
msgstr ""
#. module: document
#: model:ir.model,name:document.model_ir_attachment
msgid "ir.attachment"
addons/event/i18n/event.pot
+29 -22
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:46+0000\n"
"PO-Revision-Date: 2017-04-18 14:46+0000\n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -411,6 +411,11 @@ msgstr ""
msgid "Archived"
msgstr ""
#. module: event
#: model:ir.ui.view,arch_db:event.view_event_form
msgid "Are you sure you want to cancel this event? All the linked attendees will be cancelled as well."
msgstr ""
#. module: event
#: model:ir.ui.view,arch_db:event.event_config_settings_view_form
msgid "Attendance"
@@ -562,7 +567,7 @@ msgid "Company"
msgstr ""
#. module: event
#: code:addons/event/models/event.py:467
#: code:addons/event/models/event.py:480
#, python-format
msgid "Compose Email"
msgstr ""
@@ -655,13 +660,13 @@ msgid "Created on"
msgstr ""
#. module: event
#: code:addons/event/models/event.py:444
#: code:addons/event/models/event.py:443
#, python-format
msgid "Customer"
msgstr ""
#. module: event
#: code:addons/event/models/event.py:446
#: code:addons/event/models/event.py:445
#, python-format
msgid "Customer Email"
msgstr ""
@@ -741,7 +746,7 @@ msgid "Event"
msgstr ""
#. module: event
#: code:addons/event/models/event.py:333
#: code:addons/event/models/event.py:332
#, python-format
msgid "Event Attendees"
msgstr ""
@@ -840,6 +845,7 @@ msgstr ""
#. module: event
#: model:ir.actions.act_window,name:event.action_event_view
#: model:ir.model.fields,field_description:event.field_res_partner_event_count
#: model:ir.model.fields,field_description:event.field_res_users_event_count
#: model:ir.ui.menu,name:event.event_event_menu_pivot_report
#: model:ir.ui.menu,name:event.event_main_menu
#: model:ir.ui.menu,name:event.menu_event_event
@@ -1104,7 +1110,7 @@ msgid "No more available seats."
msgstr ""
#. module: event
#: code:addons/event/models/event.py:363
#: code:addons/event/models/event.py:362
#, python-format
msgid "No more seats available for this event."
msgstr ""
@@ -1121,6 +1127,7 @@ msgstr ""
#. module: event
#: model:ir.model.fields,help:event.field_res_partner_event_count
#: model:ir.model.fields,help:event.field_res_users_event_count
msgid "Number of events the partner has participated."
msgstr ""
@@ -1382,6 +1389,12 @@ msgstr ""
msgid "The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."
msgstr ""
#. module: event
#: code:addons/event/models/event.py:309
#, python-format
msgid "There are already attendees who attended this event. Please reset it to draft if you want to cancel this event."
msgstr ""
#. module: event
#: model:ir.model.fields,help:event.field_event_mail_template_id
#: model:ir.model.fields,help:event.field_event_type_mail_template_id
@@ -1496,19 +1509,13 @@ msgid "Week(s)"
msgstr ""
#. module: event
#: code:addons/event/models/event.py:310
#, python-format
msgid "You have already set a registration for this event as 'Attended'. Please reset it to draft if you want to cancel this event."
msgstr ""
#. module: event
#: code:addons/event/models/event.py:420
#: code:addons/event/models/event.py:419
#, python-format
msgid "You must wait the event confirmation before doing this action."
msgstr ""
#. module: event
#: code:addons/event/models/event.py:422
#: code:addons/event/models/event.py:421
#, python-format
msgid "You must wait the event starting day before doing this action."
msgstr ""
@@ -1539,37 +1546,37 @@ msgid "event.confirm"
msgstr ""
#. module: event
#: code:addons/event/models/event.py:489
#: code:addons/event/models/event.py:502
#, python-format
msgid "in %d days"
msgstr ""
#. module: event
#: code:addons/event/models/event.py:493
#: code:addons/event/models/event.py:506
#, python-format
msgid "next month"
msgstr ""
#. module: event
#: code:addons/event/models/event.py:491
#: code:addons/event/models/event.py:504
#, python-format
msgid "next week"
msgstr ""
#. module: event
#: code:addons/event/models/event.py:495
#: code:addons/event/models/event.py:508
#, python-format
msgid "on "
msgstr ""
#. module: event
#: code:addons/event/models/event.py:485
#: code:addons/event/models/event.py:498
#, python-format
msgid "today"
msgstr ""
#. module: event
#: code:addons/event/models/event.py:487
#: code:addons/event/models/event.py:500
#, python-format
msgid "tomorrow"
msgstr ""
addons/fleet/i18n/fleet.pot
+78 -49
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~14\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-15 09:50+0000\n"
"PO-Revision-Date: 2017-02-15 09:50+0000\n"
"POT-Creation-Date: 2017-07-25 10:05+0000\n"
"PO-Revision-Date: 2017-07-25 10:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: fleet
#: code:addons/fleet/models/fleet.py:307
#: code:addons/fleet/models/fleet_vehicle.py:196
#, python-format
msgid "%s %s has been added to the fleet!"
msgstr ""
#. module: fleet
#: code:addons/fleet/models/fleet.py:652
#: code:addons/fleet/models/fleet_vehicle_cost.py:266
#, python-format
msgid "%s contract(s) need(s) to be renewed and/or closed!"
msgstr ""
@@ -62,11 +62,6 @@ msgstr ""
msgid "A/C Recharge"
msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_acquisition_date
msgid "Acquisition Date"
msgstr ""
#. module: fleet
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_tree
@@ -197,13 +192,13 @@ msgid "Calculation Benefit In Kind"
msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_car_value
msgid "Car Value"
#: model:fleet.service.type,name:fleet.type_service_14
msgid "Car Wash"
msgstr ""
#. module: fleet
#: model:fleet.service.type,name:fleet.type_service_14
msgid "Car Wash"
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_car_value
msgid "Catalog Value (VAT Incl.)"
msgstr ""
#. module: fleet
@@ -407,6 +402,14 @@ msgstr ""
msgid "Cost"
msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost_description
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_description
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_description
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_description
msgid "Cost Description"
msgstr ""
#. module: fleet
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_form
msgid "Cost Details"
@@ -498,7 +501,7 @@ msgid "Created on"
msgstr ""
#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_state_id_3011
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_state_id
msgid "Current state of the vehicle"
msgstr ""
@@ -536,7 +539,7 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_acquisition_date
msgid "Date when the vehicle has been bought"
msgid "Date when the vehicle has been immatriculated"
msgstr ""
#. module: fleet
@@ -576,16 +579,18 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_driver_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_driver_id
msgid "Driver"
msgstr ""
#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_driver_id
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_odometer_driver_id
msgid "Driver of the vehicle"
msgstr ""
#. module: fleet
#: code:addons/fleet/models/fleet.py:325
#: code:addons/fleet/models/fleet_vehicle.py:214
#, python-format
msgid "Driver: from '%s' to '%s'"
msgstr ""
@@ -593,7 +598,7 @@ msgstr ""
#. module: fleet
#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_action
msgid "Each contract (e.g.: leasing) may include several services\n"
" (reparation, insurances, periodic maintenance)."
" (reparation, insurances, periodic maintenance)."
msgstr ""
#. module: fleet
@@ -622,7 +627,7 @@ msgid "Employee Car"
msgstr ""
#. module: fleet
#: code:addons/fleet/models/fleet.py:37
#: code:addons/fleet/models/fleet_vehicle_cost.py:44
#, python-format
msgid "Emptying the odometer value of a vehicle is not allowed."
msgstr ""
@@ -799,15 +804,15 @@ msgstr ""
#. module: fleet
#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_fuel_action
msgid "Here you can add refuelling entries for all vehicles. You can\n"
" also filter logs of a particular vehicle using the search\n"
" field."
" also filter logs of a particular vehicle using the search\n"
" field."
msgstr ""
#. module: fleet
#: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_action
msgid "Here you can add various odometer entries for all vehicles.\n"
" You can also show odometer value for a particular vehicle using\n"
" the search field."
" You can also show odometer value for a particular vehicle using\n"
" the search field."
msgstr ""
#. module: fleet
@@ -832,10 +837,10 @@ msgstr ""
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_brand_id_2959
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_brand_id_3193
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_id_3182
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_state_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_state_id_3038
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_tag_id
msgid "ID"
msgstr ""
@@ -845,8 +850,14 @@ msgstr ""
msgid "Ignition Coil Replacement"
msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_acquisition_date
msgid "Immatriculation Date"
msgstr ""
#. module: fleet
#: selection:fleet.vehicle.log.contract,state:0
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
msgid "In Progress"
msgstr ""
@@ -975,7 +986,7 @@ msgid "License Plate"
msgstr ""
#. module: fleet
#: code:addons/fleet/models/fleet.py:332
#: code:addons/fleet/models/fleet_vehicle.py:221
#, python-format
msgid "License Plate: from '%s' to '%s'"
msgstr ""
@@ -1034,8 +1045,8 @@ msgstr ""
#. module: fleet
#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_action
msgid "Manage all your contracts (leasing, insurances, etc.) with\n"
" their related services, costs. Odoo will automatically warn\n"
" you when some contracts have to be renewed."
" their related services, costs. Odoo will automatically warn\n"
" you when some contracts have to be renewed."
msgstr ""
#. module: fleet
@@ -1071,7 +1082,7 @@ msgid "Miles"
msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_id_2992
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_id
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_view_form
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search
msgid "Model"
@@ -1100,12 +1111,12 @@ msgid "Model of a vehicle"
msgstr ""
#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_model_id_2992
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_model_id
msgid "Model of the vehicle"
msgstr ""
#. module: fleet
#: code:addons/fleet/models/fleet.py:321
#: code:addons/fleet/models/fleet_vehicle.py:210
#, python-format
msgid "Model: from '%s' to '%s'"
msgstr ""
@@ -1149,10 +1160,10 @@ msgid "No"
msgstr ""
#. module: fleet
#: code:addons/fleet/models/fleet.py:320
#: code:addons/fleet/models/fleet.py:324
#: code:addons/fleet/models/fleet.py:328
#: code:addons/fleet/models/fleet.py:331
#: code:addons/fleet/models/fleet_vehicle.py:209
#: code:addons/fleet/models/fleet_vehicle.py:213
#: code:addons/fleet/models/fleet_vehicle.py:217
#: code:addons/fleet/models/fleet_vehicle.py:220
#, python-format
msgid "None"
msgstr ""
@@ -1203,7 +1214,6 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost_odometer
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_odometer
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_odometer
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_odometer
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_value
@@ -1215,6 +1225,11 @@ msgstr ""
msgid "Odometer Values Per Vehicle"
msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_odometer
msgid "Odometer at creation"
msgstr ""
#. module: fleet
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
msgid "Odometer details"
@@ -1225,10 +1240,14 @@ msgstr ""
msgid "Odometer log for a vehicle"
msgstr ""
#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_odometer
msgid "Odometer measure of the vehicle at the moment of the contract creation"
msgstr ""
#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_cost_odometer
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_cost_odometer_id
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_odometer
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_odometer_id
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_fuel_odometer
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_fuel_odometer_id
@@ -1241,8 +1260,8 @@ msgstr ""
#. module: fleet
#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_services_action
msgid "Odoo helps you keeping track of all the services done\n"
" on your vehicle. Services can be of many type: occasional\n"
" repair, fixed maintenance, etc."
" on your vehicle. Services can be of many type: occasional\n"
" repair, fixed maintenance, etc."
msgstr ""
#. module: fleet
@@ -1262,7 +1281,7 @@ msgstr ""
#. module: fleet
#: model:ir.actions.act_window,help:fleet.fleet_vehicle_action
msgid "Odoo will warn you when services or contract have to be\n"
" renewed."
" renewed."
msgstr ""
#. module: fleet
@@ -1280,6 +1299,11 @@ msgstr ""
msgid "Omnium"
msgstr ""
#. module: fleet
#: sql_constraint:fleet.vehicle:0
msgid "Only one car can be assigned to the same employee!"
msgstr ""
#. module: fleet
#: model:fleet.service.type,name:fleet.type_service_service_16
msgid "Options"
@@ -1392,7 +1416,7 @@ msgid "Refueling Details"
msgstr ""
#. module: fleet
#: code:addons/fleet/models/fleet.py:587
#: code:addons/fleet/models/fleet_vehicle_cost.py:192
#: model:ir.actions.act_window,name:fleet.act_renew_contract
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
#, python-format
@@ -1424,6 +1448,11 @@ msgstr ""
msgid "Reporting"
msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_residual_value
msgid "Residual Value"
msgstr ""
#. module: fleet
#: model:fleet.service.type,name:fleet.type_service_service_15
msgid "Residual value (Excluding VAT)"
@@ -1555,7 +1584,7 @@ msgid "Starter Replacement"
msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_state_id_3011
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_state_id
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_state_view_tree
msgid "State"
msgstr ""
@@ -1566,7 +1595,7 @@ msgid "State name already exists"
msgstr ""
#. module: fleet
#: code:addons/fleet/models/fleet.py:329
#: code:addons/fleet/models/fleet_vehicle.py:218
#, python-format
msgid "State: from '%s' to '%s'"
msgstr ""
@@ -1729,7 +1758,7 @@ msgstr ""
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_odometer_unit
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_odometer_unit
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_odometer_unit
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_unit_3026
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_unit_3029
msgid "Unit"
msgstr ""
@@ -1739,7 +1768,7 @@ msgstr ""
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_fuel_odometer_unit
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_services_odometer_unit
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_odometer_unit
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_odometer_unit_3026
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_odometer_unit_3029
msgid "Unit of the odometer "
msgstr ""
@@ -1946,7 +1975,7 @@ msgstr ""
#. module: fleet
#: model:ir.actions.act_window,help:fleet.fleet_vehicle_state_action
msgid "You can customize available status to track the evolution of\n"
" each vehicle. Example: Active, Being Repaired, Sold."
" each vehicle. Example: Active, Being Repaired, Sold."
msgstr ""
#. module: fleet
@@ -1957,8 +1986,8 @@ msgstr ""
#. module: fleet
#: model:ir.actions.act_window,help:fleet.fleet_vehicle_action
msgid "You will be able to manage your fleet by keeping track of the\n"
" contracts, services, fixed and recurring costs, odometers and\n"
" fuel logs associated to each vehicle."
" contracts, services, fixed and recurring costs, odometers and\n"
" fuel logs associated to each vehicle."
msgstr ""
#. module: fleet
addons/gamification/i18n/gamification.pot
+264 -98
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~14\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-15 09:50+0000\n"
"PO-Revision-Date: 2017-02-15 09:50+0000\n"
"POT-Creation-Date: 2017-07-25 10:05+0000\n"
"PO-Revision-Date: 2017-07-25 10:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,246 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: gamification
#: model:mail.template,body_html:gamification.simple_report_template
msgid "\n"
" \n"
"% set record = ctx.get('record')\n"
"% set company = record and record.company_id or user.company_id\n"
"% set challenge_lines = ctx.get('challenge_lines', []) \n"
"<table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"font-family: 'Helvetica'; background-color: #EEE; border-collapse: collapse;\">\n"
"<tr>\n"
" <td valign=\"top\" align=\"center\">\n"
" <table cellspacing=\"0\" cellpadding=\"0\" width=\"600\" style=\"margin: 0 auto; width: 600px;\">\n"
" <tr><td>\n"
" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\">\n"
" <tr>\n"
" <td valign=\"middle\" align=\"left\" style=\"padding:30px 15px;\">\n"
" <img width=\"90\" src=\"/logo.png?company=${user.company_id.id}\" style=\"width:80px;\"/>\n"
" </td>\n"
" % if object.visibility_mode == 'ranking':\n"
" <td style=\"padding:15px;\">\n"
" <p style=\"font-size:20px;color:#666666;\" align=\"right\">Leaderboard</p>\n"
" </td>\n"
" % endif\n"
" </tr>\n"
" </table>\n"
" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" bgcolor=\"#fff\" style=\"background-color:#fff;\">\n"
" <tr><td style=\"padding: 15px;\">\n"
" % if object.visibility_mode == 'personal':\n"
" <span style=\"color:#666666;font-size:13px;\">Here is your current progress in the challenge <strong>${object.name}</strong>.</span>\n"
" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:20px;\">\n"
" <tr>\n"
" <td align=\"center\">\n"
" <p style=\"font-size:27px;color:#666666;\">Personal Performance</p>\n"
" </td>\n"
" </tr>\n"
" </table>\n"
" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:30px;color:#666666;\">\n"
" <thead>\n"
" <tr style=\"color:#9A6C8E; font-size:12px;\">\n"
" <th align=\"left\" style=\"padding-bottom: 0px;width:40%;text-align:left;\">Goals</th>\n"
" <th style=\"width:20%;text-align:right;\" align=\"left\">Target</th>\n"
" <th style=\"width:20%;text-align:right;\" align=\"right\">Current</th>\n"
" <th style=\"width:20%;text-align:right;\" align=\"right\">Completeness</th>\n"
" </tr>\n"
" <tr>\n"
" <td colspan=\"5\" style=\"height:1px;background-color:#9A6C8E;\"></td>\n"
" </tr>\n"
" </thead>\n"
" <tbody>\n"
" % for line in challenge_lines:\n"
" <tr\n"
" % if line['completeness'] >= 100:\n"
" style=\"font-weight:bold;\"\n"
" % endif\n"
" >\n"
" <td style=\"padding: 20px 0;\" align=\"left\">\n"
" ${line['name']}\n"
" % if line['suffix'] or line['monetary']:\n"
" (${line['full_suffix']})\n"
" % endif\n"
" </td>\n"
" <td style=\"padding: 20px 0;\" align=\"right\">${\"%.2f\" % line['target']}\n"
" % if line['suffix']:\n"
" ${line['suffix']}\n"
" % endif\n"
" </td>\n"
" <td style=\"padding: 20px 0;\" align=\"right\">${\"%.2f\" % line['current']}\n"
" % if line['suffix']:\n"
" ${line['suffix']}\n"
" % endif\n"
" </td>\n"
" <td style=\"padding: 20px 0;font-size:25px;color:#9A6C8E;\" align=\"right\"><strong>${line['completeness']| int}%</strong></td>\n"
" </tr>\n"
" <tr>\n"
" <td colspan=\"5\" style=\"height:1px;background-color:#e3e3e3;\"></td>\n"
" </tr>\n"
" % endfor \n"
" </tbody>\n"
" </table> \n"
" % else: \n"
" <span style=\"color:#A8A8A8;font-size:13px;\">\n"
" The following message contains the current progress for the challenge <strong>${object.name}</strong>.\n"
" </span> \n"
" % for line in challenge_lines:\n"
" <!-- Header + Button table -->\n"
" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\"style=\"margin-top:35px;\">\n"
" <tr>\n"
" <td width=\"50%\">\n"
" <p style=\"font-size:22px;color:#666666;\">Top Achievers for goal <strong>${line['name']}</strong></p>\n"
" </td>\n"
" </tr>\n"
" </table>\n"
" <!-- Podium -->\n"
" % if len(line['goals'])>2:\n"
" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:10px;\">\n"
" <tr><td style=\"padding:0 30px;\">\n"
" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\">\n"
" <tr>\n"
" % set top_goals = [line['goals'][1], line['goals'][0], line['goals'][2]]\n"
" % for goal in top_goals:\n"
" <td align=\"center\" style=\"width:32%;\">\n"
" % if loop.index == 1:\n"
" % set extra_div = '<div style=\"height:40px;\"></div>'\n"
" % set heightA = 95\n"
" % set heightB = 75\n"
" % set bgColor = '#b898b0'\n"
" % set fontSize = 50\n"
" % set podiumPosition = '2'\n"
" % elif loop.index == 2:\n"
" % set extra_div = ''\n"
" % set heightA = 55\n"
" % set heightB = 115\n"
" % set bgColor = '#9A6C8E'\n"
" % set fontSize = 85\n"
" % set podiumPosition = '1'\n"
" % elif loop.index == 3:\n"
" % set extra_div = '<div style=\"height:60px;\"></div>'\n"
" % set heightA = 115\n"
" % set heightB = 55\n"
" % set bgColor = '#c8afc1'\n"
" % set fontSize = 35\n"
" % set podiumPosition = '3'\n"
" % endif\n"
" <div style=\"margin:0 3px 0 3px;height:220px;\">\n"
" <div style=\"height:${heightA}px;\">\n"
" ${extra_div | safe} \n"
" <div style=\"height:55px;\">\n"
" <img style=\"margin-bottom:5px;width:50px;height:50px;border-radius:50%;\" src=\"/web/image?model=res.users&amp;field=image_small&amp;id=${goal['user_id']}\" alt=\"\"/>\n"
" </div> \n"
" <div align=\"center\" style =\"color:${bgColor};\">\n"
" ${goal['name']}\n"
" </div \n"
" </div>\n"
" <div style=\"background-color:${bgColor | safe};height:${heightB}px;\">\n"
" <strong><span style=\"color:#fff;font-size:${fontSize}px;\">${podiumPosition | safe}</span></strong>\n"
" </div>\n"
" <div style=\"height:30px;\">\n"
" <p style=\"color:#9A6C8E;font-size:20px;margin-top:10px;\">\n"
" ${\"%.2f\" % goal['current']}\n"
" % if line['suffix'] or line['monetary']:\n"
" ${line['full_suffix']}\n"
" % endif\n"
" </p>\n"
" </div>\n"
" </div>\n"
" </td>\n"
" % endfor\n"
" </tr>\n"
" </table>\n"
" </td>\n"
" </tr>\n"
" </table>\n"
" % endif\n"
" <!-- data table -->\n"
" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-bottom:5px\">\n"
" <tr>\n"
" <td>\n"
" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:30px;margin-bottom:5px;color:#666666;\">\n"
" <thead>\n"
" <tr style=\"color:#9A6C8E; font-size:12px;\">\n"
" <th style=\"width:10%;text-align:center;\">Rank</th>\n"
" <th style=\"width:15%;text-align:left;\">Name</th>\n"
" <th style=\"width:30%;text-align:right;\">Performance \n"
" % if line['suffix']:\n"
" (${line['suffix']})\n"
" % elif line['monetary']:\n"
" (${company.currency_id.symbol})\n"
" % endif\n"
" </th>\n"
" <th style=\"width:30%;text-align:right;\"\">Completeness</th>\n"
" </tr>\n"
" <tr>\n"
" <td colspan=\"5\" style=\"height:1px;background-color:#9A6C8E;\"></td>\n"
" </tr>\n"
" </thead>\n"
" <tbody>\n"
" % for goal in line['goals']:\n"
" <tr>\n"
" % set tdBgColor = '#fff'\n"
" % set tdColor = 'gray'\n"
" % set mutedColor = '#AAAAAA'\n"
" % set tdPercentageColor = '#9A6C8E'\n"
" <td width=\"10%\" align=\"center\" valign=\"middle\" style=\"background-color:${tdBgColor};padding :5px 0;font-size:20px;\">${goal['rank']+1}\n"
" </td>\n"
" <td width=\"15%\" align=\"left\" valign=\"middle\" style=\"background-color:${tdBgColor};padding :5px 0;font-size:13px;\">${goal['name']}</td>\n"
" <td width=\"20%\" align=\"right\" style=\"background-color:${tdBgColor};padding:5px 0;line-height:1;\">${\"%.2f\" % goal['current']}<br/><span style=\"font-size:13px;color:${mutedColor};\">on ${\"%.2f\" % line['target']}</span>\n"
" </td>\n"
" <td width=\"20%\" style=\"color:${tdPercentageColor};background-color:${tdBgColor};padding-right:15px;font-size:22px;\" align=\"right\"><strong>${goal['completeness'] | int}%</strong></td>\n"
" </tr>\n"
" <tr>\n"
" <td colspan=\"5\" style=\"height:1px;background-color:#DADADA;\"></td>\n"
" </tr>\n"
" % endfor\n"
" </tbody>\n"
" </table>\n"
" </td>\n"
" </tr>\n"
" </table> \n"
" % endfor\n"
" % endif\n"
" </td></tr>\n"
" </table>\n"
" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"padding: 15px; color: #666666;margin-bottom: 5px;\">\n"
" <tr>\n"
" <td align=\"center\" style=\"min-width: 590px;\">\n"
" <table width=\"580\" border=\"0\" cellpadding=\"0\" style=\"min-width: 580px; font-size: 12px;\">\n"
" <tr>\n"
" <td valign=\"middle\" align=\"left\" style=\"padding-top: 10px; padding-bottom: 10px;\">\n"
" ${company.name}<br/>\n"
" ${company.phone or ''}\n"
" </td>\n"
" <td valign=\"middle\" align=\"right\" style=\"padding-top: 10px; padding-bottom: 10px;\">\n"
" % if company.email:\n"
" <a href=\"mailto:${company.email}\" style=\"text-decoration:none; color: #666666;\">${company.email}</a><br/>\n"
" % endif\n"
" % if company.website:\n"
" <a href=\"${company.website}\" style=\"text-decoration:none; color: #666666;\">\n"
" ${company.website}\n"
" </a>\n"
" % endif\n"
" </td>\n"
" </tr>\n"
" </table>\n"
" </td>\n"
" </tr> \n"
" <tr>\n"
" <td align=\"center\">\n"
" Powered by <a target=\"_blank\" href=\"https://www.odoo.com\">Odoo</a>.\n"
" </td>\n"
" </tr>\n"
" </table>\n"
" </td></tr>\n"
" </table>\n"
" </td>\n"
"</tr>\n"
"</table>\n"
" \n"
"\n"
""
msgstr ""
#. module: gamification
#: model:mail.template,body_html:gamification.email_template_goal_reminder
msgid "\n"
@@ -27,87 +267,13 @@ msgid "\n"
msgstr ""
#. module: gamification
#: model:mail.template,body_html:gamification.simple_report_template
msgid "\n"
"<p>\n"
" <strong>${object.name}</strong>\n"
"</p>\n"
"<p class=\"oe_grey\">The following message contains the current progress for the challenge ${object.name}</p>\n"
"\n"
"% if object.visibility_mode == 'personal':\n"
" <table width=\"100%\" border=\"1\">\n"
" <tr>\n"
" <th>Goal</th>\n"
" <th>Target</th>\n"
" <th>Current</th>\n"
" <th>Completeness</th>\n"
" </tr>\n"
" % for line in ctx[\"challenge_lines\"]:\n"
" <tr\n"
" % if line['completeness'] >= 100:\n"
" style=\"font-weight:bold;\"\n"
" % endif\n"
" >\n"
" <td>${line['name']}</td>\n"
" <td>${line['target']}\n"
" % if line['suffix']:\n"
" ${line['suffix']}\n"
" % endif\n"
" </td>\n"
" <td>${line['current']}\n"
" % if line['suffix']:\n"
" ${line['suffix']}\n"
" % endif\n"
" </td>\n"
" <td>${line['completeness']} %</td>\n"
" </tr>\n"
" % endfor\n"
" </table>\n"
"% else:\n"
" % for line in ctx[\"challenge_lines\"]:\n"
" <table width=\"100%\" border=\"1\">\n"
" <tr>\n"
" <th colspan=\"4\">${line['name']}</th>\n"
" </tr>\n"
" <tr>\n"
" <th>#</th>\n"
" <th>Person</th>\n"
" <th>Completeness</th>\n"
" <th>Current</th>\n"
" </tr>\n"
" % for goal in line['goals']:\n"
" <tr\n"
" % if goal.completeness >= 100:\n"
" style=\"font-weight:bold;\"\n"
" % endif\n"
" >\n"
" <td>${goal['rank']}</td>\n"
" <td>${goal['name']}</td>\n"
" <td>${goal['completeness']}%</td>\n"
" <td>${goal['current']}/${line['target']}\n"
" % if line['suffix']:\n"
" ${line['suffix']}\n"
" % endif\n"
" </td>\n"
" </tr>\n"
" % endfor\n"
" </table>\n"
"\n"
" <br/><br/>\n"
"\n"
" % endfor\n"
"% endif\n"
" "
msgstr ""
#. module: gamification
#: code:addons/gamification/models/challenge.py:586
#: code:addons/gamification/models/challenge.py:587
#, python-format
msgid "%s has joined the challenge"
msgstr ""
#. module: gamification
#: code:addons/gamification/models/challenge.py:595
#: code:addons/gamification/models/challenge.py:596
#, python-format
msgid "%s has refused the challenge"
msgstr ""
@@ -149,25 +315,25 @@ msgid "<?xml version=\"1.0\"?>\n"
msgstr ""
#. module: gamification
#: code:addons/gamification/models/challenge.py:652
#: code:addons/gamification/models/challenge.py:653
#, python-format
msgid "<br/> %(rank)d. %(user_name)s - %(reward_name)s"
msgstr ""
#. module: gamification
#: code:addons/gamification/models/challenge.py:649
#: code:addons/gamification/models/challenge.py:650
#, python-format
msgid "<br/>Nobody has succeeded to reach every goal, no badge is rewarded for this challenge."
msgstr ""
#. module: gamification
#: code:addons/gamification/models/challenge.py:647
#: code:addons/gamification/models/challenge.py:648
#, python-format
msgid "<br/>Reward (badge %s) for every succeeding user was sent to %s."
msgstr ""
#. module: gamification
#: code:addons/gamification/models/challenge.py:657
#: code:addons/gamification/models/challenge.py:658
#, python-format
msgid "<br/>Special rewards were sent to the top competing users. The ranking for this challenge is :"
msgstr ""
@@ -194,7 +360,7 @@ msgstr ""
#. module: gamification
#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_condition
#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition
#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition_3164
#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition_3233
msgid "A goal is considered as completed when the current value is compared to the value to reach"
msgstr ""
@@ -328,7 +494,7 @@ msgid "Can not grant"
msgstr ""
#. module: gamification
#: code:addons/gamification/models/goal.py:409
#: code:addons/gamification/models/goal.py:410
#, python-format
msgid "Can not modify the configuration of a started goal"
msgstr ""
@@ -525,7 +691,7 @@ msgid "Defined how will be computed the goals. The result of the operation will
msgstr ""
#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3173
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3242
msgid "Definition Description"
msgstr ""
@@ -724,7 +890,7 @@ msgstr ""
#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_id
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id_3175
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id_3244
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_name
#: model:ir.ui.view,arch_db:gamification.goal_search_view
msgid "Goal Definition"
@@ -755,7 +921,7 @@ msgstr ""
#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_condition
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition_3164
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition_3233
msgid "Goal Performance"
msgstr ""
@@ -1090,7 +1256,7 @@ msgid "No one, assigned through challenges"
msgstr ""
#. module: gamification
#: code:addons/gamification/models/challenge.py:664
#: code:addons/gamification/models/challenge.py:665
#, python-format
msgid "Nobody reached the required conditions to receive special badges."
msgstr ""
@@ -1256,7 +1422,7 @@ msgid "Responsible"
msgstr ""
#. module: gamification
#: code:addons/gamification/models/challenge.py:489
#: code:addons/gamification/models/challenge.py:490
#, python-format
msgid "Retrieving progress for personal challenge without user information"
msgstr ""
@@ -1421,7 +1587,7 @@ msgstr ""
#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_full_suffix
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3169
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3238
msgid "Suffix"
msgstr ""
@@ -1446,7 +1612,7 @@ msgid "The action that will be called to update the goal value."
msgstr ""
#. module: gamification
#: code:addons/gamification/models/challenge.py:643
#: code:addons/gamification/models/challenge.py:644
#, python-format
msgid "The challenge %s is finished."
msgstr ""
@@ -1454,7 +1620,7 @@ msgstr ""
#. module: gamification
#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_full_suffix
#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_full_suffix
#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_suffix_3169
#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_suffix_3238
msgid "The currency and suffix field"
msgstr ""
@@ -1474,7 +1640,7 @@ msgid "The day a new challenge will be automatically started. If no periodicity
msgstr ""
#. module: gamification
#: code:addons/gamification/models/goal.py:90
#: code:addons/gamification/models/goal.py:91
#, python-format
msgid "The domain for the definition %s seems incorrect, please check it.\n"
"\n"
@@ -1517,7 +1683,7 @@ msgid "The maximum number of time this badge can be sent per month per person."
msgstr ""
#. module: gamification
#: code:addons/gamification/models/goal.py:107
#: code:addons/gamification/models/goal.py:108
#, python-format
msgid "The model configuration for the definition %s seems incorrect, please check it.\n"
"\n"
@@ -1525,7 +1691,7 @@ msgid "The model configuration for the definition %s seems incorrect, please che
msgstr ""
#. module: gamification
#: code:addons/gamification/models/goal.py:104
#: code:addons/gamification/models/goal.py:105
#, python-format
msgid "The model configuration for the definition %s seems incorrect, please check it.\n"
"\n"
@@ -1662,7 +1828,7 @@ msgid "Update"
msgstr ""
#. module: gamification
#: code:addons/gamification/models/goal.py:444
#: code:addons/gamification/models/goal.py:445
#, python-format
msgid "Update %s"
msgstr ""
@@ -1735,7 +1901,7 @@ msgid "You can not grant a badge to yourself"
msgstr ""
#. module: gamification
#: code:addons/gamification/models/challenge.py:195
#: code:addons/gamification/models/challenge.py:196
#, python-format
msgid "You can not reset a challenge with unfinished goals."
msgstr ""
addons/gamification_sale_crm/i18n/gamification_sale_crm.pot
+5 -5
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~14\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-15 09:49+0000\n"
"PO-Revision-Date: 2017-02-15 09:49+0000\n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
#. module: gamification_sale_crm
#: model:gamification.goal.definition,name:gamification_sale_crm.definition_crm_nbr_customer_refunds
msgid "Customer Refunds"
msgid "Customer Credit Notes"
msgstr ""
#. module: gamification_sale_crm
@@ -65,7 +65,7 @@ msgstr ""
#. module: gamification_sale_crm
#: model:gamification.goal.definition,name:gamification_sale_crm.definition_crm_tot_customer_refunds
msgid "Total Customer Refunds"
msgid "Total Customer Credit Notes"
msgstr ""
#. module: gamification_sale_crm
addons/google_spreadsheet/i18n/google_spreadsheet.pot
+11 -3
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~14\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-15 09:49+0000\n"
"PO-Revision-Date: 2017-02-15 09:49+0000\n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -42,13 +42,21 @@ msgstr ""
msgid "Name"
msgstr ""
#. module: google_spreadsheet
#: model:ir.ui.view,arch_db:google_spreadsheet.base_config_settings_view_form_inherit_spreadsheet
msgid "Please use the settings of Google Drive\n"
" on the left or above."
msgstr ""
#. module: google_spreadsheet
#: model:ir.model.fields,help:google_spreadsheet.field_base_config_settings_google_drive_uri_copy
#: model:ir.model.fields,help:google_spreadsheet.field_hr_timesheet_config_settings_google_drive_uri_copy
msgid "The URL to generate the authorization code from Google"
msgstr ""
#. module: google_spreadsheet
#: model:ir.model.fields,field_description:google_spreadsheet.field_base_config_settings_google_drive_uri_copy
#: model:ir.model.fields,field_description:google_spreadsheet.field_hr_timesheet_config_settings_google_drive_uri_copy
msgid "URI"
msgstr ""
addons/hr/i18n/hr.pot
+72 -63
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:45+0000\n"
"PO-Revision-Date: 2017-04-18 14:45+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -79,11 +79,6 @@ msgstr ""
msgid "Citizenship & Other Information"
msgstr ""
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_city
msgid "City"
msgstr ""
#. module: hr
#: model:ir.actions.act_window,help:hr.act_employee_from_department
#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
@@ -132,6 +127,11 @@ msgstr ""
msgid "Company Working Hours"
msgstr ""
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_department_complete_name
msgid "Complete Name"
msgstr ""
#. module: hr
#: model:ir.ui.menu,name:hr.menu_human_resources_configuration
msgid "Configuration"
@@ -220,11 +220,6 @@ msgstr ""
msgid "Email Aliases"
msgstr ""
#. module: hr
#: model:ir.model,name:hr.model_mail_thread
msgid "Email Thread"
msgstr ""
#. module: hr
#: model:ir.model,name:hr.model_hr_employee
#: model:ir.ui.view,arch_db:hr.view_employee_form
@@ -284,22 +279,22 @@ msgid "Employees Tags"
msgstr ""
#. module: hr
#: code:addons/hr/models/hr.py:260
#: model:ir.model.fields,help:hr.field_hr_employee_address_home_id
msgid "Enter here the private address of the employee, not the one linked to your company."
msgstr ""
#. module: hr
#: code:addons/hr/models/hr.py:294
#, python-format
msgid "Error! You cannot create recursive departments."
msgstr ""
#. module: hr
#: code:addons/hr/models/hr.py:164
#: code:addons/hr/models/hr.py:181
#, python-format
msgid "Error! You cannot create recursive hierarchy of Employee(s)."
msgstr ""
#. module: hr
#: model:ir.model.fields,field_description:hr.field_res_users_event_count
msgid "Events"
msgstr ""
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_job_no_of_recruitment
msgid "Expected New Employees"
@@ -351,11 +346,6 @@ msgstr ""
msgid "Hired Employees"
msgstr ""
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_address_home_id
msgid "Home Address"
msgstr ""
#. module: hr
#: model:ir.ui.menu,name:hr.menu_hr_main
msgid "Human Resources"
@@ -405,6 +395,8 @@ msgstr ""
#. module: hr
#: model:ir.model,name:hr.model_hr_job
#: model:ir.model.fields,field_description:hr.field_hr_employee_job_id
#: model:ir.model.fields,field_description:hr.field_hr_job_name
msgid "Job Position"
msgstr ""
@@ -421,12 +413,6 @@ msgid "Job Positions are used to define jobs and their requirements.\n"
" for the future."
msgstr ""
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_job_id
#: model:ir.model.fields,field_description:hr.field_hr_job_name
msgid "Job Title"
msgstr ""
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_department_jobs_ids
#: model:ir.ui.view,arch_db:hr.view_job_filter
@@ -460,11 +446,6 @@ msgstr ""
msgid "Last Updated on"
msgstr ""
#. module: hr
#: model:ir.model.fields,field_description:hr.field_res_users_calendar_last_notif_ack
msgid "Last notification marked as read from base Calendar"
msgstr ""
#. module: hr
#: model:ir.ui.view,arch_db:hr.view_hr_job_form
msgid "Launch Recruitment"
@@ -490,7 +471,7 @@ msgstr ""
#. module: hr
#: selection:hr.employee,marital:0
msgid "Married"
msgid "Married (or similar)"
msgstr ""
#. module: hr
@@ -513,11 +494,6 @@ msgstr ""
msgid "Messages"
msgstr ""
#. module: hr
#: model:ir.ui.view,arch_db:hr.hr_department_view_kanban
msgid "More <i class=\"fa fa-caret-down\"/>"
msgstr ""
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_name
msgid "Name"
@@ -548,11 +524,6 @@ msgstr ""
msgid "Number of employees currently occupying this job position."
msgstr ""
#. module: hr
#: model:ir.model.fields,help:hr.field_res_users_event_count
msgid "Number of events the partner has participated."
msgstr ""
#. module: hr
#: model:ir.model.fields,help:hr.field_hr_job_no_of_hired_employee
msgid "Number of hired employees for this job position during recruitment phase."
@@ -595,11 +566,6 @@ msgstr ""
msgid "Passport No"
msgstr ""
#. module: hr
#: model:ir.ui.view,arch_db:hr.view_employee_form
msgid "Personal Information"
msgstr ""
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_image
msgid "Photo"
@@ -610,14 +576,24 @@ msgstr ""
msgid "Position"
msgstr ""
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_address_home_id
msgid "Private Address"
msgstr ""
#. module: hr
#: model:ir.ui.view,arch_db:hr.view_employee_form
msgid "Private Information"
msgstr ""
#. module: hr
#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form
msgid "Prout prout prout"
msgstr ""
#. module: hr
#: model:ir.ui.view,arch_db:hr.view_employee_form
msgid "Public Information"
#: model:ir.ui.view,arch_db:hr.view_hr_job_form
msgid "Recruitment"
msgstr ""
#. module: hr
@@ -681,6 +657,21 @@ msgstr ""
msgid "Settings"
msgstr ""
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_config_settings_module_hr_org_chart
msgid "Show Organizational Chart"
msgstr ""
#. module: hr
#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form
msgid "Show organizational chart on employee form"
msgstr ""
#. module: hr
#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form
msgid "Show organizational chart on employee form."
msgstr ""
#. module: hr
#: selection:hr.employee,marital:0
msgid "Single"
@@ -771,6 +762,16 @@ msgstr ""
msgid "Users"
msgstr ""
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_visa_expire
msgid "Visa Expire Date"
msgstr ""
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_visa_no
msgid "Visa No"
msgstr ""
#. module: hr
#: selection:hr.employee,marital:0
msgid "Widower"
@@ -794,6 +795,11 @@ msgstr ""
msgid "Work Email"
msgstr ""
#. module: hr
#: model:ir.ui.view,arch_db:hr.view_employee_form
msgid "Work Information"
msgstr ""
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_work_location
msgid "Work Location"
@@ -809,6 +815,16 @@ msgstr ""
msgid "Work Organization"
msgstr ""
#. module: hr
#: model:ir.ui.view,arch_db:hr.view_employee_form
msgid "Work Permit"
msgstr ""
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_permit_no
msgid "Work Permit No"
msgstr ""
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_work_phone
msgid "Work Phone"
@@ -831,12 +847,6 @@ msgstr ""
msgid "Your document has not been created because your email address is not recognized. Please send emails with the email address recorded on your employee information, or contact your HR manager."
msgstr ""
#. module: hr
#: code:addons/hr/models/mail_thread.py:41
#, python-format
msgid "alias %s does not accept unknown employees"
msgstr ""
#. module: hr
#: model:ir.ui.view,arch_db:hr.view_department_form
msgid "department"
@@ -858,9 +868,8 @@ msgid "hr.config.settings"
msgstr ""
#. module: hr
#: code:addons/hr/models/mail_thread.py:41
#, python-format
msgid "skipping"
#: model:ir.model,name:hr.model_mail_alias_mixin
msgid "mail.alias.mixin"
msgstr ""
#. module: hr
addons/hr_attendance/models/hr_attendance.py
+1 -1
View File
@@ -91,7 +91,7 @@ class HrAttendance(models.Model):
# is the same as the one before our check_in time computed before, otherwise it overlaps
last_attendance_before_check_out = self.env['hr.attendance'].search([
('employee_id', '=', attendance.employee_id.id),
('check_in', '<=', attendance.check_out),
('check_in', '<', attendance.check_out),
('id', '!=', attendance.id),
], order='check_in desc', limit=1)
if last_attendance_before_check_out and last_attendance_before_check_in != last_attendance_before_check_out:
addons/hr_contract/i18n/hr_contract.pot
+87 -37
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~14\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-15 09:49+0000\n"
"PO-Revision-Date: 2017-02-15 09:49+0000\n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,16 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: hr_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
msgid "<span class=\"text-muted\">(If fixed-term contract)</span>"
msgstr ""
#. module: hr_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
msgid "<span>/ month</span>"
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_advantages
msgid "Advantages"
@@ -26,8 +36,8 @@ msgid "Advantages..."
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,help:hr_contract.field_hr_contract_wage
msgid "Basic Salary of the employee"
#: selection:hr.contract,state:0
msgid "Cancelled"
msgstr ""
#. module: hr_contract
@@ -35,6 +45,11 @@ msgstr ""
msgid "Click here to create new contracts."
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_company_id
msgid "Company"
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_employee_vehicle
msgid "Company Vehicle"
@@ -46,9 +61,14 @@ msgstr ""
msgid "Contract Reference"
msgstr ""
#. module: hr_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
msgid "Contract Terms"
msgstr ""
#. module: hr_contract
#: model:ir.model,name:hr_contract.model_hr_contract_type
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_type_id_6101
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_type_id_6256
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_type_name
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_type_view_form
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_type_view_search
@@ -75,7 +95,7 @@ msgid "Contract expired"
msgstr ""
#. module: hr_contract
#: code:addons/hr_contract/models/hr_contract.py:87
#: code:addons/hr_contract/models/hr_contract.py:100
#, python-format
msgid "Contract start date must be less than contract end date."
msgstr ""
@@ -109,6 +129,11 @@ msgstr ""
msgid "Created on"
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_currency_id
msgid "Currency"
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_employee_contract_id
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
@@ -121,6 +146,11 @@ msgstr ""
msgid "Current Employee"
msgstr ""
#. module: hr_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_kanban
msgid "Delete"
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_department_id
msgid "Department"
@@ -133,8 +163,8 @@ msgid "Display Name"
msgstr ""
#. module: hr_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
msgid "Duration"
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_kanban
msgid "Edit Contract"
msgstr ""
#. module: hr_contract
@@ -149,11 +179,36 @@ msgstr ""
msgid "Employee Contract"
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,help:hr_contract.field_hr_contract_wage
msgid "Employee's monthly gross wage."
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,help:hr_contract.field_hr_contract_resource_calendar_id
msgid "Employee's working schedule."
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_date_end
msgid "End Date"
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,help:hr_contract.field_hr_contract_date_end
msgid "End date of the contract (if it's a fixed-term contract)."
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,help:hr_contract.field_hr_contract_trial_date_end
msgid "End date of the trial period (if there is one)."
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_trial_date_end
msgid "End of Trial Period"
msgstr ""
#. module: hr_contract
#: selection:hr.contract,state:0
#: model:mail.message.subtype,name:hr_contract.mt_contract_close
@@ -205,11 +260,6 @@ msgstr ""
msgid "In kilometers"
msgstr ""
#. module: hr_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
msgid "Information"
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_employee_manager
msgid "Is a Manager"
@@ -222,7 +272,7 @@ msgstr ""
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_job_id
msgid "Job Title"
msgid "Job Position"
msgstr ""
#. module: hr_contract
@@ -258,6 +308,11 @@ msgstr ""
msgid "Medical Examination Date"
msgstr ""
#. module: hr_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
msgid "Monthly Advantages in Cash"
msgstr ""
#. module: hr_contract
#: selection:hr.contract,state:0
msgid "New"
@@ -274,6 +329,11 @@ msgstr ""
msgid "Number of Children"
msgstr ""
#. module: hr_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
msgid "Other Information"
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_employee_place_of_birth
msgid "Place of Birth"
@@ -286,7 +346,7 @@ msgstr ""
#. module: hr_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
msgid "Salary and Advantages"
msgid "Salary Information"
msgstr ""
#. module: hr_contract
@@ -310,6 +370,16 @@ msgstr ""
msgid "Start Date"
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,help:hr_contract.field_hr_contract_date_start
msgid "Start date of the contract."
msgstr ""
#. module: hr_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_search
msgid "State"
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_state
msgid "Status"
@@ -327,21 +397,6 @@ msgstr ""
msgid "To Renew"
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_trial_date_end
msgid "Trial End Date"
msgstr ""
#. module: hr_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
msgid "Trial Period Duration"
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_trial_date_start
msgid "Trial Start Date"
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_visa_expire
msgid "Visa Expire Date"
@@ -357,18 +412,13 @@ msgstr ""
msgid "Wage"
msgstr ""
#. module: hr_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
msgid "Work Permit"
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_permit_no
msgid "Work Permit No"
msgstr ""
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_working_hours
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_resource_calendar_id
msgid "Working Schedule"
msgstr ""
addons/hr_expense/i18n/hr_expense.pot
+38 -19
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:46+0000\n"
"PO-Revision-Date: 2017-04-18 14:46+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -251,6 +251,11 @@ msgstr ""
msgid "All Expenses"
msgstr ""
#. module: hr_expense
#: model:ir.model.fields,help:hr_expense.field_hr_expense_account_id
msgid "An expense account is expected"
msgstr ""
#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_analytic_account_id
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
@@ -309,6 +314,7 @@ msgid "Business trip"
msgstr ""
#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_product_product_can_be_expensed
#: model:ir.model.fields,field_description:hr_expense.field_product_template_can_be_expensed
msgid "Can be Expensed"
msgstr ""
@@ -342,7 +348,7 @@ msgid "Click here to create new expenses."
msgstr ""
#. module: hr_expense
#: code:addons/hr_expense/models/hr_expense.py:318
#: code:addons/hr_expense/models/hr_expense.py:319
#, python-format
msgid "Click to add a new expense,"
msgstr ""
@@ -711,19 +717,19 @@ msgid "Expenses follow this flow:"
msgstr ""
#. module: hr_expense
#: code:addons/hr_expense/models/hr_expense.py:413
#: code:addons/hr_expense/models/hr_expense.py:414
#, python-format
msgid "Expenses must belong to the same Employee."
msgstr ""
#. module: hr_expense
#: code:addons/hr_expense/models/hr_expense.py:525
#: code:addons/hr_expense/models/hr_expense.py:538
#, python-format
msgid "Expenses must have an expense journal specified to generate accounting entries."
msgstr ""
#. module: hr_expense
#: code:addons/hr_expense/models/hr_expense.py:417
#: code:addons/hr_expense/models/hr_expense.py:418
#, python-format
msgid "Expenses must have been paid by the same entity (Company or employee)"
msgstr ""
@@ -827,7 +833,7 @@ msgstr ""
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_id
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_id
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_id
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_id_9374
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_id_9585
msgid "ID"
msgstr ""
@@ -960,19 +966,19 @@ msgid "New Mail"
msgstr ""
#. module: hr_expense
#: code:addons/hr_expense/models/hr_expense.py:258
#: code:addons/hr_expense/models/hr_expense.py:259
#, python-format
msgid "No Expense account found for the product %s (or for its category), please configure one."
msgstr ""
#. module: hr_expense
#: code:addons/hr_expense/models/hr_expense.py:224
#: code:addons/hr_expense/models/hr_expense.py:225
#, python-format
msgid "No Home Address found for the employee %s, please configure one."
msgstr ""
#. module: hr_expense
#: code:addons/hr_expense/models/hr_expense.py:203
#: code:addons/hr_expense/models/hr_expense.py:204
#, python-format
msgid "No credit account found for the %s journal, please configure one."
msgstr ""
@@ -1091,7 +1097,7 @@ msgid "Planner"
msgstr ""
#. module: hr_expense
#: code:addons/hr_expense/models/hr_expense.py:263
#: code:addons/hr_expense/models/hr_expense.py:264
#, python-format
msgid "Please configure Default Expense account for Product expense: `property_account_expense_categ_id`."
msgstr ""
@@ -1300,7 +1306,7 @@ msgid "See how to manage payables"
msgstr ""
#. module: hr_expense
#: code:addons/hr_expense/models/hr_expense.py:88
#: code:addons/hr_expense/models/hr_expense.py:89
#, python-format
msgid "Selected Unit of Measure does not belong to the same category as the product Unit of Measure"
msgstr ""
@@ -1356,6 +1362,7 @@ msgid "Setup your domain alias"
msgstr ""
#. module: hr_expense
#: model:ir.model.fields,help:hr_expense.field_product_product_can_be_expensed
#: model:ir.model.fields,help:hr_expense.field_product_template_can_be_expensed
msgid "Specify whether the product can be selected in an HR expense."
msgstr ""
@@ -1442,6 +1449,12 @@ msgstr ""
msgid "The next step is to settle an internal policy to"
msgstr ""
#. module: hr_expense
#: code:addons/hr_expense/wizard/hr_expense_register_payment.py:35
#, python-format
msgid "The payment amount must be strictly positive."
msgstr ""
#. module: hr_expense
#: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet_bank_journal_id
msgid "The payment method used when the expense is paid by the company."
@@ -1588,7 +1601,7 @@ msgid "When you charge"
msgstr ""
#. module: hr_expense
#: code:addons/hr_expense/models/hr_expense.py:522
#: code:addons/hr_expense/models/hr_expense.py:535
#, python-format
msgid "You can only generate accounting entry for approved expense(s)."
msgstr ""
@@ -1599,19 +1612,25 @@ msgid "You can setup a generic email alias to create incoming expenses easily. W
msgstr ""
#. module: hr_expense
#: code:addons/hr_expense/models/hr_expense.py:439
#: code:addons/hr_expense/models/hr_expense.py:573
#, python-format
msgid "You cannot add expense lines of another employee."
msgstr ""
#. module: hr_expense
#: code:addons/hr_expense/models/hr_expense.py:445
#, python-format
msgid "You cannot delete a posted expense."
msgstr ""
#. module: hr_expense
#: code:addons/hr_expense/models/hr_expense.py:106
#: code:addons/hr_expense/models/hr_expense.py:107
#, python-format
msgid "You cannot report expenses for different employees in the same report!"
msgstr ""
#. module: hr_expense
#: code:addons/hr_expense/models/hr_expense.py:104
#: code:addons/hr_expense/models/hr_expense.py:105
#, python-format
msgid "You cannot report twice the same line!"
msgstr ""
@@ -1628,7 +1647,7 @@ msgid "You record expenses,"
msgstr ""
#. module: hr_expense
#: code:addons/hr_expense/models/hr_expense.py:504
#: code:addons/hr_expense/models/hr_expense.py:517
#, python-format
msgid "Your Expense %s has been refused.<br/><ul class=o_timeline_tracking_value_list><li>Reason<span> : </span><span class=o_timeline_tracking_value>%s</span></li></ul>"
msgstr ""
@@ -1679,7 +1698,7 @@ msgid "hr.expense.config.settings"
msgstr ""
#. module: hr_expense
#: code:addons/hr_expense/models/hr_expense.py:319
#: code:addons/hr_expense/models/hr_expense.py:320
#, python-format
msgid "or send receipts by email to %s."
msgstr ""
addons/hr_expense/views/hr_expense_views.xml
+2 -2
View File
@@ -299,7 +299,7 @@
</group>
<group string="Accounting">
<field name="property_account_expense_id"/>
<field name="supplier_taxes_id" widget="many2many_tags" options="{'color_field': 'color'}"/>
<field name="supplier_taxes_id" widget="many2many_tags"/>
</group>
</group>
</sheet>
@@ -453,7 +453,7 @@
<field name="message_unread" invisible="1"/>
<field name="attachment_number" string=" "/>
<button name="action_get_attachment_view" string="View Attachments" type="object" icon="fa-paperclip"/>
<field name="tax_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
<field name="tax_ids" widget="many2many_tags"/>
<field name="total_amount" sum="Total Amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
</tree>
</field>
addons/hr_expense_check/i18n/hr_expense_check.pot
+57
View File
@@ -0,0 +1,57 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * hr_expense_check
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: hr_expense_check
#: model:ir.model.fields,field_description:hr_expense_check.field_hr_expense_register_payment_wizard_check_amount_in_words
msgid "Amount in Words"
msgstr ""
#. module: hr_expense_check
#: model:ir.model.fields,field_description:hr_expense_check.field_hr_expense_register_payment_wizard_check_number
msgid "Check Number"
msgstr ""
#. module: hr_expense_check
#: model:ir.model.fields,help:hr_expense_check.field_hr_expense_register_payment_wizard_check_manual_sequencing
msgid "Check this option if your pre-printed checks are not numbered."
msgstr ""
#. module: hr_expense_check
#: model:ir.model.fields,field_description:hr_expense_check.field_hr_expense_register_payment_wizard_payment_method_code_2
msgid "Code"
msgstr ""
#. module: hr_expense_check
#: model:ir.model,name:hr_expense_check.model_hr_expense_register_payment_wizard
msgid "Hr Expense Register Payment wizard"
msgstr ""
#. module: hr_expense_check
#: model:ir.model.fields,field_description:hr_expense_check.field_hr_expense_register_payment_wizard_check_manual_sequencing
msgid "Manual Numbering"
msgstr ""
#. module: hr_expense_check
#: model:ir.model.fields,help:hr_expense_check.field_hr_expense_register_payment_wizard_check_number
msgid "Number of the check corresponding to this payment. If your pre-printed check are not already numbered, you can manage the numbering in the journal configuration page."
msgstr ""
#. module: hr_expense_check
#: model:ir.model.fields,help:hr_expense_check.field_hr_expense_register_payment_wizard_payment_method_code_2
msgid "Technical field used to adapt the interface to the payment type selected."
msgstr ""
addons/hr_holidays/i18n/hr_holidays.pot
+53 -29
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:45+0000\n"
"PO-Revision-Date: 2017-04-18 14:45+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,13 +41,19 @@ msgid "!important; font-size: 8px; min-width: 18px\"&gt;"
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:125
#: code:addons/hr_holidays/models/hr_holidays.py:123
#, python-format
msgid "%g remaining out of %g"
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:334
#: code:addons/hr_holidays/models/hr_holidays.py:333
#, python-format
msgid "%s : %.2f day(s)"
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:335
#, python-format
msgid "%s on %s : %.2f day(s)"
msgstr ""
@@ -186,7 +192,7 @@ msgid "Allocation for %s"
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:336
#: code:addons/hr_holidays/models/hr_holidays.py:337
#, python-format
msgid "Allocation of %s : %.2f day(s) To %s"
msgstr ""
@@ -223,7 +229,7 @@ msgid "Appraisal Analysis"
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:554
#: code:addons/hr_holidays/models/hr_holidays.py:568
#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_new
#, python-format
msgid "Approve"
@@ -439,6 +445,7 @@ msgstr ""
#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_name
#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_status_form
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
msgid "Description"
msgstr ""
@@ -493,10 +500,16 @@ msgid "Filters only on allocations and requests that belong to an holiday type t
msgstr ""
#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_manager_id
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_first_approver_id
msgid "First Approval"
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/report/holidays_summary_report.py:107
#, python-format
msgid "Form content is missing, this report cannot be printed."
msgstr ""
#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_summary_dept_date_from
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_summary_employee_date_from
@@ -651,31 +664,31 @@ msgid "Leave Types"
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:434
#: code:addons/hr_holidays/models/hr_holidays.py:435
#, python-format
msgid "Leave request must be confirmed (\"To Approve\") in order to approve it."
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:449
#: code:addons/hr_holidays/models/hr_holidays.py:467
#, python-format
msgid "Leave request must be confirmed in order to approve it."
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:508
#: code:addons/hr_holidays/models/hr_holidays.py:528
#, python-format
msgid "Leave request must be confirmed or validated in order to refuse it."
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:421
#: code:addons/hr_holidays/models/hr_holidays.py:422
#, python-format
msgid "Leave request must be in Draft state (\"To Submit\") in order to confirm it."
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:406
#: code:addons/hr_holidays/models/hr_holidays.py:407
#, python-format
msgid "Leave request state must be \"Refused\" or \"To Approve\" in order to reset to Draft."
msgstr ""
@@ -841,6 +854,7 @@ msgid "Magenta"
msgstr ""
#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_manager_id
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
#: model:res.groups,name:hr_holidays.group_hr_holidays_manager
msgid "Manager"
@@ -944,30 +958,35 @@ msgid "Once you have recorded your leave request, it will be sent\n"
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:451
#: code:addons/hr_holidays/models/hr_holidays.py:469
#, python-format
msgid "Only an HR Manager can apply the second approval on leave requests."
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:404
#: code:addons/hr_holidays/models/hr_holidays.py:405
#, python-format
msgid "Only an HR Manager or the concerned employee can reset to draft."
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:429
#: code:addons/hr_holidays/models/hr_holidays.py:444
#: code:addons/hr_holidays/models/hr_holidays.py:430
#: code:addons/hr_holidays/models/hr_holidays.py:462
#, python-format
msgid "Only an HR Officer or Manager can approve leave requests."
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:503
#: code:addons/hr_holidays/models/hr_holidays.py:523
#, python-format
msgid "Only an HR Officer or Manager can refuse leave requests."
msgstr ""
#. module: hr_holidays
#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_status_form
msgid "Options"
msgstr ""
#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_parent_id
msgid "Parent"
@@ -990,7 +1009,7 @@ msgid "Red"
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:557
#: code:addons/hr_holidays/models/hr_holidays.py:571
#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_new
#, python-format
msgid "Refuse"
@@ -1091,18 +1110,18 @@ msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,state:0
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_manager_id2
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_second_approver_id
msgid "Second Approval"
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:570
#: code:addons/hr_holidays/models/hr_holidays.py:584
#, python-format
msgid "See Allocation"
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:570
#: code:addons/hr_holidays/models/hr_holidays.py:584
#, python-format
msgid "See Leave"
msgstr ""
@@ -1155,7 +1174,7 @@ msgid "The number of days must be greater than 0."
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:261
#: code:addons/hr_holidays/models/hr_holidays.py:259
#, python-format
msgid "The number of remaining leaves is not sufficient for this leave type.\n"
"Please verify also the leaves waiting for validation."
@@ -1175,12 +1194,12 @@ msgid "The status is set to 'To Submit', when a holiday request is created.\n"
msgstr ""
#. module: hr_holidays
#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_manager_id
#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_first_approver_id
msgid "This area is automatically filled by the user who validate the leave"
msgstr ""
#. module: hr_holidays
#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_manager_id2
#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_second_approver_id
msgid "This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)"
msgstr ""
@@ -1266,6 +1285,11 @@ msgstr ""
msgid "Validate"
msgstr ""
#. module: hr_holidays
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
msgid "Validator"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Violet"
@@ -1309,13 +1333,13 @@ msgid "You can assign remaining Legal Leaves for each employee, Odoo\n"
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:251
#: code:addons/hr_holidays/models/hr_holidays.py:249
#, python-format
msgid "You can not have 2 leaves that overlaps on same day!"
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:374
#: code:addons/hr_holidays/models/hr_holidays.py:375
#, python-format
msgid "You cannot delete a leave which is in %s state."
msgstr ""
@@ -1327,8 +1351,8 @@ msgid "You cannot reduce validated allocation requests"
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_holidays.py:355
#: code:addons/hr_holidays/models/hr_holidays.py:366
#: code:addons/hr_holidays/models/hr_holidays.py:356
#: code:addons/hr_holidays/models/hr_holidays.py:367
#, python-format
msgid "You cannot set a leave request as '%s'. Contact a human resource manager."
msgstr ""
addons/hr_holidays/report/holidays_summary_report.py
+1 -1
View File
@@ -5,7 +5,7 @@ import calendar
from datetime import timedelta
from dateutil.relativedelta import relativedelta
from odoo import api, fields, models
from odoo import api, fields, models, _
from odoo.exceptions import UserError
addons/hr_org_chart/i18n/hr_org_chart.pot
+95
View File
@@ -0,0 +1,95 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * hr_org_chart
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: hr_org_chart
#. openerp-web
#: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:136
#, python-format
msgid "Direct Subordinates of %s"
msgstr ""
#. module: hr_org_chart
#. openerp-web
#: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:126
#, python-format
msgid "Direct subordinates"
msgstr ""
#. module: hr_org_chart
#: model:ir.model,name:hr_org_chart.model_hr_employee
msgid "Employee"
msgstr ""
#. module: hr_org_chart
#. openerp-web
#: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:89
#, python-format
msgid "In order to get an organigram, set a manager and save the record."
msgstr ""
#. module: hr_org_chart
#. openerp-web
#: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:146
#, python-format
msgid "Indirect Subordinates of %s"
msgstr ""
#. module: hr_org_chart
#: model:ir.model.fields,field_description:hr_org_chart.field_hr_employee_child_all_count
msgid "Indirect Surbordinates Count"
msgstr ""
#. module: hr_org_chart
#. openerp-web
#: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:136
#, python-format
msgid "Indirect subordinates"
msgstr ""
#. module: hr_org_chart
#. openerp-web
#: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:87
#, python-format
msgid "No hierarchy position."
msgstr ""
#. module: hr_org_chart
#: model:ir.ui.view,arch_db:hr_org_chart.hr_employee_view_form_inherit_org_chart
msgid "Organization Chart"
msgstr ""
#. module: hr_org_chart
#. openerp-web
#: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:139
#, python-format
msgid "Subordinates of %s"
msgstr ""
#. module: hr_org_chart
#. openerp-web
#: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:88
#, python-format
msgid "This employee has no manager or subordinate."
msgstr ""
#. module: hr_org_chart
#. openerp-web
#: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:144
#, python-format
msgid "Total"
msgstr ""
addons/hr_payroll/i18n/hr_payroll.pot
+82 -21
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:45+0000\n"
"PO-Revision-Date: 2017-04-18 14:45+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: hr_payroll
#: code:addons/hr_payroll/models/hr_payroll.py:49
#: code:addons/hr_payroll/models/hr_salary_rule.py:41
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -115,8 +115,8 @@ msgstr ""
#. module: hr_payroll
#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
msgid "A contribution register is a third party involved in the salary\n"
" payment of the employees. It can be the social security, the\n"
" estate or anyone that collect or inject money on payslips."
" payment of the employees. It can be the social security, the\n"
" estate or anyone that collect or inject money on payslips."
msgstr ""
#. module: hr_payroll
@@ -146,6 +146,11 @@ msgstr ""
msgid "Add an internal note..."
msgstr ""
#. module: hr_payroll
#: model:ir.ui.view,arch_db:hr_payroll.hr_contract_advantage_template_view_form
msgid "Advantage Name"
msgstr ""
#. module: hr_payroll
#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
msgid "All Children Rules"
@@ -227,14 +232,14 @@ msgid "Cancel Payslip"
msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/models/hr_payroll.py:241
#: code:addons/hr_payroll/models/hr_payslip.py:99
#, python-format
msgid "Cannot cancel a payslip that is done."
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_line_category_id
#: model:ir.model.fields,field_description:hr_payroll.field_hr_salary_rule_category_id_7569
#: model:ir.model.fields,field_description:hr_payroll.field_hr_salary_rule_category_id_7559
#: model:ir.ui.view,arch_db:hr_payroll.view_hr_rule_filter
msgid "Category"
msgstr ""
@@ -278,6 +283,7 @@ msgid "Close"
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_code
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_input_code
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_line_code
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_worked_days_code
@@ -355,6 +361,12 @@ msgstr ""
msgid "Contract"
msgstr ""
#. module: hr_payroll
#: model:ir.actions.act_window,name:hr_payroll.hr_contract_advantage_template_action
#: model:ir.ui.menu,name:hr_payroll.hr_contract_advantage_template_menu_action
msgid "Contract Advantage Templates"
msgstr ""
#. module: hr_payroll
#: model:ir.ui.view,arch_db:hr_payroll.hr_contribution_register_form
msgid "Contribution"
@@ -382,6 +394,7 @@ msgid "Contribution Registers"
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_create_uid
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_create_uid
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_create_uid
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_create_uid
@@ -399,6 +412,7 @@ msgid "Created by"
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_create_date
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_create_date
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_create_date
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_create_date
@@ -435,6 +449,16 @@ msgstr ""
msgid "Date To"
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_default_value
msgid "Default value for this advantage"
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,help:hr_payroll.field_hr_contract_schedule_pay
msgid "Defines the frequency of the wage payment."
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,help:hr_payroll.field_hr_payslip_struct_id
msgid "Defines the rules that have to be applied to this payslip, accordingly to the contract chosen. If you let empty the field contract, this field isn't mandatory anymore and thus the rules applied will be all the rules set on the structure of all contracts of the employee valid for the chosen period"
@@ -466,6 +490,7 @@ msgid "Details by Salary Rule Category"
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_display_name
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_display_name
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_display_name
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_display_name
@@ -544,6 +569,11 @@ msgstr ""
msgid "Employee Payslips"
msgstr ""
#. module: hr_payroll
#: model:ir.model,name:hr_payroll.model_hr_contract_advantage_template
msgid "Employee's Advantage on Contract"
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_employees_employee_ids
#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payslip_by_employees
@@ -553,7 +583,7 @@ msgid "Employees"
msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/models/hr_payroll.py:44
#: code:addons/hr_payroll/models/hr_salary_rule.py:36
#, python-format
msgid "Error ! You cannot create a recursive Salary Structure."
msgstr ""
@@ -578,6 +608,12 @@ msgstr ""
msgid "For example, enter 50.0 to apply a percentage of 50%"
msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/report/report_contribution_register.py:34
#, python-format
msgid "Form content is missing, this report cannot be printed."
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_module_l10n_fr_hr_payroll
msgid "French Payroll"
@@ -612,6 +648,7 @@ msgid "Group By"
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_id
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_id
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_id
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_id
@@ -680,6 +717,7 @@ msgid "It is used in computation. For e.g. A rule for sales having 1% commission
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template___last_update
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register___last_update
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings___last_update
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure___last_update
@@ -699,6 +737,7 @@ msgid "Last Modified on"
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_write_uid
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_write_uid
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_write_uid
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_write_uid
@@ -716,6 +755,7 @@ msgid "Last Updated by"
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_write_date
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_write_date
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_write_date
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_write_date
@@ -737,6 +777,16 @@ msgstr ""
msgid "Linking a salary category to its parent is used only for the reporting purpose."
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_lower_bound
msgid "Lower Bound"
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,help:hr_payroll.field_hr_contract_advantage_template_lower_bound
msgid "Lower bound authorized by the employer for this advantage"
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_paid
msgid "Made Payment Order ? "
@@ -770,6 +820,7 @@ msgid "Monthly"
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_name
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_name
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_name
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_line_name
@@ -783,7 +834,7 @@ msgid "Name"
msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/models/hr_payroll.py:340
#: code:addons/hr_payroll/models/hr_payslip.py:198
#, python-format
msgid "Normal Working Days paid at 100%"
msgstr ""
@@ -914,7 +965,7 @@ msgid "Payslip"
msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/models/hr_payroll.py:227
#: code:addons/hr_payroll/models/hr_payslip.py:85
#, python-format
msgid "Payslip 'Date From' must be before 'Date To'."
msgstr ""
@@ -1109,7 +1160,7 @@ msgid "Refund"
msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/models/hr_payroll.py:247
#: code:addons/hr_payroll/models/hr_payslip.py:105
#, python-format
msgid "Refund: "
msgstr ""
@@ -1180,8 +1231,8 @@ msgid "Salary Rules"
msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/models/hr_payroll.py:542
#: code:addons/hr_payroll/models/hr_payroll.py:590
#: code:addons/hr_payroll/models/hr_payslip.py:396
#: code:addons/hr_payroll/models/hr_payslip.py:445
#, python-format
msgid "Salary Slip of %s for %s"
msgstr ""
@@ -1348,6 +1399,16 @@ msgstr ""
msgid "Track time spent by employees"
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_upper_bound
msgid "Upper Bound"
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,help:hr_payroll.field_hr_contract_advantage_template_upper_bound
msgid "Upper bound authorized by the employer for this advantage"
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,help:hr_payroll.field_hr_payslip_line_sequence
#: model:ir.model.fields,help:hr_payroll.field_hr_salary_rule_sequence
@@ -1386,37 +1447,37 @@ msgid "Worked Days & Inputs"
msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/models/hr_payroll.py:765
#: code:addons/hr_payroll/models/hr_salary_rule.py:198
#, python-format
msgid "Wrong percentage base or quantity defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/models/hr_payroll.py:771
#: code:addons/hr_payroll/models/hr_salary_rule.py:204
#, python-format
msgid "Wrong python code defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/models/hr_payroll.py:794
#: code:addons/hr_payroll/models/hr_salary_rule.py:227
#, python-format
msgid "Wrong python condition defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/models/hr_payroll.py:758
#: code:addons/hr_payroll/models/hr_salary_rule.py:191
#, python-format
msgid "Wrong quantity defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/models/hr_payroll.py:788
#: code:addons/hr_payroll/models/hr_salary_rule.py:221
#, python-format
msgid "Wrong range condition defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/models/hr_payroll.py:271
#: code:addons/hr_payroll/models/hr_payslip.py:129
#, python-format
msgid "You cannot delete a payslip which is not draft or cancelled!"
msgstr ""
@@ -1428,7 +1489,7 @@ msgid "You must select employee(s) to generate payslip(s)."
msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/models/hr_payroll.py:833
#: code:addons/hr_payroll/models/hr_payslip.py:516
#, python-format
msgid "You must set a contract to create a payslip line."
msgstr ""
addons/hr_payroll/report/report_contribution_register.py
+1 -1
View File
@@ -5,7 +5,7 @@
from datetime import datetime
from dateutil.relativedelta import relativedelta
from odoo import api, fields, models
from odoo import api, fields, models, _
from odoo.exceptions import UserError
addons/hr_recruitment/i18n/hr_recruitment.pot
+28 -23
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~14\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-15 09:49+0000\n"
"PO-Revision-Date: 2017-02-15 09:49+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -385,14 +385,14 @@ msgid "Configure Recruitment"
msgstr ""
#. module: hr_recruitment
#: code:addons/hr_recruitment/models/hr_recruitment.py:350
#: code:addons/hr_recruitment/models/hr_recruitment.py:349
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_partner_id
#, python-format
msgid "Contact"
msgstr ""
#. module: hr_recruitment
#: code:addons/hr_recruitment/models/hr_recruitment.py:352
#: code:addons/hr_recruitment/models/hr_recruitment.py:351
#, python-format
msgid "Contact Email"
msgstr ""
@@ -599,6 +599,11 @@ msgstr ""
msgid "Email Alias"
msgstr ""
#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_survey
msgid "Email alias"
msgstr ""
#. module: hr_recruitment
#: model:ir.model.fields,help:hr_recruitment.field_hr_job_alias_id
msgid "Email alias for this job position. New emails will automatically create new applicants for this job position."
@@ -705,6 +710,11 @@ msgstr ""
msgid "HR Department"
msgstr ""
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_job_hr_responsible_id
msgid "HR Responsible"
msgstr ""
#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban
msgid "Hired Employees"
@@ -891,16 +901,6 @@ msgstr ""
msgid "Mobile"
msgstr ""
#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.hr_kanban_view_applicant
msgid "Mobile:"
msgstr ""
#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban
msgid "More <i class=\"fa fa-caret-down\"/>"
msgstr ""
#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
msgid "My Activities"
@@ -948,7 +948,7 @@ msgid "New Applications"
msgstr ""
#. module: hr_recruitment
#: code:addons/hr_recruitment/models/hr_recruitment.py:400
#: code:addons/hr_recruitment/models/hr_recruitment.py:412
#, python-format
msgid "New Employee %s Hired"
msgstr ""
@@ -980,7 +980,7 @@ msgid "Next Activities"
msgstr ""
#. module: hr_recruitment
#: code:addons/hr_recruitment/models/hr_recruitment.py:368
#: code:addons/hr_recruitment/models/hr_recruitment.py:367
#, python-format
msgid "No Subject"
msgstr ""
@@ -1018,6 +1018,11 @@ msgid "Odoo helps you track applicants in the recruitment\n"
" process and follow up all operations: meetings, interviews, etc."
msgstr ""
#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_survey
msgid "Offer"
msgstr ""
#. module: hr_recruitment
#: model:res.groups,name:hr_recruitment.group_hr_recruitment_user
msgid "Officer"
@@ -1087,6 +1092,11 @@ msgstr ""
msgid "Partner"
msgstr ""
#. module: hr_recruitment
#: model:ir.model.fields,help:hr_recruitment.field_hr_job_hr_responsible_id
msgid "Person responsible of validating the employee's contracts."
msgstr ""
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_partner_phone
msgid "Phone"
@@ -1321,11 +1331,6 @@ msgstr ""
msgid "Sources of Applicants"
msgstr ""
#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_survey
msgid "Specific Email Address"
msgstr ""
#. module: hr_recruitment
#: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_stage_job_id
msgid "Specific job that uses this stage. Other jobs will not use this stage."
@@ -1571,7 +1576,7 @@ msgid "With just a quick glance on the Odoo employee screen, you\n"
msgstr ""
#. module: hr_recruitment
#: code:addons/hr_recruitment/models/hr_recruitment.py:404
#: code:addons/hr_recruitment/models/hr_recruitment.py:416
#, python-format
msgid "You must define an Applied Job and a Contact Name for this applicant."
msgstr ""
addons/hr_timesheet/i18n/hr_timesheet.pot
+73 -26
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:45+0000\n"
"PO-Revision-Date: 2017-04-18 14:45+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,6 +20,11 @@ msgstr ""
msgid "<span class=\"o_label\">Timesheets</span>"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_employee_view_form_inherit_timesheet
msgid "<span class=\"o_stat_text\">Timesheets</span>"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
msgid "<span>Timesheet Entries</span>"
@@ -31,7 +36,6 @@ msgid "<strong>Total</strong>"
msgstr ""
#. module: hr_timesheet
#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line
#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_by_project
#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_report
msgid "Activities"
@@ -42,12 +46,23 @@ msgstr ""
msgid "Activity Analysis"
msgstr ""
#. module: hr_timesheet
#: model:ir.actions.act_window,name:hr_timesheet.timesheet_action_all
#: model:ir.ui.menu,name:hr_timesheet.timesheet_menu_activity_all
msgid "All Timesheets"
msgstr ""
#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_project_project_allow_timesheets
#: model:ir.ui.view,arch_db:hr_timesheet.project_invoice_form
msgid "Allow timesheets"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_form
msgid "Analytic Entry"
msgstr ""
#. module: hr_timesheet
#: model:ir.model,name:hr_timesheet.model_account_analytic_line
msgid "Analytic Line"
@@ -78,11 +93,6 @@ msgstr ""
msgid "Billing"
msgstr ""
#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_project_project_crossovered_budget_line
msgid "Budget Lines"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
msgid "Cancel"
@@ -166,18 +176,12 @@ msgstr ""
msgid "Description"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
msgid "Detailed Activities"
msgstr ""
#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_display_name
msgid "Display Name"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_tree
#: model:ir.ui.view,arch_db:hr_timesheet.view_task_form2_inherited
msgid "Duration"
msgstr ""
@@ -187,6 +191,12 @@ msgstr ""
msgid "Effective Hours"
msgstr ""
#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_account_analytic_line_employee_id
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
msgid "Employee"
msgstr ""
#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_module_hr_expense
msgid "Expenses"
@@ -242,19 +252,27 @@ msgstr ""
msgid "Leave Management"
msgstr ""
#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_module_project_timesheet_holidays
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
msgid "Leaves"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
msgid "Manage your resources with Gantt charts"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.menu,name:hr_timesheet.menu_hr_time_tracking
msgid "My Timesheet"
#: model:res.groups,name:hr_timesheet.group_timesheet_manager
msgid "Manager"
msgstr ""
#. module: hr_timesheet
#: model:res.groups,name:hr_timesheet.group_hr_timesheet_user
msgid "Officer"
#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line
#: model:ir.ui.menu,name:hr_timesheet.timesheet_menu_activity_mine
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
msgid "My Timesheets"
msgstr ""
#. module: hr_timesheet
@@ -267,11 +285,6 @@ msgstr ""
msgid "Planned Hours"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
msgid "Product"
msgstr ""
#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_report_project_task_user_progress
msgid "Progress"
@@ -325,6 +338,16 @@ msgstr ""
msgid "Save"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
msgid "Save this page and come back here to set up the feature."
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
msgid "Sell services (e.g. project, maintenance), record time spent using Timesheets app and invoice them based on a fixed price (ordered quantity) or on the time spent (delivered quantity)"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
msgid "Sell services and invoice time spent"
@@ -387,17 +410,33 @@ msgstr ""
msgid "Tasks by user and project"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
msgid "This Month"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
msgid "This Week"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
msgid "Time"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_tree
msgid "Time (Hours)"
msgstr ""
#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_module_sale_timesheet
msgid "Time Billing"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.menu,name:hr_timesheet.menu_hr_time_tracking
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
#: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_line_pivot
msgid "Timesheet"
@@ -431,10 +470,13 @@ msgid "Timesheet by Month"
msgstr ""
#. module: hr_timesheet
#: model:ir.actions.act_window,name:hr_timesheet.timesheet_action_from_employee
#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_timesheet_ids
#: model:ir.ui.menu,name:hr_timesheet.timesheet_menu_root
#: model:ir.ui.view,arch_db:hr_timesheet.hr_department_view_kanban
#: model:ir.ui.view,arch_db:hr_timesheet.hr_employee_view_form_inherit_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.project_invoice_form
#: model:ir.ui.view,arch_db:hr_timesheet.timesheet_view_calendar
#: model:ir.ui.view,arch_db:hr_timesheet.view_project_kanban_inherited
#: model:ir.ui.view,arch_db:hr_timesheet.view_task_form2_inherited
msgid "Timesheets"
@@ -467,8 +509,13 @@ msgid "Track leaves to optimize your scheduling"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
msgid "Users"
#: model:res.groups,name:hr_timesheet.group_hr_timesheet_user
msgid "User"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
msgid "Validated leaves create timesheets automatically."
msgstr ""
#. module: hr_timesheet
addons/l10n_be/data/account_tax_template_data.xml
+1 -1
View File
@@ -1007,7 +1007,7 @@
<field name="name">12% EU M.</field>
<field name="price_include" eval="0"/>
<field name="amount">12</field>
<field name="amount_type">percent</field>
<field name="amount_type">group</field>
<field name="type_tax_use">purchase</field>
<field name="children_tax_ids" eval="[(6, 0, [ref('attn_VAT-IN-V81-12-EU-C1'), ref('attn_VAT-IN-V81-12-EU-C2')])]"/>
<field name="chart_template_id" ref="l10nbe_chart_template"/>
addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
+1 -1
View File
@@ -3,7 +3,7 @@
from datetime import date
from odoo import api, models
from odoo import api, models, _
from odoo.exceptions import UserError
addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
+1 -1
View File
@@ -3,7 +3,7 @@
from datetime import date
from odoo import api, models
from odoo import api, models, _
from odoo.exceptions import UserError
from odoo.tools import pycompat
addons/mail/i18n/mail.pot
+227 -130
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:45+0000\n"
"PO-Revision-Date: 2017-04-18 14:45+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -105,7 +105,7 @@ msgid "\n"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_channel.py:641
#: code:addons/mail/models/mail_channel.py:665
#, python-format
msgid " This channel is private. People must be invited to join it."
msgstr ""
@@ -122,32 +122,32 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chat_manager.js:66
#: code:addons/mail/static/src/js/chat_manager.js:62
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/activity.js:33
#: code:addons/mail/static/src/js/activity.js:31
#, python-format
msgid "%d days overdue"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_template.py:236
#: code:addons/mail/models/mail_template.py:253
#, python-format
msgid "%s (copy)"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:233
#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
#. module: mail
#: code:addons/mail/models/res_users.py:76
#: code:addons/mail/models/res_users.py:77
#, python-format
msgid "%s has joined the %s network."
msgstr ""
@@ -172,7 +172,7 @@ msgid "-------- Show older messages --------"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_channel.py:645
#: code:addons/mail/models/mail_channel.py:669
#, python-format
msgid "<br><br>\n"
" You can mention someone by typing <b>@username</b>, this will grab its attention.<br>\n"
@@ -182,20 +182,20 @@ msgid "<br><br>\n"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_channel.py:552
#: code:addons/mail/models/mail_channel.py:576
#, python-format
msgid "<div class=\"o_mail_notification\">created <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_channel.py:475
#: code:addons/mail/models/mail_channel.py:528
#: code:addons/mail/models/mail_channel.py:499
#: code:addons/mail/models/mail_channel.py:552
#, python-format
msgid "<div class=\"o_mail_notification\">joined <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_channel.py:168
#: code:addons/mail/models/mail_channel.py:182
#, python-format
msgid "<div class=\"o_mail_notification\">left <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
msgstr ""
@@ -275,12 +275,22 @@ msgid "<strong>\n"
" Confirming this wizard will probably take a few minutes blocking your browser."
msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.message_activity_done
msgid "<strong> Feedback : </strong>"
msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
msgid "<strong>Only records checked in list view will be used.</strong><br/>\n"
" If you want to send a lot of emails, we recommend you to use the mass mailing module."
msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
msgid "<strong>Recommended Activities</strong>"
msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_defaults
@@ -568,7 +578,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chat_manager.js:195
#: code:addons/mail/static/src/js/chat_manager.js:191
#, python-format
msgid "Anonymous"
msgstr ""
@@ -589,7 +599,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/followers.js:117
#: code:addons/mail/static/src/js/followers.js:330
#, python-format
msgid "Apply"
msgstr ""
@@ -721,7 +731,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/followers.js:125
#: code:addons/mail/static/src/js/followers.js:338
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
#: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
#: model:ir.ui.view,arch_db:mail.view_mail_form
@@ -850,13 +860,13 @@ msgid "Choose an example"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:339
#: code:addons/mail/models/mail_thread.py:340
#, python-format
msgid "Click here to add new %(document)s or send an email to: %(email_link)s"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:355
#: code:addons/mail/models/mail_thread.py:356
#, python-format
msgid "Click here to add new %s"
msgstr ""
@@ -974,7 +984,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:315
#: code:addons/mail/static/src/js/client_action.js:322
#, python-format
msgid "Create %s"
msgstr ""
@@ -1042,7 +1052,7 @@ msgid "Current user has a starred notification linked to this message"
msgstr ""
#. module: mail
#: code:addons/mail/models/res_partner.py:19
#: code:addons/mail/models/res_partner.py:21
#, python-format
msgid "Customers"
msgstr ""
@@ -1122,7 +1132,6 @@ msgid "Date of the last message posted on the record."
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity_date_deadline
#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
msgid "Deadline"
msgstr ""
@@ -1217,7 +1226,10 @@ msgid "Direct Messages"
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/activity.xml:52
#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
#, python-format
msgid "Discard"
msgstr ""
@@ -1290,7 +1302,26 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/activity.js:39
#: code:addons/mail/static/src/xml/activity.xml:50
#, python-format
msgid "Done"
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/activity.xml:48
#, python-format
msgid "Done & Schedule Next"
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity_date_deadline
msgid "Due Date"
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/activity.js:37
#, python-format
msgid "Due in %d days"
msgstr ""
@@ -1309,7 +1340,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/followers.js:114
#: code:addons/mail/static/src/js/followers.js:327
#, python-format
msgid "Edit Subscription of "
msgstr ""
@@ -1322,6 +1353,7 @@ msgid "Edit subscription"
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_email
#: model:ir.ui.view,arch_db:mail.view_mail_search
#: model:mail.activity.type,name:mail.mail_activity_data_email
#: selection:mail.compose.message,message_type:0
@@ -1471,7 +1503,7 @@ msgid "Failed"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_template.py:374
#: code:addons/mail/models/mail_template.py:392
#, python-format
msgid "Failed to render template %r using values %r"
msgstr ""
@@ -1495,6 +1527,14 @@ msgstr ""
msgid "Favorited By"
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/activity.js:192
#: model:ir.model.fields,field_description:mail.field_mail_activity_feedback
#, python-format
msgid "Feedback"
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_object_field
#: model:ir.model.fields,field_description:mail.field_mail_template_model_object_field
@@ -1540,7 +1580,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/models/mail_thread.py:695
#: code:addons/mail/models/mail_thread.py:694
#: code:addons/mail/static/src/xml/followers.xml:21
#, python-format
msgid "Follow"
@@ -1786,7 +1826,7 @@ msgid "Gateway"
msgstr ""
#. module: mail
#: code:addons/mail/models/res_users.py:53
#: code:addons/mail/models/res_users.py:54
#, python-format
msgid "Go to the configuration panel"
msgstr ""
@@ -2070,7 +2110,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chat_manager.js:1038
#: code:addons/mail/static/src/js/chat_manager.js:639
#: code:addons/mail/static/src/xml/client_action.xml:22
#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
@@ -2103,7 +2143,7 @@ msgid "Invalid expression, it must be a literal python dictionary definition e.g
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:1787
#: code:addons/mail/models/mail_thread.py:1782
#, python-format
msgid "Invalid record set: should be called as model (without records) or on single-record recordset"
msgstr ""
@@ -2116,7 +2156,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chat_manager.js:623
#: code:addons/mail/static/src/js/chat_manager.js:567
#, python-format
msgid "Invitation"
msgstr ""
@@ -2129,7 +2169,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:41
#: code:addons/mail/static/src/js/client_action.js:39
#: code:addons/mail/static/src/xml/client_action.xml:127
#, python-format
msgid "Invite"
@@ -2137,14 +2177,14 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/followers.js:143
#: code:addons/mail/static/src/js/followers.js:170
#, python-format
msgid "Invite Follower"
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:32
#: code:addons/mail/static/src/js/client_action.js:30
#: code:addons/mail/static/src/xml/client_action.xml:127
#, python-format
msgid "Invite people"
@@ -2152,7 +2192,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:644
#: code:addons/mail/static/src/js/client_action.js:646
#, python-format
msgid "Invite people to #%s"
msgstr ""
@@ -2423,8 +2463,8 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/models/mail_channel.py:654
#: code:addons/mail/static/src/xml/client_action.xml:101
#: code:addons/mail/models/mail_channel.py:678
#: code:addons/mail/static/src/xml/client_action.xml:105
#, python-format
msgid "Leave this channel"
msgstr ""
@@ -2440,7 +2480,7 @@ msgid "List of partners that will be added as follower of the current document."
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_channel.py:665
#: code:addons/mail/models/mail_channel.py:689
#, python-format
msgid "List users in the current channel"
msgstr ""
@@ -2462,14 +2502,14 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:41
#: code:addons/mail/static/src/js/chatter_composer.js:31
#, python-format
msgid "Log"
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:59
#: code:addons/mail/static/src/xml/chatter.xml:57
#, python-format
msgid "Log a note. Followers will not be notified."
msgstr ""
@@ -2492,7 +2532,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:59
#: code:addons/mail/static/src/xml/chatter.xml:57
#, python-format
msgid "Log an internal note"
msgstr ""
@@ -2505,6 +2545,20 @@ msgid "Log an internal note which will not be sent to followers, but which can b
" by users accessing this document."
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:60
#, python-format
msgid "Log or schedule an activity"
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:60
#, python-format
msgid "Lor or schedule an activity"
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_mail_activity_type_id
#: model:ir.model.fields,field_description:mail.field_mail_mail_mail_activity_type_id
@@ -2907,9 +2961,9 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chat_manager.js:58
#: code:addons/mail/static/src/js/chat_manager.js:54
#: code:addons/mail/static/src/js/window_manager.js:139
#: code:addons/mail/static/src/xml/chatter.xml:56
#: code:addons/mail/static/src/xml/chatter.xml:54
#: code:addons/mail/static/src/xml/systray.xml:24
#, python-format
msgid "New message"
@@ -2931,7 +2985,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:79
#: code:addons/mail/static/src/js/client_action.js:81
#, python-format
msgid "New people"
msgstr ""
@@ -3010,6 +3064,11 @@ msgstr ""
msgid "Next Activity Type"
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity_has_recommended_activities
msgid "Next activities available"
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/web_kanban_activity.xml:22
@@ -3019,7 +3078,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/followers.js:218
#: code:addons/mail/static/src/js/followers.js:185
#, python-format
msgid "No follower"
msgstr ""
@@ -3306,7 +3365,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:125
#: code:addons/mail/static/src/js/client_action.js:131
#, python-format
msgid "Odoo has now the permission to send you native notifications on this device."
msgstr ""
@@ -3320,7 +3379,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:123
#: code:addons/mail/static/src/js/client_action.js:129
#, python-format
msgid "Odoo will not have the permission to send native notifications on this device."
msgstr ""
@@ -3376,7 +3435,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/followers.js:220
#: code:addons/mail/static/src/js/followers.js:187
#, python-format
msgid "One follower"
msgstr ""
@@ -3583,7 +3642,7 @@ msgid "Partner Mass Mailing"
msgstr ""
#. module: mail
#: code:addons/mail/models/res_partner.py:31
#: code:addons/mail/models/res_partner.py:33
#, python-format
msgid "Partner Profile"
msgstr ""
@@ -3610,14 +3669,14 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:123
#: code:addons/mail/static/src/js/client_action.js:129
#, python-format
msgid "Permission denied"
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:125
#: code:addons/mail/static/src/js/client_action.js:131
#, python-format
msgid "Permission granted"
msgstr ""
@@ -3661,21 +3720,21 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:194
#: code:addons/mail/static/src/js/chatter_composer.js:157
#, python-format
msgid "Please complete partner's informations"
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/many2many_tags_email.js:66
#: code:addons/mail/static/src/js/many2many_tags_email.js:83
#, python-format
msgid "Please complete partner's informations and Email"
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/composer.js:655
#: code:addons/mail/static/src/js/composer.js:652
#, python-format
msgid "Please, wait while the file is uploading."
msgstr ""
@@ -3705,6 +3764,11 @@ msgstr ""
msgid "Powered by"
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity_type_previous_type_ids
msgid "Preceding Activities"
msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_form
msgid "Preferred reply address"
@@ -3726,6 +3790,11 @@ msgstr ""
msgid "Preview of"
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity_previous_activity_type_id
msgid "Previous Activity Type"
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_public
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
@@ -3741,7 +3810,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:137
#: code:addons/mail/static/src/js/client_action.js:143
#, python-format
msgid "Public Channels"
msgstr ""
@@ -3754,7 +3823,7 @@ msgid "Publisher: Update Notification"
msgstr ""
#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:178
#: code:addons/mail/wizard/mail_compose_message.py:179
#, python-format
msgid "Re:"
msgstr ""
@@ -3785,6 +3854,16 @@ msgstr ""
msgid "Recipients"
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity_recommended_activity_type_id
msgid "Recommended Activity Type"
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity_type_next_type_ids
msgid "Recommended Next Activities"
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_alias_alias_force_thread_id
#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_force_thread_id
@@ -3939,7 +4018,7 @@ msgid "Rich-text/HTML message"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:831
#: code:addons/mail/models/mail_thread.py:830
#, python-format
msgid "Routing mail with Message-Id %s: route %s: %s"
msgstr ""
@@ -3978,14 +4057,6 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:62
#, python-format
msgid "Schedule an Activity"
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:62
#: code:addons/mail/static/src/xml/web_kanban_activity.xml:56
#, python-format
msgid "Schedule an activity"
@@ -4039,7 +4110,7 @@ msgid "Send Email"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_template.py:257
#: code:addons/mail/models/mail_template.py:274
#, python-format
msgid "Send Mail (%s)"
msgstr ""
@@ -4052,7 +4123,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:56
#: code:addons/mail/static/src/xml/chatter.xml:54
#, python-format
msgid "Send a message"
msgstr ""
@@ -4075,14 +4146,14 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:396
#: code:addons/mail/static/src/js/thread_field.js:83
#, python-format
msgid "Sending Error"
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:97
#: code:addons/mail/static/src/xml/client_action.xml:101
#, python-format
msgid "Sends messages by email"
msgstr ""
@@ -4135,7 +4206,7 @@ msgid "Show all records which has next action date is before today"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_channel.py:634
#: code:addons/mail/models/mail_channel.py:658
#, python-format
msgid "Show an helper message"
msgstr ""
@@ -4194,7 +4265,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chat_manager.js:1044
#: code:addons/mail/static/src/js/chat_manager.js:645
#: code:addons/mail/static/src/xml/client_action.xml:28
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred
#: model:ir.model.fields,field_description:mail.field_mail_mail_starred
@@ -4314,7 +4385,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_subtype_id
#: model:ir.model.fields,field_description:mail.field_mail_followers_subtype_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail_subtype_id
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_id_2047
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_id_1971
#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subtype_id
#: model:ir.ui.view,arch_db:mail.view_message_subtype_tree
msgid "Subtype"
@@ -4344,6 +4415,11 @@ msgstr ""
msgid "Task to perform"
msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_activity_has_recommended_activities
msgid "Technical field for UX purpose"
msgstr ""
#. module: mail
#: model:ir.actions.act_window,name:mail.wizard_email_template_preview
msgid "Template Preview"
@@ -4363,11 +4439,6 @@ msgstr ""
msgid "Test Mail Model"
msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_channel_alias_id
msgid "The email address associated with this group. New emails received will automatically create new topics."
msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_shortcode_substitution
msgid "The escaped html code replacing the shortcut"
@@ -4398,8 +4469,8 @@ msgid "The owner of records created upon receiving emails on this alias. If this
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_message.py:572
#: code:addons/mail/models/mail_message.py:667
#: code:addons/mail/models/mail_message.py:574
#: code:addons/mail/models/mail_message.py:669
#, python-format
msgid "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
"\n"
@@ -4472,7 +4543,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: selection:account.invoice,activity_state:0
#: code:addons/mail/static/src/js/activity.js:27
#: code:addons/mail/static/src/js/activity.js:25
#: code:addons/mail/static/src/js/thread.js:231
#: selection:crm.lead,activity_state:0
#: selection:event.track,activity_state:0
@@ -4516,7 +4587,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/activity.js:37
#: code:addons/mail/static/src/js/activity.js:35
#, python-format
msgid "Tomorrow"
msgstr ""
@@ -4580,14 +4651,14 @@ msgid "Unable to connect to SMTP Server"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_message.py:30
#: code:addons/mail/models/mail_message.py:32
#, python-format
msgid "Unable to send email, please configure the sender's email address."
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/models/mail_thread.py:699
#: code:addons/mail/models/mail_thread.py:698
#: code:addons/mail/static/src/xml/followers.xml:23
#, python-format
msgid "Unfollow"
@@ -4778,7 +4849,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/composer.js:655
#: code:addons/mail/static/src/js/composer.js:652
#, python-format
msgid "Uploading error"
msgstr ""
@@ -4818,7 +4889,7 @@ msgid "Users"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_channel.py:678
#: code:addons/mail/models/mail_channel.py:702
#, python-format
msgid "Users in this channel: %s %s and you."
msgstr ""
@@ -4829,8 +4900,8 @@ msgid "Using your own email server is required to send/receive emails in Communi
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:667
#: code:addons/mail/models/mail_thread.py:669
#: code:addons/mail/models/mail_thread.py:666
#: code:addons/mail/models/mail_thread.py:668
#: model:ir.ui.view,arch_db:mail.message_user_assigned
#, python-format
msgid "View"
@@ -4838,10 +4909,11 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/followers.js:330
#: code:addons/mail/static/src/js/followers.js:240
#, python-format
msgid "Warning! \n"
" If you remove a follower, he won't be notified of any email or discussion on this document. Do you really want to remove this follower ?"
" If you remove a follower, he won't be notified of any email or discussion on this document.\n"
" Do you really want to remove this follower ?"
msgstr ""
#. module: mail
@@ -4877,6 +4949,13 @@ msgstr ""
msgid "Who can follow the group's activities?"
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/activity.xml:46
#, python-format
msgid "Write Feedback"
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/composer.xml:18
@@ -4886,7 +4965,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/activity.js:31
#: code:addons/mail/static/src/js/activity.js:29
#: code:addons/mail/static/src/js/thread.js:233
#, python-format
msgid "Yesterday"
@@ -4894,25 +4973,25 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:78
#: code:addons/mail/static/src/js/client_action.js:80
#, python-format
msgid "You added <b>%s</b> to the conversation."
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_channel.py:675
#: code:addons/mail/models/mail_channel.py:699
#, python-format
msgid "You are alone in this channel."
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_channel.py:644
#: code:addons/mail/models/mail_channel.py:668
#, python-format
msgid "You are in a private conversation with <b>@%s</b>."
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_channel.py:639
#: code:addons/mail/models/mail_channel.py:663
#, python-format
msgid "You are in channel <b>#%s</b>."
msgstr ""
@@ -4925,20 +5004,20 @@ msgid "You can mark any message as 'starred', and it shows up in this channel."
msgstr ""
#. module: mail
#: code:addons/mail/models/res_users.py:52
#: code:addons/mail/models/res_users.py:53
#, python-format
msgid "You cannot create a new user from here.\n"
" To create new user please go to configuration panel."
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_channel.py:133
#: code:addons/mail/models/mail_channel.py:144
#, python-format
msgid "You cannot delete those groups, as the Whole Company group is required by other modules."
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:346
#: code:addons/mail/models/mail_thread.py:347
#, python-format
msgid "You could also add a new %(document)s by sending an email to: %(email_link)s."
msgstr ""
@@ -4950,7 +5029,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chat_manager.js:623
#: code:addons/mail/static/src/js/chat_manager.js:567
#, python-format
msgid "You have been invited to: "
msgstr ""
@@ -4963,21 +5042,21 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chat_manager.js:519
#: code:addons/mail/static/src/js/chat_manager.js:463
#, python-format
msgid "You unpinned your conversation with <b>%s</b>."
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chat_manager.js:517
#: code:addons/mail/static/src/js/chat_manager.js:461
#, python-format
msgid "You unsubscribed from <b>%s</b>."
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:396
#: code:addons/mail/static/src/js/thread_field.js:83
#, python-format
msgid "Your message has not been sent."
msgstr ""
@@ -4989,15 +5068,9 @@ msgid "Your template should define email_from"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:965
#: code:addons/mail/models/mail_thread.py:960
#, python-format
msgid "alias %s does not accept unknown author"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:961
#, python-format
msgid "alias %s restricted to internal followers"
msgid "alias %s: %s"
msgstr ""
#. module: mail
@@ -5016,7 +5089,7 @@ msgid "created"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:312
#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -5041,7 +5114,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/followers.js:222
#: code:addons/mail/static/src/js/followers.js:189
#, python-format
msgid "followers"
msgstr ""
@@ -5068,6 +5141,12 @@ msgstr ""
msgid "has been"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_alias.py:271
#, python-format
msgid "incorrectly configured alias"
msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_ir_actions_server
msgid "ir.actions.server"
@@ -5084,24 +5163,19 @@ msgid "mail.alias.mixin"
msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "members"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:940
#: code:addons/mail/models/mail_thread.py:939
#, python-format
msgid "model %s does not accept document creation"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:935
#: code:addons/mail/models/mail_thread.py:934
#, python-format
msgid "model %s does not accept document update"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:928
#: code:addons/mail/models/mail_thread.py:927
#, python-format
msgid "model %s does not accept document update, fall back on document creation"
msgstr ""
@@ -5139,13 +5213,13 @@ msgid "planned by"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:910
#: code:addons/mail/models/mail_thread.py:909
#, python-format
msgid "posting a message without model should be with a null res_id (private message), received %s"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:914
#: code:addons/mail/models/mail_thread.py:913
#, python-format
msgid "posting a message without model should be with a parent_id (private message)"
msgstr ""
@@ -5175,30 +5249,47 @@ msgid "record:"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:932
#: code:addons/mail/models/mail_thread.py:931
#, python-format
msgid "reply to missing document (%s,%s)"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:925
#: code:addons/mail/models/mail_thread.py:924
#, python-format
msgid "reply to missing document (%s,%s), fall back on new document creation"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:910
#: code:addons/mail/models/mail_thread.py:909
#, python-format
msgid "resetting thread_id"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:914
#: code:addons/mail/models/mail_thread.py:932
#: code:addons/mail/models/mail_thread.py:935
#: code:addons/mail/models/mail_thread.py:940
#: code:addons/mail/models/mail_thread.py:961
#: code:addons/mail/models/mail_thread.py:965
#: code:addons/mail/models/mail_channel.py:254
#, python-format
msgid "restricted to channel members"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_alias.py:276
#, python-format
msgid "restricted to followers"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_alias.py:280
#, python-format
msgid "restricted to known authors"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:913
#: code:addons/mail/models/mail_thread.py:931
#: code:addons/mail/models/mail_thread.py:934
#: code:addons/mail/models/mail_thread.py:939
#: code:addons/mail/models/mail_thread.py:960
#, python-format
msgid "skipping"
msgstr ""
@@ -5211,7 +5302,13 @@ msgid "this document"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:903
#: code:addons/mail/models/mail_thread.py:960
#, python-format
msgid "unknown error"
msgstr ""
#. module: mail
#: code:addons/mail/models/mail_thread.py:902
#, python-format
msgid "unknown target model %s"
msgstr ""
addons/mail/models/mail_message.py
+24
View File
@@ -2,6 +2,7 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
import logging
import re
from email.utils import formataddr
@@ -11,6 +12,7 @@ from odoo.osv import expression
from odoo.tools import pycompat
_logger = logging.getLogger(__name__)
_image_dataurl = re.compile(r'(data:image/[a-z]+?);base64,([a-z0-9+/]{3,}=*)([\'"])', re.I)
class Message(models.Model):
@@ -723,6 +725,28 @@ class Message(models.Model):
if 'record_name' not in values and 'default_record_name' not in self.env.context:
values['record_name'] = self._get_record_name(values)
if 'attachment_ids' not in values:
values.setdefault('attachment_ids', [])
# extract base64 images
if 'body' in values:
Attachments = self.env['ir.attachment']
data_to_url = {}
def base64_to_boundary(match):
key = match.group(2)
if not data_to_url.get(key):
name = 'image%s' % len(data_to_url)
attachment = Attachments.create({
'name': name,
'datas': match.group(2),
'datas_fname': name,
'res_model': 'mail.message',
})
values['attachment_ids'].append((4, attachment.id))
data_to_url[key] = '/web/image/%s' % attachment.id
return '%s%s alt="%s"' % (data_to_url[key], match.group(3), name)
values['body'] = _image_dataurl.sub(base64_to_boundary, values['body'])
message = super(Message, self).create(values)
message._invalidate_documents()
addons/mail/static/src/js/many2many_tags_email.js
+1 -1
View File
@@ -39,7 +39,7 @@ BasicModel.include({
var def;
if (invalidPartnerIds) {
// remove invalid partners
var changes = {operation: 'REMOVE', ids: _.pluck(invalidPartnerIds, 'id')};
var changes = {operation: 'DELETE', ids: _.pluck(invalidPartnerIds, 'id')};
def = this._applyX2ManyChange(record, fieldName, changes);
}
return $.when(def).then(function () {
addons/mail/tests/test_mail_followers.py
+2 -1
View File
@@ -4,6 +4,7 @@
from psycopg2 import IntegrityError
from odoo.addons.mail.tests.common import TestMail
from odoo.tools.misc import mute_logger
class TestMailFollowers(TestMail):
@@ -136,7 +137,7 @@ class TestMailFollowers(TestMail):
'name': 'I used to be schizo, but now we are alright.'
})
test_channel = self.env['mail.channel'].create({'name': 'Follower Channel'})
with self.assertRaises(IntegrityError):
with self.assertRaises(IntegrityError), mute_logger('odoo.sql_db'):
self.env['mail.followers'].create({
'res_model_id': self.env['ir.model']._get('mail.test').id,
'res_id': test_record.id,
addons/maintenance/i18n/maintenance.pot
+46 -31
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~14\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-15 09:50+0000\n"
"PO-Revision-Date: 2017-02-15 09:50+0000\n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -155,7 +155,6 @@ msgstr ""
#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_name
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_form
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_search
#: model:ir.ui.view,arch_db:maintenance.maintenance_team_view_form
msgid "Category Name"
msgstr ""
@@ -196,15 +195,11 @@ msgstr ""
msgid "Close Date"
msgstr ""
#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_color
msgid "Color"
msgstr ""
#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_color
#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_color
#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_color
#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_color
msgid "Color Index"
msgstr ""
@@ -368,7 +363,7 @@ msgid "Equipment Categories"
msgstr ""
#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_id_3535
#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_id_3609
msgid "Equipment Category"
msgstr ""
@@ -516,7 +511,7 @@ msgstr ""
#. module: maintenance
#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_maintenance_duration
msgid "Maintenance Duration in minutes and seconds."
msgid "Maintenance Duration in hours."
msgstr ""
#. module: maintenance
@@ -550,8 +545,11 @@ msgstr ""
#: model:ir.actions.act_window,name:maintenance.hr_equipment_request_action_from_equipment
#: model:ir.actions.act_window,name:maintenance.hr_equipment_request_action_link
#: model:ir.actions.act_window,name:maintenance.hr_equipment_todo_request_action_from_dashboard
#: model:ir.actions.act_window,name:maintenance.maintenance_request_action_reports
#: model:ir.model,name:maintenance.model_maintenance_request
#: model:ir.ui.menu,name:maintenance.maintenance_request_reporting
#: model:ir.ui.menu,name:maintenance.menu_m_request_form
#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
msgid "Maintenance Requests"
msgstr ""
@@ -565,11 +563,6 @@ msgstr ""
msgid "Maintenance Stages"
msgstr ""
#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
msgid "Maintenance Subject"
msgstr ""
#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_maintenance_team_id
#: model:ir.ui.view,arch_db:maintenance.maintenance_team_view_form
@@ -601,11 +594,6 @@ msgstr ""
msgid "Model"
msgstr ""
#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
msgid "More <i class=\"fa fa-caret-down\"/>"
msgstr ""
#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
@@ -626,6 +614,7 @@ msgstr ""
#: model:ir.model.fields,field_description:maintenance.field_maintenance_stage_name
#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_name
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_tree
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
msgid "Name"
msgstr ""
@@ -640,6 +629,11 @@ msgstr ""
msgid "Next Preventive Maintenance"
msgstr ""
#. module: maintenance
#: model:ir.actions.act_window,help:maintenance.maintenance_request_action_reports
msgid "No maintenance request."
msgstr ""
#. module: maintenance
#: selection:maintenance.request,priority:0
msgid "Normal"
@@ -747,6 +741,7 @@ msgid "Repaired"
msgstr ""
#. module: maintenance
#: model:ir.ui.menu,name:maintenance.maintenance_reporting
#: model:ir.ui.menu,name:maintenance.menu_m_reports
msgid "Reporting"
msgstr ""
@@ -777,6 +772,11 @@ msgstr ""
msgid "Requested By"
msgstr ""
#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_kanban
msgid "Requested by :"
msgstr ""
#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_technician_user_id
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_search
@@ -784,6 +784,11 @@ msgstr ""
msgid "Responsible"
msgstr ""
#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_kanban
msgid "Responsible :"
msgstr ""
#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
msgid "Scheduled"
@@ -857,16 +862,6 @@ msgstr ""
msgid "Status changed"
msgstr ""
#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_partner_id
msgid "Subcontracting Partner"
msgstr ""
#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
msgid "Subject"
msgstr ""
#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_name
msgid "Subjects"
@@ -877,6 +872,16 @@ msgstr ""
msgid "Team"
msgstr ""
#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_member_ids
msgid "Team Members"
msgstr ""
#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.maintenance_team_view_form
msgid "Team Name"
msgstr ""
#. module: maintenance
#: model:ir.actions.act_window,name:maintenance.maintenance_team_action_settings
msgid "Teams"
@@ -968,6 +973,11 @@ msgstr ""
msgid "Todo Request Count High Priority"
msgstr ""
#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count_unscheduled
msgid "Todo Request Count Unscheduled"
msgstr ""
#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
@@ -991,6 +1001,11 @@ msgstr ""
msgid "Unread Messages"
msgstr ""
#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
msgid "Unscheduled"
msgstr ""
#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
msgid "Unscheduled Maintenance"
addons/mass_mailing/i18n/mass_mailing.pot
+41 -19
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:47+0000\n"
"PO-Revision-Date: 2017-04-18 14:47+0000\n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgid "%<br/>\n"
msgstr ""
#. module: mass_mailing
#: code:addons/mass_mailing/models/mass_mailing.py:482
#: code:addons/mass_mailing/models/mass_mailing.py:479
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -198,11 +198,6 @@ msgstr ""
msgid "A/B Testing percentage"
msgstr ""
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_unique_ab_testing
msgid "AB Testing"
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_event
msgid "ALL DAY"
@@ -214,6 +209,16 @@ msgstr ""
msgid "Active"
msgstr ""
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_unique_ab_testing
msgid "Allow A/B Testing"
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.theme_basic_template
msgid "Anna Machiavelli"
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_tag_line
msgid "Apps That Help You Grow Your Business"
@@ -274,7 +279,7 @@ msgid "Bounced Ratio"
msgstr ""
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_id_3844
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_id_3862
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
msgid "Campaign"
msgstr ""
@@ -521,6 +526,11 @@ msgstr ""
msgid "Date when this email has bounced."
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.theme_basic_template
msgid "Dear John,"
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_kanban
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_kanban
@@ -576,7 +586,7 @@ msgid "Domain"
msgstr ""
#. module: mass_mailing
#: code:addons/mass_mailing/models/mass_mailing.py:490
#: code:addons/mass_mailing/models/mass_mailing.py:487
#: selection:mail.mass_mailing,state:0
#: selection:mail.statistics.report,state:0
#, python-format
@@ -732,11 +742,11 @@ msgstr ""
#. module: mass_mailing
#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_unique_ab_testing
msgid "If checked, recipients will be mailed only once, allowing to send various mailings in a single campaign to test the effectiveness of the mailings."
msgid "If checked, recipients will be mailed only once for the whole campaign. This lets you send different mailings to randomly selected recipients and test the effectiveness of the mailings, without causing duplicate messages."
msgstr ""
#. module: mass_mailing
#: code:addons/mass_mailing/models/mass_mailing.py:490
#: code:addons/mass_mailing/models/mass_mailing.py:487
#: selection:mail.mass_mailing,state:0
#, python-format
msgid "In Queue"
@@ -879,7 +889,7 @@ msgstr ""
#. module: mass_mailing
#: model:ir.actions.act_window,name:mass_mailing.action_view_mass_mailing_lists
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_list_ids
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_list_ids_3868
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_list_ids_3886
#: model:ir.ui.menu,name:mass_mailing.menu_email_mass_mailing_lists
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_list_search
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_list_tree
@@ -1194,7 +1204,7 @@ msgid "Percentage of the contacts that will be mailed. Recipients will be taken
msgstr ""
#. module: mass_mailing
#: code:addons/mass_mailing/models/mass_mailing.py:671
#: code:addons/mass_mailing/models/mass_mailing.py:668
#, python-format
msgid "Please select recipients."
msgstr ""
@@ -1401,14 +1411,14 @@ msgid "Send to All"
msgstr ""
#. module: mass_mailing
#: code:addons/mass_mailing/models/mass_mailing.py:490
#: code:addons/mass_mailing/models/mass_mailing.py:487
#: selection:mail.mass_mailing,state:0
#, python-format
msgid "Sending"
msgstr ""
#. module: mass_mailing
#: code:addons/mass_mailing/models/mass_mailing.py:490
#: code:addons/mass_mailing/models/mass_mailing.py:487
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics_sent
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_sent
#: model:ir.model.fields,field_description:mass_mailing.field_mail_statistics_report_sent
@@ -1452,6 +1462,11 @@ msgstr ""
msgid "Settings"
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.theme_basic_template
msgid "Sincerely,<br/>"
msgstr ""
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_source_id
msgid "Source"
@@ -1521,7 +1536,7 @@ msgid "Tags"
msgstr ""
#. module: mass_mailing
#: code:addons/mass_mailing/models/mass_mailing.py:545
#: code:addons/mass_mailing/models/mass_mailing.py:542
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
#, python-format
msgid "Test Mailing"
@@ -1596,7 +1611,7 @@ msgstr ""
#. module: mass_mailing
#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_campaign_id
#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_id_3844
#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_id_3862
msgid "This name helps you tracking your different campaign efforts, e.g. Fall_Drive, Christmas_Special"
msgstr ""
@@ -1769,6 +1784,13 @@ msgstr ""
msgid "link.tracker.click"
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.theme_basic_template
msgid "lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.<br/>\n"
" Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.<br/>\n"
" Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur."
msgstr ""
#. module: mass_mailing
#: model:ir.model,name:mass_mailing.model_mass_mailing_config_settings
msgid "mass.mailing.config.settings"
addons/mass_mailing/views/mass_mailing_views.xml
+1 -1
View File
@@ -423,7 +423,7 @@
context="{'search_default_not_opt_out':1}"/>
<div attrs="{'invisible': [('mailing_model', '!=', 'mail.mass_mailing.list')]}">
<label for="contact_list_ids" string="Select mailing lists:" class="oe_edit_only"/>
<field name="contact_list_ids" widget="many2many_tags" options="{'color_field': 'color'}"
<field name="contact_list_ids" widget="many2many_tags"
placeholder="Select mailing lists..." class="oe_inline"/>
</div>
</div>
addons/mass_mailing_event/i18n/mass_mailing_event.pot
+27
View File
@@ -0,0 +1,27 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mass_mailing_event
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: mass_mailing_event
#: model:ir.model,name:mass_mailing_event.model_event_event
msgid "Event"
msgstr ""
#. module: mass_mailing_event
#: model:ir.ui.view,arch_db:mass_mailing_event.event_event_view_form_inherit_mass_mailing
msgid "Mail Attendees"
msgstr ""
addons/mass_mailing_event_track/i18n/mass_mailing_event_track.pot
+27
View File
@@ -0,0 +1,27 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mass_mailing_event_track
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: mass_mailing_event_track
#: model:ir.model,name:mass_mailing_event_track.model_event_event
msgid "Event"
msgstr ""
#. module: mass_mailing_event_track
#: model:ir.ui.view,arch_db:mass_mailing_event_track.event_event_view_form_inherit_mass_mailing_track
msgid "Mail Track Speakers"
msgstr ""
addons/membership/views/product_views.xml
+1 -1
View File
@@ -98,7 +98,7 @@
<field name="list_price" string="Membership Fee"/>
<field
name="property_account_income_id"/>
<field name="taxes_id" widget="many2many_tags" options="{'color_field': 'color'}" string="Taxes"/>
<field name="taxes_id" widget="many2many_tags" string="Taxes"/>
</group>
</group>
<label for="description"/>
addons/mrp/i18n/mrp.pot
+168 -67
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:45+0000\n"
"PO-Revision-Date: 2017-04-18 14:45+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -51,7 +51,7 @@ msgid "# Work Orders"
msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_bom.py:271
#: code:addons/mrp/models/mrp_bom.py:293
#, python-format
msgid "<p class=\"oe_view_nocontent_create\">\n"
" Click to upload files to your product.\n"
@@ -217,7 +217,7 @@ msgid "<strong>WorkCenter</strong>"
msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_workorder.py:429
#: code:addons/mrp/models/mrp_workorder.py:438
#, python-format
msgid "A Manufacturing Order is already done or cancelled!"
msgstr ""
@@ -232,6 +232,7 @@ msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_active
#: model:ir.model.fields,field_description:mrp.field_mrp_document_active
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_active
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_active
#: model:ir.ui.view,arch_db:mrp.mrp_message_view_search
@@ -288,7 +289,18 @@ msgid "Archived"
msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_bom.py:263
#: model:ir.model.fields,field_description:mrp.field_mrp_document_name
msgid "Attachment Name"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document_local_url
#: model:ir.model.fields,field_description:mrp.field_mrp_document_website_url
msgid "Attachment URL"
msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_bom.py:285
#, python-format
msgid "Attachments"
msgstr ""
@@ -488,11 +500,6 @@ msgstr ""
msgid "By-Products"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_product_product_can_be_expensed
msgid "Can be Expensed"
msgstr ""
#. module: mrp
#: code:addons/mrp/models/stock_warehouse.py:36
#, python-format
@@ -515,7 +522,7 @@ msgid "Cancelled"
msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_production.py:279
#: code:addons/mrp/models/mrp_production.py:282
#, python-format
msgid "Cannot delete a manufacturing order not in cancel state"
msgstr ""
@@ -551,6 +558,11 @@ msgstr ""
msgid "Check availability"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document_checksum
msgid "Checksum/SHA1"
msgstr ""
#. module: mrp
#. openerp-web
#: code:addons/mrp/static/src/xml/mrp.xml:9
@@ -622,6 +634,7 @@ msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_company_id
#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_company_id
#: model:ir.model.fields,field_description:mrp.field_mrp_document_company_id
#: model:ir.model.fields,field_description:mrp.field_mrp_production_company_id
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_company_id
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_company_id
@@ -723,6 +736,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_document_create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_message_create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_production_create_uid
@@ -742,6 +756,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_document_create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_message_create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_production_create_date
@@ -781,6 +796,11 @@ msgstr ""
msgid "Dashboard"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document_db_datas
msgid "Database Data"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.oee_search_view
msgid "Date"
@@ -813,6 +833,7 @@ msgid "Default Unit of Measure"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document_description
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_note
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_note
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_note
@@ -849,6 +870,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_document_display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_message_display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_production_display_name
@@ -957,6 +979,21 @@ msgstr ""
msgid "Expected duration (in minutes)"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document_datas
msgid "File Content"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document_datas_fname
msgid "File Name"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document_file_size
msgid "File Size"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
msgid "Filters"
@@ -999,6 +1036,11 @@ msgstr ""
msgid "General Information"
msgstr ""
#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_document_priority
msgid "Gives the sequence order when displaying a list of MRP documents."
msgstr ""
#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_bom_sequence
msgid "Gives the sequence order when displaying a list of bills of material."
@@ -1009,11 +1051,6 @@ msgstr ""
msgid "Gives the sequence order when displaying a list of routing Work Centers."
msgstr ""
#. module: mrp
#: model:ir.model.fields,help:mrp.field_ir_attachment_priority
msgid "Gives the sequence order when displaying a list of tasks."
msgstr ""
#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_workcenter_sequence
msgid "Gives the sequence order when displaying a list of work centers."
@@ -1060,7 +1097,7 @@ msgid "Has Moves"
msgstr ""
#. module: mrp
#: selection:ir.attachment,priority:0
#: selection:mrp.document,priority:0
msgid "High"
msgstr ""
@@ -1069,6 +1106,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_id
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_id
#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_id
#: model:ir.model.fields,field_description:mrp.field_mrp_document_id
#: model:ir.model.fields,field_description:mrp.field_mrp_message_id
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_id
#: model:ir.model.fields,field_description:mrp.field_mrp_production_id
@@ -1122,6 +1160,11 @@ msgstr ""
msgid "In Progress"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document_index_content
msgid "Indexed Content"
msgstr ""
#. module: mrp
#: model:ir.model.fields,help:mrp.field_stock_move_lots_lot_produced_qty
msgid "Informative, not used in matching"
@@ -1169,6 +1212,11 @@ msgstr ""
msgid "Is a Blocking Reason"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document_public
msgid "Is public document"
msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_workcenter.py:162
#, python-format
@@ -1195,6 +1243,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom___last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line___last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings___last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_document___last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_message___last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce___last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_production___last_update
@@ -1216,6 +1265,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_document_write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_message_write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_production_write_uid
@@ -1235,6 +1285,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_document_write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_message_write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_production_write_date
@@ -1259,7 +1310,7 @@ msgid "Late"
msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_production.py:385
#: code:addons/mrp/models/mrp_production.py:393
#, python-format
msgid "Lines need to be deleted, but can not as you still have some quantities to consume in them. "
msgstr ""
@@ -1280,7 +1331,7 @@ msgid "Location where the system will stock the finished products."
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_id_9642
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_id_9897
#: model:ir.ui.view,arch_db:mrp.oee_search_view
msgid "Loss Reason"
msgstr ""
@@ -1300,7 +1351,7 @@ msgid "Lots"
msgstr ""
#. module: mrp
#: selection:ir.attachment,priority:0
#: selection:mrp.document,priority:0
msgid "Low"
msgstr ""
@@ -1455,9 +1506,8 @@ msgid "Message"
msgstr ""
#. module: mrp
#: model:ir.actions.act_window,help:mrp.mrp_message_action_main
msgid "Messages can be configured to appear during any operation: receptions, delivery orders,\n"
" manufacturing orders, work orders, etc."
#: model:ir.model.fields,field_description:mrp.field_mrp_document_mimetype
msgid "Mime Type"
msgstr ""
#. module: mrp
@@ -1467,12 +1517,6 @@ msgstr ""
msgid "Miscellaneous"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
#: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
msgid "More <i class=\"fa fa-caret-down\"/>"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_move_id
msgid "Move"
@@ -1529,11 +1573,12 @@ msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_production.py:46
#: code:addons/mrp/models/mrp_production.py:268
#: code:addons/mrp/models/mrp_production.py:269
#: code:addons/mrp/models/mrp_production.py:272
#: code:addons/mrp/models/mrp_routing.py:18
#: code:addons/mrp/models/mrp_routing.py:34
#: code:addons/mrp/models/mrp_routing.py:35
#: code:addons/mrp/models/mrp_unbuild.py:20
#: code:addons/mrp/models/mrp_unbuild.py:80
#: code:addons/mrp/models/mrp_unbuild.py:81
#, python-format
msgid "New"
@@ -1588,8 +1633,8 @@ msgid "None"
msgstr ""
#. module: mrp
#: selection:ir.attachment,priority:0
#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
#: selection:mrp.document,priority:0
#: selection:mrp.production,priority:0
#: selection:mrp.workcenter,working_state:0
msgid "Normal"
@@ -1785,6 +1830,7 @@ msgid "Planned Date"
msgstr ""
#. module: mrp
#: model:ir.ui.menu,name:mrp.mrp_planning_menu_root
#: model:ir.ui.view,arch_db:mrp.view_mrp_config
msgid "Planning"
msgstr ""
@@ -1806,7 +1852,7 @@ msgid "Post Inventory"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_ir_attachment_priority
#: model:ir.model.fields,field_description:mrp.field_mrp_document_priority
#: model:ir.model.fields,field_description:mrp.field_mrp_production_priority
msgid "Priority"
msgstr ""
@@ -2006,6 +2052,11 @@ msgstr ""
msgid "Propagate cancel and split"
msgstr ""
#. module: mrp
#: model:ir.model,name:mrp.model_stock_location_path
msgid "Pushed Flow"
msgstr ""
#. module: mrp
#: selection:mrp.workcenter.productivity.loss,loss_type:0
msgid "Quality"
@@ -2098,7 +2149,7 @@ msgstr ""
#. module: mrp
#. openerp-web
#: code:addons/mrp/static/src/js/mrp.js:24
#: code:addons/mrp/static/src/js/mrp.js:146
#, python-format
msgid "Ready to produce"
msgstr ""
@@ -2120,7 +2171,7 @@ msgid "Record Production"
msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_bom.py:132
#: code:addons/mrp/models/mrp_bom.py:160
#, python-format
msgid "Recursion error! A product with a Bill of Material should not have itself in its BoM or child BoMs!"
msgstr ""
@@ -2160,6 +2211,11 @@ msgstr ""
msgid "Related Procurements"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document_ir_attachment_id
msgid "Related attachment"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_mrp_repair
msgid "Repair"
@@ -2180,11 +2236,31 @@ msgstr ""
msgid "Requires Serial"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document_res_field
msgid "Resource Field"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document_res_id
msgid "Resource ID"
msgstr ""
#. module: mrp
#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
msgid "Resource Leaves"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document_res_model
msgid "Resource Model"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document_res_name
msgid "Resource Name"
msgstr ""
#. module: mrp
#: model:ir.ui.menu,name:mrp.menu_pm_resources_config
msgid "Resources"
@@ -2287,8 +2363,8 @@ msgid "Scheduled Month"
msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_production.py:558
#: code:addons/mrp/models/mrp_workorder.py:438
#: code:addons/mrp/models/mrp_production.py:571
#: code:addons/mrp/models/mrp_workorder.py:447
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_scrap_ids
#: model:ir.ui.menu,name:mrp.menu_mrp_scrap
#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
@@ -2390,7 +2466,7 @@ msgid "Ship this product as a set of components (kit)"
msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_unbuild.py:89
#: code:addons/mrp/models/mrp_unbuild.py:88
#, python-format
msgid "Should have a lot for the finished product"
msgstr ""
@@ -2406,11 +2482,6 @@ msgstr ""
msgid "Source"
msgstr ""
#. module: mrp
#: model:ir.model.fields,help:mrp.field_product_product_can_be_expensed
msgid "Specify whether the product can be selected in an HR expense."
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_production_date_start
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_date_start
@@ -2449,6 +2520,11 @@ msgstr ""
msgid "Stock Moves"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document_store_fname
msgid "Stored Filename"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_child_bom_id
msgid "Sub BoM"
@@ -2515,7 +2591,7 @@ msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_bom.py:77
#: code:addons/mrp/models/mrp_bom.py:232
#: code:addons/mrp/models/mrp_bom.py:254
#, python-format
msgid "The Product Unit of Measure you chose has a different category than in the product form."
msgstr ""
@@ -2531,6 +2607,11 @@ msgstr ""
msgid "The components of 1st operation"
msgstr ""
#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_document_res_model
msgid "The database object this attachment will be attached to."
msgstr ""
#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_production_routing_id
msgid "The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production planning."
@@ -2566,6 +2647,11 @@ msgstr ""
msgid "The quantity to produce must be positive!"
msgstr ""
#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_document_res_id
msgid "The record id this is attached to."
msgstr ""
#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_routing_workcenter_routing_id
msgid "The routing contains all the Work Centers used and for how long. This will create work orders afterwardswhich alters the execution of the manufacturing order. "
@@ -2609,7 +2695,7 @@ msgid "Time Tracking"
msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_workorder.py:367
#: code:addons/mrp/models/mrp_workorder.py:368
#, python-format
msgid "Time Tracking: "
msgstr ""
@@ -2731,6 +2817,11 @@ msgstr ""
msgid "Tracking"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document_type
msgid "Type"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
msgid "Unblock"
@@ -2820,11 +2911,16 @@ msgstr ""
msgid "Urgent"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document_url
msgid "Url"
msgstr ""
#. module: mrp
#: model:ir.actions.act_window,help:mrp.mrp_message_action_main
msgid "Use messages to warn manufacturing or inventory people about any change in the\n"
" products, process, or actions to take care of. (e.g; Warning, the bill of material changed,\n"
" check the details in new worksheet)"
msgid "Use messages to warn users about any change in the products,\n"
" process, or actions to take care of. (e.g; Warning, the bill\n"
" of material changed, check the details in new worksheet)"
msgstr ""
#. module: mrp
@@ -2856,7 +2952,7 @@ msgid "Variants"
msgstr ""
#. module: mrp
#: selection:ir.attachment,priority:0
#: selection:mrp.document,priority:0
msgid "Very High"
msgstr ""
@@ -2884,7 +2980,7 @@ msgstr ""
#. module: mrp
#. openerp-web
#: code:addons/mrp/static/src/js/mrp.js:24
#: code:addons/mrp/static/src/js/mrp.js:146
#, python-format
msgid "Waiting Materials"
msgstr ""
@@ -2896,7 +2992,7 @@ msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_bom.py:77
#: code:addons/mrp/models/mrp_bom.py:232
#: code:addons/mrp/models/mrp_bom.py:254
#, python-format
msgid "Warning"
msgstr ""
@@ -3002,6 +3098,12 @@ msgstr ""
msgid "Work Order"
msgstr ""
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_message_action_main
#: model:ir.ui.menu,name:mrp.mrp_message_menu
msgid "Work Order Messages"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.view_mrp_config
msgid "Work Order Operations allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials."
@@ -3062,7 +3164,7 @@ msgid "Work Sheet"
msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_production.py:536
#: code:addons/mrp/models/mrp_production.py:547
#, python-format
msgid "Work order %s is still running"
msgstr ""
@@ -3112,19 +3214,18 @@ msgstr ""
msgid "Workorder Message"
msgstr ""
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_message_action_main
#: model:ir.ui.menu,name:mrp.mrp_message_menu
msgid "Workorder Messages"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_worksheet
msgid "Worksheet"
msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_production.py:475
#: model:ir.model.fields,help:mrp.field_mrp_document_type
msgid "You can either upload a file from your computer or copy/paste an internet link to your file."
msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_production.py:483
#, python-format
msgid "You can not cancel production order, a work order is still in progress."
msgstr ""
@@ -3167,19 +3268,19 @@ msgid "You have already processed %d. Please input a quantity higher than %d "
msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_workorder.py:357
#: code:addons/mrp/models/mrp_workorder.py:358
#, python-format
msgid "You need to define at least one productivity loss in the category 'Performance'. Create one from the Manufacturing app, menu: Configuration / Productivity Losses."
msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_workorder.py:353
#: code:addons/mrp/models/mrp_workorder.py:354
#, python-format
msgid "You need to define at least one productivity loss in the category 'Productivity'. Create one from the Manufacturing app, menu: Configuration / Productivity Losses."
msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_workorder.py:406
#: code:addons/mrp/models/mrp_workorder.py:412
#, python-format
msgid "You need to define at least one unactive productivity loss in the category 'Performance'. Create one from the Manufacturing app, menu: Configuration / Productivity Losses."
msgstr ""
@@ -3230,11 +3331,6 @@ msgstr ""
msgid "hour(s)"
msgstr ""
#. module: mrp
#: model:ir.model,name:mrp.model_ir_attachment
msgid "ir.attachment"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_routing_workcenter_form_view
msgid "last"
@@ -3262,6 +3358,11 @@ msgstr ""
msgid "mrp.config.settings"
msgstr ""
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_document
msgid "mrp.document"
msgstr ""
#. module: mrp
#: model:ir.model,name:mrp.model_report_mrp_report_mrpbomstructure
msgid "report.mrp.report_mrpbomstructure"
addons/mrp/views/mrp_bom_views.xml
+1 -1
View File
@@ -47,7 +47,7 @@
<button name="action_see_attachments" type="object" icon="fa-file" attrs="{'invisible': [('has_attachments', '=', True)]}"/>
<field name="product_qty"/>
<field name="product_uom_id" options="{'no_open':True,'no_create':True}" groups="product.group_uom"/>
<field name="attribute_value_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('product_ids.product_tmpl_id', '=', parent.product_tmpl_id)]" groups="product.group_product_variant"/>
<field name="attribute_value_ids" widget="many2many_tags" options="{'no_create': True}" domain="[('product_ids.product_tmpl_id', '=', parent.product_tmpl_id)]" groups="product.group_product_variant"/>
<field name="operation_id" groups="mrp.group_mrp_routings" domain="[('routing_id', '=', parent.routing_id)]" options="{'no_quick_create':True,'no_create_edit':True}"/>
</tree>
</field>
addons/mrp_repair/i18n/mrp_repair.pot
+97 -62
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:47+0000\n"
"PO-Revision-Date: 2017-04-18 14:47+0000\n"
"POT-Creation-Date: 2017-07-25 10:05+0000\n"
"PO-Revision-Date: 2017-07-25 10:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,16 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: mrp_repair
#: model:mail.template,report_name:mrp_repair.mail_template_mrp_repair_quotation
msgid "${(object.name or '').replace('/','_')}"
msgstr ""
#. module: mrp_repair
#: model:mail.template,subject:mrp_repair.mail_template_mrp_repair_quotation
msgid "${object.partner_id.name} Repair Orders (Ref ${object.name or 'n/a' })"
msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
msgid "(<i>Remove</i>)"
@@ -35,6 +45,24 @@ msgid "* The 'Draft' status is used when a user is encoding a new and unconfirme
"* The 'Cancelled' status is used when user cancel repair order."
msgstr ""
#. module: mrp_repair
#: model:mail.template,body_html:mrp_repair.mail_template_mrp_repair_quotation
msgid "<?xml version=\"1.0\"?>\n"
"<data><p>Dear ${object.partner_id.name}</p>\n"
" <p>\n"
" Here is your repair order ${doc_name} <strong>${object.name}</strong>\n"
" % if object.origin:\n"
" (with reference: ${object.origin} )\n"
" % endif\n"
" % if object.invoice_method != 'none':\n"
" amounting in <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}.</strong>\n"
" % endif\n"
" </p>\n"
" <p>You can reply to this email if you have any questions.</p>\n"
" <p>Thank you,</p>\n"
" </data>"
msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
msgid "<i>(Add)</i>"
@@ -42,22 +70,17 @@ msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
msgid "<strong>Fees Line(s)</strong>"
msgid "<strong>Lot/Serial Number:</strong>"
msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
msgid "<strong>Guarantee Limit:</strong>"
msgid "<strong>Operations</strong>"
msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
msgid "<strong>Lot Number</strong>"
msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
msgid "<strong>Operation Line(s)</strong>"
msgid "<strong>Parts</strong>"
msgstr ""
#. module: mrp_repair
@@ -77,7 +100,7 @@ msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
msgid "<strong>Subtotal</strong>"
msgid "<strong>Total Without Taxes</strong>"
msgstr ""
#. module: mrp_repair
@@ -85,6 +108,11 @@ msgstr ""
msgid "<strong>Total</strong>"
msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
msgid "<strong>Warranty:</strong>"
msgstr ""
#. module: mrp_repair
#: selection:mrp.repair.line,type:0
msgid "Add"
@@ -105,11 +133,6 @@ msgstr ""
msgid "After Repair"
msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
msgid "Amount"
msgstr ""
#. module: mrp_repair
#: selection:mrp.repair,invoice_method:0
msgid "Before Repair"
@@ -180,8 +203,8 @@ msgid "Confirmed"
msgstr ""
#. module: mrp_repair
#: code:addons/mrp_repair/models/mrp_repair.py:511
#: code:addons/mrp_repair/models/mrp_repair.py:573
#: code:addons/mrp_repair/models/mrp_repair.py:544
#: code:addons/mrp_repair/models/mrp_repair.py:602
#, python-format
msgid "Couldn't find a pricelist line matching this product and quantity.\n"
"You have to change either the product, the quantity or the pricelist."
@@ -222,6 +245,11 @@ msgstr ""
msgid "Current Location"
msgstr ""
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_partner_id
msgid "Customer"
msgstr ""
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_default_address_id
msgid "Default Address"
@@ -284,7 +312,6 @@ msgid "Extra Info"
msgstr ""
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_fees_lines
#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
msgid "Fees"
msgstr ""
@@ -342,6 +369,7 @@ msgstr ""
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_invoice_id
#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
msgid "Invoice"
msgstr ""
@@ -371,6 +399,12 @@ msgstr ""
msgid "Invoice and shipping address:"
msgstr ""
#. module: mrp_repair
#: code:addons/mrp_repair/models/mrp_repair.py:361
#, python-format
msgid "Invoice created"
msgstr ""
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_fee_invoiced
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_invoiced
@@ -379,11 +413,6 @@ msgstr ""
msgid "Invoiced"
msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
msgid "Invoicing"
msgstr ""
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_partner_invoice_id
msgid "Invoicing Address"
@@ -418,7 +447,8 @@ msgstr ""
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_line_lot_id
msgid "Lot"
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_lot_id
msgid "Lot/Serial"
msgstr ""
#. module: mrp_repair
@@ -447,34 +477,34 @@ msgid "No Invoice"
msgstr ""
#. module: mrp_repair
#: code:addons/mrp_repair/models/mrp_repair.py:502
#: code:addons/mrp_repair/models/mrp_repair.py:564
#: code:addons/mrp_repair/models/mrp_repair.py:535
#: code:addons/mrp_repair/models/mrp_repair.py:593
#, python-format
msgid "No Pricelist!"
msgstr ""
#. module: mrp_repair
#: code:addons/mrp_repair/models/mrp_repair.py:260
#: code:addons/mrp_repair/models/mrp_repair.py:284
#, python-format
msgid "No account defined for partner \"%s\"."
msgstr ""
#. module: mrp_repair
#: code:addons/mrp_repair/models/mrp_repair.py:285
#: code:addons/mrp_repair/models/mrp_repair.py:313
#: code:addons/mrp_repair/models/mrp_repair.py:310
#: code:addons/mrp_repair/models/mrp_repair.py:338
#, python-format
msgid "No account defined for product \"%s\"."
msgstr ""
#. module: mrp_repair
#: code:addons/mrp_repair/models/mrp_repair.py:306
#: code:addons/mrp_repair/models/mrp_repair.py:331
#, python-format
msgid "No product defined on Fees!"
msgstr ""
#. module: mrp_repair
#: code:addons/mrp_repair/models/mrp_repair.py:509
#: code:addons/mrp_repair/models/mrp_repair.py:571
#: code:addons/mrp_repair/models/mrp_repair.py:542
#: code:addons/mrp_repair/models/mrp_repair.py:600
#, python-format
msgid "No valid pricelist line found !"
msgstr ""
@@ -485,11 +515,7 @@ msgid "Notes"
msgstr ""
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_operations
msgid "Operation Lines"
msgstr ""
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_fees_lines
#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
msgid "Operations"
msgstr ""
@@ -500,11 +526,21 @@ msgid "Overdue Activities"
msgstr ""
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_partner_id
#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form_filter
msgid "Partner"
msgstr ""
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_operations
#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
msgid "Parts"
msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
msgid "Price"
msgstr ""
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_pricelist_id
msgid "Pricelist"
@@ -515,6 +551,11 @@ msgstr ""
msgid "Pricelist of the selected partner."
msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
msgid "Print Quotation"
msgstr ""
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_fee_product_id
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_line_product_id
@@ -522,11 +563,6 @@ msgstr ""
msgid "Product"
msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
msgid "Product Information"
msgstr ""
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_product_qty
msgid "Product Quantity"
@@ -643,19 +679,19 @@ msgid "Repair must be canceled in order to reset it to draft."
msgstr ""
#. module: mrp_repair
#: code:addons/mrp_repair/models/mrp_repair.py:343
#: code:addons/mrp_repair/models/mrp_repair.py:380
#, python-format
msgid "Repair must be confirmed before starting reparation."
msgstr ""
#. module: mrp_repair
#: code:addons/mrp_repair/models/mrp_repair.py:371
#: code:addons/mrp_repair/models/mrp_repair.py:408
#, python-format
msgid "Repair must be repaired in order to make the product moves."
msgstr ""
#. module: mrp_repair
#: code:addons/mrp_repair/models/mrp_repair.py:354
#: code:addons/mrp_repair/models/mrp_repair.py:391
#, python-format
msgid "Repair must be under repair in order to end reparation."
msgstr ""
@@ -678,11 +714,6 @@ msgstr ""
msgid "Repaired"
msgstr ""
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_lot_id
msgid "Repaired Lot"
msgstr ""
#. module: mrp_repair
#: model:ir.ui.menu,name:mrp_repair.menu_repair_order
msgid "Repairs"
@@ -704,6 +735,11 @@ msgstr ""
msgid "Selecting 'Before Repair' or 'After Repair' will allow you to generate invoice before or after the repair is done respectively. 'No invoice' means you don't want to generate invoice for this repair order."
msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
msgid "Send Quotation"
msgstr ""
#. module: mrp_repair
#: code:addons/mrp_repair/models/mrp_repair.py:213
#, python-format
@@ -743,6 +779,11 @@ msgstr ""
msgid "Subtotal"
msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
msgid "Tax"
msgstr ""
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_amount_tax
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_fee_tax_id
@@ -779,12 +820,6 @@ msgstr ""
msgid "This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"
msgstr ""
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_fee_to_invoice
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_line_to_invoice
msgid "To Invoice"
msgstr ""
#. module: mrp_repair
#: selection:mrp.repair,state:0
msgid "To be Invoiced"
@@ -864,14 +899,14 @@ msgid "Yes"
msgstr ""
#. module: mrp_repair
#: code:addons/mrp_repair/models/mrp_repair.py:248
#: code:addons/mrp_repair/models/mrp_repair.py:272
#, python-format
msgid "You have to select a Partner Invoice Address in the repair form!"
msgstr ""
#. module: mrp_repair
#: code:addons/mrp_repair/models/mrp_repair.py:504
#: code:addons/mrp_repair/models/mrp_repair.py:566
#: code:addons/mrp_repair/models/mrp_repair.py:537
#: code:addons/mrp_repair/models/mrp_repair.py:595
#, python-format
msgid "You have to select a pricelist in the Repair form !\n"
" Please set one before choosing a product."
addons/mrp_repair/views/mrp_repair_views.xml
+4 -4
View File
@@ -89,7 +89,7 @@
</div>
<field name="type" invisible="1"/>
<field name="price_unit"/>
<field name="tax_id" widget="many2many_tags" options="{'color_field': 'color'}" domain="[('type_tax_use','=','sale')]"/>
<field name="tax_id" widget="many2many_tags" domain="[('type_tax_use','=','sale')]"/>
<field name="invoiced" invisible="1"/>
<field name="price_subtotal" widget="monetary" invisible="1"/>
</group>
@@ -117,7 +117,7 @@
<field name="product_uom_qty" string="Quantity"/>
<field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
<field name="price_unit"/>
<field name="tax_id" widget="many2many_tags" options="{'color_field': 'color'}"/>
<field name="tax_id" widget="many2many_tags"/>
<field name="price_subtotal" widget="monetary"/>
</tree>
</field>
@@ -146,7 +146,7 @@
<field name="product_uom" groups="product.group_uom"/>
</div>
<field name="price_unit"/>
<field widget="many2many_tags" options="{'color_field': 'color'}" name="tax_id" domain="[('type_tax_use','=','sale')]"/>
<field widget="many2many_tags" name="tax_id" domain="[('type_tax_use','=','sale')]"/>
<field name="price_subtotal" widget="monetary" invisible="1"/>
</group>
</form>
@@ -156,7 +156,7 @@
<field name="product_uom_qty" string="Quantity"/>
<field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
<field name="price_unit"/>
<field name="tax_id" domain="[('type_tax_use', '=', 'sale')]" widget="many2many_tags" options="{'color_field': 'color'}"/>
<field name="tax_id" domain="[('type_tax_use', '=', 'sale')]" widget="many2many_tags"/>
<field name="price_subtotal" widget="monetary"/>
</tree>
</field>
addons/pad/i18n/pad.pot
+16 -20
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~14\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-15 09:50+0000\n"
"PO-Revision-Date: 2017-02-15 09:50+0000\n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,31 +32,18 @@ msgstr ""
#. module: pad
#: model:ir.model.fields,help:pad.field_base_config_settings_pad_key
#: model:ir.model.fields,help:pad.field_hr_timesheet_config_settings_pad_key
#: model:ir.model.fields,help:pad.field_res_company_pad_key
msgid "Etherpad lite api key."
msgstr ""
#. module: pad
#: model:ir.model.fields,help:pad.field_base_config_settings_pad_server
#: model:ir.model.fields,help:pad.field_hr_timesheet_config_settings_pad_server
#: model:ir.model.fields,help:pad.field_res_company_pad_server
msgid "Etherpad lite server. Example: beta.primarypad.com"
msgstr ""
#. module: pad
#. openerp-web
#: code:addons/pad/static/src/js/pad.js:27
#, python-format
msgid "Exit full screen"
msgstr ""
#. module: pad
#. openerp-web
#: code:addons/pad/static/src/js/pad.js:27
#: code:addons/pad/static/src/xml/pad.xml:14
#, python-format
msgid "Full screen"
msgstr ""
#. module: pad
#: model:ir.model.fields,field_description:pad.field_pad_common_id
msgid "ID"
@@ -67,6 +54,13 @@ msgstr ""
msgid "Last Modified on"
msgstr ""
#. module: pad
#. openerp-web
#: code:addons/pad/static/src/js/pad.js:127
#, python-format
msgid "Loading"
msgstr ""
#. module: pad
#: model:ir.model.fields,field_description:pad.field_res_company_pad_key
msgid "Pad Api Key"
@@ -74,6 +68,7 @@ msgstr ""
#. module: pad
#: model:ir.model.fields,field_description:pad.field_base_config_settings_pad_key
#: model:ir.model.fields,field_description:pad.field_hr_timesheet_config_settings_pad_key
msgid "Pad Api Key *"
msgstr ""
@@ -84,6 +79,7 @@ msgstr ""
#. module: pad
#: model:ir.model.fields,field_description:pad.field_base_config_settings_pad_server
#: model:ir.model.fields,field_description:pad.field_hr_timesheet_config_settings_pad_server
msgid "Pad Server *"
msgstr ""
@@ -107,14 +103,14 @@ msgstr ""
#. module: pad
#. openerp-web
#: code:addons/pad/static/src/js/pad.js:55
#: code:addons/pad/static/src/js/pad.js:146
#, python-format
msgid "This pad will be initialized on first edit"
msgstr ""
#. module: pad
#. openerp-web
#: code:addons/pad/static/src/js/pad.js:52
#: code:addons/pad/static/src/js/pad.js:140
#, python-format
msgid "Unable to load pad"
msgstr ""
addons/pad/models/pad.py
+10
View File
@@ -119,6 +119,16 @@ class PadCommon(models.AbstractModel):
# Set the pad content in vals
def _set_pad_value(self, vals):
# Update the pad if the `pad_content_field` is modified
for k, field in pycompat.items(self._fields):
if hasattr(field, 'pad_content_field') and vals.get(field.pad_content_field):
company = self.env.user.sudo().company_id
myPad = EtherpadLiteClient(company.pad_key, company.pad_server + '/api')
path = self[k].split('/p/')[1]
myPad.setText(path, (html2plaintext(vals[field.pad_content_field]).encode('utf-8')))
# Update the `pad_content_field` if the pad is modified
for k, v in list(pycompat.items(vals)):
field = self._fields[k]
if hasattr(field, 'pad_content_field'):
addons/payment/i18n/payment.pot
+30 -18
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:46+0000\n"
"PO-Revision-Date: 2017-04-18 14:46+0000\n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -255,6 +255,7 @@ msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_res_partner_payment_token_count
#: model:ir.model.fields,field_description:payment.field_res_users_payment_token_count
msgid "Count Payment Token"
msgstr ""
@@ -334,11 +335,6 @@ msgstr ""
msgid "Display Name"
msgstr ""
#. module: payment
#: model:ir.model.fields,help:payment.field_account_journal_use_in_payment
msgid "Display this bank account on messages in payment process."
msgstr ""
#. module: payment
#: selection:payment.transaction,state:0
msgid "Done"
@@ -473,11 +469,6 @@ msgstr ""
msgid "Internal reference of the TX"
msgstr ""
#. module: payment
#: model:ir.model,name:payment.model_account_journal
msgid "Journal"
msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_transaction_partner_lang
msgid "Language"
@@ -603,6 +594,18 @@ msgstr ""
msgid "Ogone"
msgstr ""
#. module: payment
#: code:addons/payment/models/payment_acquirer.py:664
#, python-format
msgid "Only transactions in the Authorized status can be captured."
msgstr ""
#. module: payment
#: code:addons/payment/models/payment_acquirer.py:671
#, python-format
msgid "Only transactions in the Authorized status can be voided."
msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer_auto_confirm
msgid "Order Confirmation"
@@ -650,6 +653,7 @@ msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_res_partner_payment_token_ids
#: model:ir.model.fields,field_description:payment.field_res_users_payment_token_ids
#: model:ir.ui.view,arch_db:payment.payment_token_form_view
#: model:ir.ui.view,arch_db:payment.payment_token_tree_view
#: model:ir.ui.view,arch_db:payment.payment_token_view_search
@@ -823,6 +827,13 @@ msgstr ""
msgid "The payment transaction reference must be unique!"
msgstr ""
#. module: payment
#: code:addons/payment/models/account_payment.py:42
#, python-format
msgid "This feature is not available for payment acquirers set to the \"Authorize\" mode.\n"
"Please use a token from another provider than %s."
msgstr ""
#. module: payment
#: model:ir.model.fields,help:payment.field_payment_acquirer_image
msgid "This field holds the image used for this provider, limited to 1024x1024px"
@@ -839,6 +850,12 @@ msgid "This template renders the acquirer button with all necessary values.\n"
" It is rendered with qWeb with the following evaluation context:"
msgstr ""
#. module: payment
#: code:addons/payment/models/payment_acquirer.py:166
#, python-format
msgid "Transaction Authorization is not supported by this payment provider."
msgstr ""
#. module: payment
#: model:payment.acquirer,pre_msg:payment.payment_acquirer_transfer
msgid "Transfer information will be provided after choosing the payment method."
@@ -849,11 +866,6 @@ msgstr ""
msgid "Type"
msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_account_journal_use_in_payment
msgid "Use in payment"
msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_transaction_date_validate
msgid "Validation Date"
addons/payment_authorize/i18n/payment_authorize.pot
+6 -6
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~14\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-15 09:50+0000\n"
"PO-Revision-Date: 2017-02-15 09:50+0000\n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "API Transaction Key"
msgstr ""
#. module: payment_authorize
#: code:addons/payment_authorize/models/authorize_request.py:66
#: code:addons/payment_authorize/models/authorize_request.py:68
#, python-format
msgid "Authorize.net Error Message(s):\n"
" %s"
@@ -65,7 +65,7 @@ msgstr ""
#. module: payment_authorize
#: model:ir.ui.view,arch_db:payment_authorize.acquirer_form_authorize
msgid "How to configure your Authorize.Net account (look for Getting Started Guide) ?"
msgid "How to get paid with Authorize.Net"
msgstr ""
#. module: payment_authorize
@@ -89,7 +89,7 @@ msgid "Payment Transaction"
msgstr ""
#. module: payment_authorize
#: code:addons/payment_authorize/models/payment.py:347
#: code:addons/payment_authorize/models/payment.py:346
#, python-format
msgid "The Customer Profile creation in Authorize.NET failed."
msgstr ""
addons/phone_validation/i18n/phone_validation.pot
+78
View File
@@ -0,0 +1,78 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * phone_validation
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-25 10:05+0000\n"
"PO-Revision-Date: 2017-07-25 10:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: phone_validation
#: model:ir.model.fields,help:phone_validation.field_res_company_phone_international_format
msgid "Always encode phone numbers using international format. Otherwisenumbers coming from the company's country are nationaly formatted.International numbers are always using international format."
msgstr ""
#. module: phone_validation
#: model:ir.model,name:phone_validation.model_res_company
msgid "Companies"
msgstr ""
#. module: phone_validation
#: model:ir.model.fields,field_description:phone_validation.field_phone_validation_mixin_display_name
msgid "Display Name"
msgstr ""
#. module: phone_validation
#: model:ir.model.fields,field_description:phone_validation.field_res_company_phone_international_format
msgid "Enforce International Format"
msgstr ""
#. module: phone_validation
#: model:ir.model.fields,field_description:phone_validation.field_phone_validation_mixin_id
msgid "ID"
msgstr ""
#. module: phone_validation
#: code:addons/phone_validation/tools/phone_validation.py:23
#, python-format
msgid "Impossible number %s: probably invalid number of digits"
msgstr ""
#. module: phone_validation
#: code:addons/phone_validation/tools/phone_validation.py:25
#, python-format
msgid "Invalid number %s: probably incorrect prefix"
msgstr ""
#. module: phone_validation
#: model:ir.model.fields,field_description:phone_validation.field_phone_validation_mixin___last_update
msgid "Last Modified on"
msgstr ""
#. module: phone_validation
#: code:addons/phone_validation/tools/phone_validation.py:44
#, python-format
msgid "Unable to format %s:\n"
"%s"
msgstr ""
#. module: phone_validation
#: code:addons/phone_validation/tools/phone_validation.py:20
#, python-format
msgid "Unable to parse %s:\n"
"%s"
msgstr ""
#. module: phone_validation
#: model:ir.model,name:phone_validation.model_phone_validation_mixin
msgid "phone.validation.mixin"
msgstr ""
addons/point_of_sale/i18n/point_of_sale.pot
+489 -321
View File
File diff suppressed because it is too large Load Diff
addons/point_of_sale/static/src/xml/pos.xml
+6 -4
View File
@@ -1474,10 +1474,12 @@
</tr>
</t>
<tr>
<td>Discount:</td>
<td class="pos-right-align">
<t t-esc="widget.format_currency(order.get_total_discount())"/>
</td>
<t t-if="order.get_total_discount() > 0">
<td>Discount:</td>
<td class="pos-right-align">
<t t-esc="widget.format_currency(order.get_total_discount())"/>
</td>
</t>
</tr>
<tr class="emph">
<td>Total:</td>
addons/point_of_sale/views/pos_order_view.xml
+4 -4
View File
@@ -37,8 +37,8 @@
<field name="qty"/>
<field name="price_unit" widget="monetary"/>
<field name="discount" widget="monetary"/>
<field name="tax_ids_after_fiscal_position" widget="many2many_tags" options="{'color_field': 'color'}"/>
<field name="tax_ids" widget="many2many_tags" options="{'color_field': 'color'}" invisible="1"/>
<field name="tax_ids_after_fiscal_position" widget="many2many_tags"/>
<field name="tax_ids" widget="many2many_tags" invisible="1"/>
<field name="price_subtotal" widget="monetary"/>
<field name="price_subtotal_incl" widget="monetary"/>
</tree>
@@ -50,8 +50,8 @@
<field name="price_unit" widget="monetary"/>
<field name="price_subtotal" invisible="1" widget="monetary"/>
<field name="price_subtotal_incl" invisible="1" widget="monetary"/>
<field name="tax_ids_after_fiscal_position" widget="many2many_tags" options="{'color_field': 'color'}"/>
<field name="tax_ids" widget="many2many_tags" options="{'color_field': 'color'}" invisible="1"/>
<field name="tax_ids_after_fiscal_position" widget="many2many_tags"/>
<field name="tax_ids" widget="many2many_tags" invisible="1"/>
<field name="notice"/>
</group>
</form>
addons/pos_sale/i18n/pos_sale.pot
+9 -9
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~14\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-15 09:49+0000\n"
"PO-Revision-Date: 2017-02-15 09:49+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -74,6 +74,12 @@ msgstr ""
msgid "Sales Channel"
msgstr ""
#. module: pos_sale
#: code:addons/pos_sale/models/crm_team.py:115
#, python-format
msgid "Sales: Untaxed Amount"
msgstr ""
#. module: pos_sale
#: selection:crm.team,dashboard_graph_group_pos:0
msgid "Salesperson"
@@ -100,12 +106,6 @@ msgstr ""
msgid "This Point of sale's sales will be related to this Sales Channel."
msgstr ""
#. module: pos_sale
#: code:addons/pos_sale/models/crm_team.py:115
#, python-format
msgid "Untaxed Amount"
msgstr ""
#. module: pos_sale
#: selection:crm.team,dashboard_graph_group_pos:0
msgid "Week"
addons/product/i18n/product.pot
+53 -36
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:46+0000\n"
"PO-Revision-Date: 2017-04-18 14:46+0000\n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgid "%s %% discount and %s surcharge"
msgstr ""
#. module: product
#: code:addons/product/models/product_template.py:317
#: code:addons/product/models/product_template.py:327
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -94,9 +94,7 @@ msgid "<strong>Warning</strong>: adding or deleting attributes\n"
msgstr ""
#. module: product
#: code:addons/product/models/product.py:171
#: sql_constraint:product.product:0
#, python-format
msgid "A barcode can only be assigned to one product !"
msgstr ""
@@ -108,13 +106,13 @@ msgstr ""
#. module: product
#: model:ir.model.fields,help:product.field_product_product_description_sale
#: model:ir.model.fields,help:product.field_product_template_description_sale
msgid "A description of the Product that you want to communicate to your customers. This description will be copied to every Sales Order, Delivery Order and Customer Invoice/Refund"
msgid "A description of the Product that you want to communicate to your customers. This description will be copied to every Sales Order, Delivery Order and Customer Invoice/Credit Note"
msgstr ""
#. module: product
#: model:ir.model.fields,help:product.field_product_product_description_purchase
#: model:ir.model.fields,help:product.field_product_template_description_purchase
msgid "A description of the Product that you want to communicate to your vendors. This description will be copied to every Purchase Order, Receipt and Vendor Bill/Refund."
msgid "A description of the Product that you want to communicate to your vendors. This description will be copied to every Purchase Order, Receipt and Vendor Bill/Credit Note."
msgstr ""
#. module: product
@@ -388,6 +386,11 @@ msgstr ""
msgid "Company"
msgstr ""
#. module: product
#: model:ir.model.fields,field_description:product.field_product_category_complete_name
msgid "Complete Name"
msgstr ""
#. module: product
#: model:ir.model.fields,field_description:product.field_product_pricelist_item_compute_price
#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
@@ -395,7 +398,7 @@ msgid "Compute Price"
msgstr ""
#. module: product
#: code:addons/product/models/product_template.py:42
#: code:addons/product/models/product_template.py:52
#: selection:product.template,type:0
#, python-format
msgid "Consumable"
@@ -412,7 +415,7 @@ msgid "Conversion between Units of Measure can only occur if they belong to the
msgstr ""
#. module: product
#: code:addons/product/models/product_uom.py:96
#: code:addons/product/models/product_uom.py:98
#, python-format
msgid "Conversion from Product UoM %s to Default UoM %s is not possible as they both belong to different Category!."
msgstr ""
@@ -513,7 +516,7 @@ msgid "Day(s)"
msgstr ""
#. module: product
#: code:addons/product/models/res_company.py:58
#: code:addons/product/models/res_company.py:59
#, python-format
msgid "Default %(currency)s pricelist for %(company)s"
msgstr ""
@@ -601,7 +604,7 @@ msgid "Ending valid for the pricelist item validation"
msgstr ""
#. module: product
#: code:addons/product/models/product.py:43
#: code:addons/product/models/product.py:57
#, python-format
msgid "Error ! You cannot create recursive categories."
msgstr ""
@@ -613,7 +616,7 @@ msgid "Error ! You cannot use this attribute with the following value."
msgstr ""
#. module: product
#: code:addons/product/models/product.py:308
#: code:addons/product/models/product.py:286
#, python-format
msgid "Error! It is not allowed to choose more than one value for a given attribute."
msgstr ""
@@ -631,7 +634,7 @@ msgid "Error! You cannot assign the Main Pricelist as Other Pricelist in PriceLi
msgstr ""
#. module: product
#: code:addons/product/models/product_template.py:267
#: code:addons/product/models/product_template.py:277
#, python-format
msgid "Error: The default Unit of Measure and the purchase Unit of Measure must be in the same category."
msgstr ""
@@ -690,6 +693,12 @@ msgstr ""
msgid "Global"
msgstr ""
#. module: product
#: code:addons/product/models/product_template.py:32
#, python-format
msgid "Go to Internal Categories"
msgstr ""
#. module: product
#: model:ir.ui.view,arch_db:product.product_supplierinfo_search_view
msgid "Group By"
@@ -970,27 +979,18 @@ msgstr ""
msgid "Other Pricelist"
msgstr ""
#. module: product
#: model:ir.model.fields,field_description:product.field_product_packaging_name
msgid "Package Type"
msgstr ""
#. module: product
#: model:ir.model,name:product.model_product_packaging
#: model:ir.model.fields,field_description:product.field_product_product_packaging_ids
#: model:ir.model.fields,field_description:product.field_product_template_packaging_ids
#: model:ir.ui.view,arch_db:product.product_packaging_form_view
#: model:ir.ui.view,arch_db:product.product_packaging_tree_view
#: model:ir.ui.view,arch_db:product.product_template_form_view
#: model:ir.ui.view,arch_db:product.product_variant_easy_edit_view
msgid "Packaging"
msgstr ""
#. module: product
#: model:ir.model.fields,field_description:product.field_product_packaging_name
msgid "Packaging Type"
msgstr ""
#. module: product
#: model:ir.actions.act_window,name:product.action_packaging_view
msgid "Packagings"
msgstr ""
#. module: product
#: model:ir.model.fields,field_description:product.field_product_category_parent_id
msgid "Parent Category"
@@ -1197,6 +1197,19 @@ msgstr ""
msgid "Product Name"
msgstr ""
#. module: product
#: model:ir.actions.act_window,name:product.action_packaging_view
#: model:ir.model.fields,field_description:product.field_product_product_packaging_ids
#: model:ir.model.fields,field_description:product.field_product_template_packaging_ids
#: model:ir.ui.view,arch_db:product.product_packaging_tree_view
msgid "Product Packages"
msgstr ""
#. module: product
#: model:ir.ui.view,arch_db:product.product_packaging_form_view
msgid "Product Packaging"
msgstr ""
#. module: product
#: model:ir.model,name:product.model_product_template
#: model:ir.model.fields,field_description:product.field_product_attribute_line_product_tmpl_id
@@ -1272,7 +1285,7 @@ msgid "Products Price Search"
msgstr ""
#. module: product
#: code:addons/product/models/product.py:471
#: code:addons/product/models/product.py:449
#, python-format
msgid "Products: "
msgstr ""
@@ -1375,6 +1388,7 @@ msgstr ""
#. module: product
#: model:ir.model.fields,field_description:product.field_res_partner_property_product_pricelist
#: model:ir.model.fields,field_description:product.field_res_users_property_product_pricelist
msgid "Sale Pricelist"
msgstr ""
@@ -1412,7 +1426,7 @@ msgid "Sequence"
msgstr ""
#. module: product
#: code:addons/product/models/product_template.py:43
#: code:addons/product/models/product_template.py:53
#: selection:product.template,type:0
#, python-format
msgid "Service"
@@ -1534,9 +1548,7 @@ msgid "The computed quantity will be a multiple of this value. Use 1.0 for a Uni
msgstr ""
#. module: product
#: code:addons/product/models/product_uom.py:43
#: sql_constraint:product.uom:0
#, python-format
msgid "The conversion ratio for a unit of measure cannot be 0!"
msgstr ""
@@ -1582,9 +1594,7 @@ msgid "The product form contains information to simplify the sale process: price
msgstr ""
#. module: product
#: code:addons/product/models/product_uom.py:44
#: sql_constraint:product.uom:0
#, python-format
msgid "The rounding precision must be greater than 0!"
msgstr ""
@@ -1642,6 +1652,7 @@ msgstr ""
#. module: product
#: model:ir.model.fields,help:product.field_res_partner_property_product_pricelist
#: model:ir.model.fields,help:product.field_res_users_property_product_pricelist
msgid "This pricelist will be used, instead of the default one, for sales to the current partner"
msgstr ""
@@ -1843,7 +1854,7 @@ msgid "Working Time"
msgstr ""
#. module: product
#: code:addons/product/models/product_template.py:262
#: code:addons/product/models/product_template.py:272
#, python-format
msgid "You cannot create a product with an Internal Category set as View. Please change the category or the category type."
msgstr ""
@@ -1857,7 +1868,7 @@ msgstr ""
#. module: product
#: code:addons/product/wizard/product_price_list.py:26
#, python-format
msgid "You have to set a logo for your company."
msgid "You have to set a logo or a layout for your company."
msgstr ""
#. module: product
@@ -1886,6 +1897,12 @@ msgstr ""
msgid "You must define a product for everything you sell, whether it's a physical product, a consumable or a service you offer to customers."
msgstr ""
#. module: product
#: code:addons/product/models/product_template.py:31
#, python-format
msgid "You must define at least one product category (that is not a view) in order to be able to create products."
msgstr ""
#. module: product
#: model:ir.model,name:product.model_base_config_settings
msgid "base.config.settings"
addons/product/models/product.py
+1 -1
View File
@@ -79,7 +79,7 @@ class ProductProduct(models.Model):
_description = "Product"
_inherits = {'product.template': 'product_tmpl_id'}
_inherit = ['mail.thread']
_order = 'default_code, id'
_order = 'default_code, name, id'
price = fields.Float(
'Price', compute='_compute_product_price',
addons/project/i18n/project.pot
+28 -31
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:45+0000\n"
"PO-Revision-Date: 2017-04-18 14:45+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -137,6 +137,7 @@ msgstr ""
#. module: project
#: model:ir.model.fields,field_description:project.field_res_partner_task_count
#: model:ir.model.fields,field_description:project.field_res_users_task_count
msgid "# Tasks"
msgstr ""
@@ -151,8 +152,8 @@ msgid "# of Tasks"
msgstr ""
#. module: project
#: code:addons/project/models/project.py:242
#: code:addons/project/models/project.py:428
#: code:addons/project/models/project.py:244
#: code:addons/project/models/project.py:436
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -218,7 +219,7 @@ msgid "<i class=\"fa fa-user\"/> Person Responsible"
msgstr ""
#. module: project
#: code:addons/project/models/project.py:122
#: code:addons/project/models/project.py:124
#, python-format
msgid "<p class=\"oe_view_nocontent_create\">\n"
" Documents are attached to the tasks and issues of your project.</p><p>\n"
@@ -228,7 +229,7 @@ msgid "<p class=\"oe_view_nocontent_create\">\n"
msgstr ""
#. module: project
#: code:addons/project/models/project.py:150
#: code:addons/project/models/project.py:152
#, python-format
msgid "<p class=\"oe_view_nocontent_create\">Click to create a new project.</p>"
msgstr ""
@@ -268,11 +269,6 @@ msgstr ""
msgid "<span class=\"fa fa-thumbs-o-up\"/> The <strong>Right Way</strong> to use projects:"
msgstr ""
#. module: project
#: model:ir.ui.view,arch_db:project.view_project_kanban
msgid "<span class=\"o_label\">Documents</span>"
msgstr ""
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "<span class=\"panel-title\">\n"
@@ -905,7 +901,7 @@ msgid "At the end of the week, each employee should review\n"
msgstr ""
#. module: project
#: code:addons/project/models/project.py:115
#: code:addons/project/models/project.py:117
#: model:ir.model.fields,field_description:project.field_project_task_attachment_ids
#, python-format
msgid "Attachments"
@@ -1291,7 +1287,7 @@ msgid "Currently there are not any activity scheduled."
msgstr ""
#. module: project
#: code:addons/project/models/project.py:658
#: code:addons/project/models/project.py:666
#: model:ir.model.fields,field_description:project.field_project_project_partner_id
#: model:ir.model.fields,field_description:project.field_project_task_partner_id
#: model:ir.ui.view,arch_db:project.edit_project
@@ -1300,7 +1296,7 @@ msgid "Customer"
msgstr ""
#. module: project
#: code:addons/project/models/project.py:658
#: code:addons/project/models/project.py:666
#, python-format
msgid "Customer Email"
msgstr ""
@@ -1425,7 +1421,7 @@ msgstr ""
#. module: project
#. openerp-web
#: code:addons/project/static/src/js/project.js:50
#: code:addons/project/static/src/js/project.js:71
#: model:ir.ui.view,arch_db:project.project_project_view_form_simplified
#, python-format
msgid "Discard"
@@ -1545,7 +1541,7 @@ msgid "Ending Date"
msgstr ""
#. module: project
#: code:addons/project/models/project.py:436
#: code:addons/project/models/project.py:444
#, python-format
msgid "Error ! Task starting date must be lower than its ending date."
msgstr ""
@@ -1790,7 +1786,7 @@ msgid "Holds visibility of the tasks or issues that belong to the current projec
msgstr ""
#. module: project
#: code:addons/project/models/project.py:585
#: code:addons/project/models/project.py:593
#, python-format
msgid "I take it"
msgstr ""
@@ -2175,11 +2171,6 @@ msgstr ""
msgid "Merge into an existing task"
msgstr ""
#. module: project
#: model:ir.ui.view,arch_db:project.view_project_kanban
msgid "More <i class=\"fa fa-caret-down\"/>"
msgstr ""
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "More efficient communication between employees"
@@ -2195,6 +2186,11 @@ msgstr ""
msgid "My Favorites"
msgstr ""
#. module: project
#: model:ir.ui.view,arch_db:project.view_task_search_form
msgid "My Followed Tasks"
msgstr ""
#. module: project
#: model:ir.actions.act_window,name:project.project_task_action_activity
msgid "My Next Task Activities"
@@ -2297,7 +2293,7 @@ msgid "Odoo's project management allows you to manage the pipeline of your tasks
msgstr ""
#. module: project
#: code:addons/project/models/project.py:205
#: code:addons/project/models/project.py:207
#: selection:project.project,privacy_visibility:0
#, python-format
msgid "On invitation only"
@@ -2397,7 +2393,7 @@ msgid "Planner"
msgstr ""
#. module: project
#: code:addons/project/models/project.py:738
#: code:addons/project/models/project.py:746
#, python-format
msgid "Please remove existing tasks in the project linked to the accounts you want to delete."
msgstr ""
@@ -2625,7 +2621,7 @@ msgstr ""
#. module: project
#. openerp-web
#: code:addons/project/static/src/js/project.js:48
#: code:addons/project/static/src/js/project.js:69
#, python-format
msgid "Remove Cover Image"
msgstr ""
@@ -2704,7 +2700,7 @@ msgstr ""
#. module: project
#. openerp-web
#: code:addons/project/static/src/js/project.js:46
#: code:addons/project/static/src/js/project.js:62
#, python-format
msgid "Select"
msgstr ""
@@ -2743,7 +2739,7 @@ msgstr ""
#. module: project
#. openerp-web
#: code:addons/project/static/src/js/project.js:45
#: code:addons/project/static/src/js/project.js:61
#, python-format
msgid "Set a Cover Image"
msgstr ""
@@ -3003,6 +2999,7 @@ msgstr ""
#: model:ir.model.fields,field_description:project.field_project_project_task_ids
#: model:ir.model.fields,field_description:project.field_project_project_task_needaction_count
#: model:ir.model.fields,field_description:project.field_res_partner_task_ids
#: model:ir.model.fields,field_description:project.field_res_users_task_ids
#: model:ir.ui.menu,name:project.menu_action_view_task
#: model:ir.ui.view,arch_db:project.edit_project
#: model:ir.ui.view,arch_db:project.project_planner
@@ -3377,14 +3374,14 @@ msgid "View statistics for the week"
msgstr ""
#. module: project
#: code:addons/project/models/project.py:206
#: code:addons/project/models/project.py:208
#: selection:project.project,privacy_visibility:0
#, python-format
msgid "Visible by all employees"
msgstr ""
#. module: project
#: code:addons/project/models/project.py:207
#: code:addons/project/models/project.py:209
#: selection:project.project,privacy_visibility:0
#, python-format
msgid "Visible by following customers"
@@ -3617,7 +3614,7 @@ msgid "send us an email"
msgstr ""
#. module: project
#: code:addons/project/models/project.py:484
#: code:addons/project/models/project.py:492
#, python-format
msgid "tasks"
msgstr ""
addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot
+120
View File
@@ -0,0 +1,120 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * project_timesheet_holidays
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: project_timesheet_holidays
#: model:ir.model,name:project_timesheet_holidays.model_account_analytic_line
msgid "Analytic Line"
msgstr ""
#. module: project_timesheet_holidays
#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_holidays_timesheet_ids
msgid "Analytic Lines"
msgstr ""
#. module: project_timesheet_holidays
#: model:ir.model,name:project_timesheet_holidays.model_res_company
msgid "Companies"
msgstr ""
#. module: project_timesheet_holidays
#: model:ir.model.fields,help:project_timesheet_holidays.field_hr_timesheet_config_settings_leave_timesheet_project_id
#: model:ir.model.fields,help:project_timesheet_holidays.field_res_company_leave_timesheet_project_id
msgid "Default project value for timesheet generated from leave type."
msgstr ""
#. module: project_timesheet_holidays
#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_holidays_status_timesheet_generate
msgid "Generate Timesheet"
msgstr ""
#. module: project_timesheet_holidays
#: model:ir.model.fields,help:project_timesheet_holidays.field_hr_holidays_status_timesheet_generate
msgid "If checked, when validating a leave, timesheet will be generated in the Vacation Project of the company."
msgstr ""
#. module: project_timesheet_holidays
#: code:addons/project_timesheet_holidays/models/res_company.py:33
#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_holidays_status_timesheet_project_id
#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_timesheet_config_settings_leave_timesheet_project_id
#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company_leave_timesheet_project_id
#, python-format
msgid "Internal Project"
msgstr ""
#. module: project_timesheet_holidays
#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_holidays_status_timesheet_task_id
msgid "Internal Task for timesheet"
msgstr ""
#. module: project_timesheet_holidays
#: model:ir.model,name:project_timesheet_holidays.model_hr_holidays
msgid "Leave"
msgstr ""
#. module: project_timesheet_holidays
#: model:ir.model.fields,field_description:project_timesheet_holidays.field_account_analytic_line_holiday_id
msgid "Leave Request"
msgstr ""
#. module: project_timesheet_holidays
#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_timesheet_config_settings_leave_timesheet_task_id
#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company_leave_timesheet_task_id
msgid "Leave Task"
msgstr ""
#. module: project_timesheet_holidays
#: model:ir.model,name:project_timesheet_holidays.model_hr_holidays_status
msgid "Leave Type"
msgstr ""
#. module: project_timesheet_holidays
#: code:addons/project_timesheet_holidays/models/res_company.py:43
#, python-format
msgid "Leaves"
msgstr ""
#. module: project_timesheet_holidays
#: model:ir.ui.view,arch_db:project_timesheet_holidays.timesheet_config_settings_view_form_inherit
msgid "Project"
msgstr ""
#. module: project_timesheet_holidays
#: model:ir.ui.view,arch_db:project_timesheet_holidays.timesheet_config_settings_view_form_inherit
msgid "Task"
msgstr ""
#. module: project_timesheet_holidays
#: model:ir.model.fields,help:project_timesheet_holidays.field_hr_holidays_status_timesheet_project_id
msgid "The project will contain the timesheet generated when a leave is validated."
msgstr ""
#. module: project_timesheet_holidays
#: model:ir.ui.view,arch_db:project_timesheet_holidays.hr_holiday_status_view_form_inherit
msgid "Timesheet"
msgstr ""
#. module: project_timesheet_holidays
#: code:addons/project_timesheet_holidays/models/account_analytic.py:16
#, python-format
msgid "You cannot delete timesheet lines attached to a leaves. Please cancel the leaves instead."
msgstr ""
#. module: project_timesheet_holidays
#: model:ir.model,name:project_timesheet_holidays.model_hr_timesheet_config_settings
msgid "hr.timesheet.config.settings"
msgstr ""
addons/purchase/i18n/purchase.pot
+35 -28
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:45+0000\n"
"PO-Revision-Date: 2017-04-18 14:45+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -72,7 +72,7 @@ msgid "\n"
msgstr ""
#. module: purchase
#: code:addons/purchase/models/stock.py:87
#: code:addons/purchase/models/stock.py:89
#, python-format
msgid " Buy"
msgstr ""
@@ -85,6 +85,7 @@ msgstr ""
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_res_partner_supplier_invoice_count
#: model:ir.model.fields,field_description:purchase.field_res_users_supplier_invoice_count
msgid "# Vendor Bills"
msgstr ""
@@ -100,6 +101,7 @@ msgstr ""
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_res_partner_purchase_order_count
#: model:ir.model.fields,field_description:purchase.field_res_users_purchase_order_count
msgid "# of Purchase Order"
msgstr ""
@@ -363,7 +365,7 @@ msgid "Billed Qty"
msgstr ""
#. module: purchase
#: code:addons/purchase/models/purchase.py:578
#: code:addons/purchase/models/purchase.py:579
#, python-format
msgid "Billed Quantity"
msgstr ""
@@ -391,8 +393,8 @@ msgid "Blocking Message"
msgstr ""
#. module: purchase
#: code:addons/purchase/models/purchase.py:835
#: code:addons/purchase/models/stock.py:81
#: code:addons/purchase/models/purchase.py:841
#: code:addons/purchase/models/stock.py:83
#: model:stock.location.route,name:purchase.route_warehouse0_buy
#, python-format
msgid "Buy"
@@ -419,13 +421,13 @@ msgid "Calls for tenders are used when you want to generate requests for quotati
msgstr ""
#. module: purchase
#: code:addons/purchase/models/purchase.py:851
#: code:addons/purchase/models/purchase.py:857
#, python-format
msgid "Can not cancel a procurement related to a purchase order. Please cancel the purchase order first."
msgstr ""
#. module: purchase
#: code:addons/purchase/models/stock.py:84
#: code:addons/purchase/models/stock.py:86
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -443,7 +445,7 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
#: code:addons/purchase/models/purchase.py:701
#: code:addons/purchase/models/purchase.py:707
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
@@ -682,7 +684,7 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
#: code:addons/purchase/models/purchase.py:556
#: code:addons/purchase/models/purchase.py:557
#, python-format
msgid "Extra line with %s "
msgstr ""
@@ -891,6 +893,7 @@ msgstr ""
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_res_partner_purchase_warn_msg
#: model:ir.model.fields,field_description:purchase.field_res_users_purchase_warn_msg
msgid "Message for Purchase Order"
msgstr ""
@@ -932,11 +935,6 @@ msgstr ""
msgid "My Activities"
msgstr ""
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
msgid "New Mail"
msgstr ""
#. module: purchase
#: selection:product.template,purchase_line_warn:0
#: selection:res.partner,purchase_warn:0
@@ -949,7 +947,7 @@ msgid "No longer edit orders once confirmed"
msgstr ""
#. module: purchase
#: code:addons/purchase/models/purchase.py:996
#: code:addons/purchase/models/purchase.py:1018
#, python-format
msgid "No vendor associated to product %s. Please set one to fix this procurement."
msgstr ""
@@ -1022,7 +1020,7 @@ msgid "Order of Day"
msgstr ""
#. module: purchase
#: code:addons/purchase/models/purchase.py:575
#: code:addons/purchase/models/purchase.py:576
#, python-format
msgid "Ordered Quantity"
msgstr ""
@@ -1033,7 +1031,7 @@ msgid "Ordered quantities"
msgstr ""
#. module: purchase
#: code:addons/purchase/models/purchase.py:808
#: code:addons/purchase/models/purchase.py:814
#, python-format
msgid "Ordered quantity decreased!"
msgstr ""
@@ -1211,6 +1209,7 @@ msgstr ""
#: model:ir.model.fields,field_description:purchase.field_account_invoice_line_purchase_id
#: model:ir.model.fields,field_description:purchase.field_procurement_order_purchase_id
#: model:ir.model.fields,field_description:purchase.field_res_partner_purchase_warn
#: model:ir.model.fields,field_description:purchase.field_res_users_purchase_warn
#: model:ir.ui.view,arch_db:purchase.purchase_order_form
#: model:ir.ui.view,arch_db:purchase.purchase_order_graph
#: model:ir.ui.view,arch_db:purchase.purchase_order_pivot
@@ -1282,7 +1281,7 @@ msgid "Purchase Orders Statistics"
msgstr ""
#. module: purchase
#: code:addons/purchase/models/purchase.py:703
#: code:addons/purchase/models/purchase.py:709
#, python-format
msgid "Purchase order line deleted."
msgstr ""
@@ -1394,7 +1393,7 @@ msgid "Received Qty"
msgstr ""
#. module: purchase
#: code:addons/purchase/models/purchase.py:577
#: code:addons/purchase/models/purchase.py:578
#, python-format
msgid "Received Quantity"
msgstr ""
@@ -1518,6 +1517,7 @@ msgstr ""
#: model:ir.model.fields,help:purchase.field_product_product_purchase_line_warn
#: model:ir.model.fields,help:purchase.field_product_template_purchase_line_warn
#: model:ir.model.fields,help:purchase.field_res_partner_purchase_warn
#: model:ir.model.fields,help:purchase.field_res_users_purchase_warn
msgid "Selecting the \"Warning\" option will notify user with the message, Selecting \"Blocking Message\" will throw an exception with the message and block the flow. The Message has to be written in the next field."
msgstr ""
@@ -1611,6 +1611,7 @@ msgstr ""
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_res_partner_property_purchase_currency_id
#: model:ir.model.fields,field_description:purchase.field_res_users_property_purchase_currency_id
msgid "Supplier Currency"
msgstr ""
@@ -1637,7 +1638,7 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
#: code:addons/purchase/models/purchase.py:571
#: code:addons/purchase/models/purchase.py:572
#, python-format
msgid "The ordered quantity has been decreased. Do not forget to take it into account on your bills and receipts."
msgstr ""
@@ -1693,6 +1694,7 @@ msgstr ""
#. module: purchase
#: model:ir.model.fields,help:purchase.field_res_partner_property_purchase_currency_id
#: model:ir.model.fields,help:purchase.field_res_users_property_purchase_currency_id
msgid "This currency will be used, instead of the default one, for purchases from the current partner"
msgstr ""
@@ -1708,25 +1710,25 @@ msgid "This note will be displayed for vendors."
msgstr ""
#. module: purchase
#: code:addons/purchase/models/purchase.py:1024
#: code:addons/purchase/models/purchase.py:1035
#, python-format
msgid "This purchase order has been created from: <a href=# data-oe-model=procurement.order data-oe-id=%d>%s</a>"
msgstr ""
#. module: purchase
#: code:addons/purchase/models/purchase.py:1037
#: code:addons/purchase/models/purchase.py:1048
#, python-format
msgid "This purchase order has been modified from: <a href=# data-oe-model=procurement.order data-oe-id=%d>%s</a>"
msgstr ""
#. module: purchase
#: code:addons/purchase/models/account_invoice.py:197
#: code:addons/purchase/models/account_invoice.py:200
#, python-format
msgid "This vendor bill has been created from: %s"
msgstr ""
#. module: purchase
#: code:addons/purchase/models/account_invoice.py:211
#: code:addons/purchase/models/account_invoice.py:214
#, python-format
msgid "This vendor bill has been modified from: %s"
msgstr ""
@@ -1813,6 +1815,11 @@ msgstr ""
msgid "Unlock"
msgstr ""
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
msgid "Unread Messages"
msgstr ""
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.purchase_order_tree
msgid "Untaxed"
@@ -1935,7 +1942,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/models/purchase.py:253
#: code:addons/purchase/models/purchase.py:769
#: code:addons/purchase/models/purchase.py:775
#, python-format
msgid "Warning for %s"
msgstr ""
@@ -1961,7 +1968,7 @@ msgid "When products are bought, they can be delivered to this warehouse"
msgstr ""
#. module: purchase
#: code:addons/purchase/models/purchase.py:809
#: code:addons/purchase/models/purchase.py:815
#, python-format
msgid "You are decreasing the ordered quantity!\n"
"You must update the quantities on the reception and/or bills."
addons/purchase/models/purchase.py
+20
View File
@@ -232,6 +232,14 @@ class PurchaseOrder(models.Model):
self.currency_id = self.partner_id.property_purchase_currency_id.id or self.env.user.company_id.currency_id.id
return {}
@api.onchange('fiscal_position_id')
def _compute_tax_id(self):
"""
Trigger the recompute of the taxes if the fiscal position is changed on the PO.
"""
for order in self:
order.order_line._compute_tax_id()
@api.onchange('partner_id')
def onchange_partner_id_warning(self):
if not self.partner_id:
@@ -407,6 +415,10 @@ class PurchaseOrder(models.Model):
picking = pickings[0]
moves = order.order_line._create_stock_moves(picking)
moves = moves.filtered(lambda x: x.state not in ('done', 'cancel')).action_confirm()
seq = 0
for move in moves:
seq += 5
move.sequence = seq
moves.action_assign()
picking.message_post_with_view('mail.message_origin_link',
values={'self': picking, 'origin': order},
@@ -517,6 +529,14 @@ class PurchaseOrderLine(models.Model):
'price_subtotal': taxes['total_excluded'],
})
@api.multi
def _compute_tax_id(self):
for line in self:
fpos = line.order_id.fiscal_position_id or line.order_id.partner_id.property_account_position_id
# If company_id is set, always filter taxes by the company
taxes = line.product_id.supplier_taxes_id.filtered(lambda r: not line.company_id or r.company_id == line.company_id)
line.taxes_id = fpos.map_tax(taxes, line.product_id, line.order_id.partner_id) if fpos else taxes
@api.depends('invoice_lines.invoice_id.state', 'invoice_lines.quantity')
def _compute_qty_invoiced(self):
for line in self:
addons/purchase/views/purchase_views.xml
+3 -3
View File
@@ -221,7 +221,7 @@
<field name="qty_invoiced" invisible="not context.get('show_purchase', True)"/>
<field name="product_uom" groups="product.group_uom" attrs="{'readonly': [('state', 'in', ('purchase', 'done', 'cancel'))]}"/>
<field name="price_unit"/>
<field name="taxes_id" widget="many2many_tags" domain="[('type_tax_use','=','purchase')]" context="{'default_type_tax_use': 'purchase'}" options="{'no_create': True, 'color_field': 'color'}"/>
<field name="taxes_id" widget="many2many_tags" domain="[('type_tax_use','=','purchase')]" context="{'default_type_tax_use': 'purchase'}" options="{'no_create': True}"/>
<field name="price_subtotal" widget="monetary"/>
</tree>
<form string="Purchase Order Line">
@@ -239,7 +239,7 @@
<field name="price_unit"/>
</group>
<group>
<field name="taxes_id" widget="many2many_tags" domain="[('type_tax_use', '=', 'purchase')]" options="{'no_create': True, 'color_field': 'color'}"/>
<field name="taxes_id" widget="many2many_tags" domain="[('type_tax_use', '=', 'purchase')]" options="{'no_create': True}"/>
<field name="date_planned" widget="date"/>
<field name="account_analytic_id" colspan="2" groups="purchase.group_analytic_accounting"/>
<field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
@@ -611,7 +611,7 @@
<field name="property_account_expense_id" domain="[('deprecated','=',False)]" attrs="{'readonly': [('purchase_ok', '=', 0)]}"/>
</field>
<field name='supplier_taxes_id' position="replace" >
<field name="supplier_taxes_id" colspan="2" widget="many2many_tags" options="{'color_field': 'color'}" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
<field name="supplier_taxes_id" colspan="2" widget="many2many_tags" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
</field>
</field>
</record>
addons/report_intrastat/i18n/report_intrastat.pot
+11 -9
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:46+0000\n"
"PO-Revision-Date: 2017-04-18 14:46+0000\n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,11 @@ msgstr ""
msgid "Country code"
msgstr ""
#. module: report_intrastat
#: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
msgid "Credit Note"
msgstr ""
#. module: report_intrastat
#: model:ir.model.fields,field_description:report_intrastat.field_report_intrastat_currency_id
msgid "Currency"
@@ -167,6 +172,8 @@ msgstr ""
#. module: report_intrastat
#: model:ir.model,name:report_intrastat.model_report_intrastat_code
#: model:ir.model.fields,field_description:report_intrastat.field_delivery_carrier_intrastat_id
#: model:ir.model.fields,field_description:report_intrastat.field_product_product_intrastat_id
#: model:ir.model.fields,field_description:report_intrastat.field_product_template_intrastat_id
#: model:ir.model.fields,field_description:report_intrastat.field_report_intrastat_intrastat_id
#: model:ir.ui.view,arch_db:report_intrastat.view_report_intrastat_code_tree
@@ -243,11 +250,6 @@ msgstr ""
msgid "Quantity"
msgstr ""
#. module: report_intrastat
#: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
msgid "Refund"
msgstr ""
#. module: report_intrastat
#: selection:report.intrastat,month:0
msgid "September"
@@ -300,7 +302,7 @@ msgstr ""
#. module: report_intrastat
#: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
msgid "Vendor Refund"
msgid "Vendor Credit Note"
msgstr ""
#. module: report_intrastat
addons/report_intrastat/report/report_intrastat_invoice_template.xml
+4
View File
@@ -129,6 +129,10 @@
</p>
<p t-if="o.fiscal_position_id">
<strong>Fiscal Position:</strong>
<span t-field="o.fiscal_position_id"/>
</p>
<p t-if="o.fiscal_position_id.note">
<strong>Fiscal Position Remark:</strong>
<span t-field="o.fiscal_position_id.note"/>
</p>
</div>
addons/resource/i18n/resource.pot
+10 -51
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:46+0000\n"
"PO-Revision-Date: 2017-04-18 14:46+0000\n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: resource
#: code:addons/resource/models/resource.py:666
#: code:addons/resource/models/resource.py:691
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -26,11 +26,6 @@ msgstr ""
msgid "Active"
msgstr ""
#. module: resource
#: model:ir.model.fields,help:resource.field_res_users_country_enforce_cities
msgid "Check this box to ensure every address created in that country has a 'City' chosen in the list of the country's cities."
msgstr ""
#. module: resource
#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
msgid "Closing Days"
@@ -44,7 +39,6 @@ msgstr ""
#. module: resource
#: model:ir.model.fields,field_description:resource.field_hr_employee_company_id
#: model:ir.model.fields,field_description:resource.field_mrp_workcenter_company_id
#: model:ir.model.fields,field_description:resource.field_res_users_city_id
#: model:ir.model.fields,field_description:resource.field_resource_calendar_company_id
#: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves_company_id
#: model:ir.model.fields,field_description:resource.field_resource_mixin_company_id
@@ -109,11 +103,6 @@ msgstr ""
msgid "Display Name"
msgstr ""
#. module: resource
#: model:ir.model.fields,field_description:resource.field_res_users_street_number2
msgid "Door Number"
msgstr ""
#. module: resource
#: model:ir.model.fields,field_description:resource.field_resource_resource_time_efficiency
msgid "Efficiency Factor"
@@ -126,12 +115,7 @@ msgid "End Date"
msgstr ""
#. module: resource
#: model:ir.model.fields,field_description:resource.field_res_users_country_enforce_cities
msgid "Enforce Cities"
msgstr ""
#. module: resource
#: code:addons/resource/models/resource.py:697
#: code:addons/resource/models/resource.py:722
#, python-format
msgid "Error! leave start-date must be lower then leave end-date."
msgstr ""
@@ -153,21 +137,6 @@ msgstr ""
msgid "Friday Morning"
msgstr ""
#. module: resource
#: model:ir.model.fields,field_description:resource.field_res_users_partner_latitude
msgid "Geo Latitude"
msgstr ""
#. module: resource
#: model:ir.model.fields,field_description:resource.field_res_users_partner_longitude
msgid "Geo Longitude"
msgstr ""
#. module: resource
#: model:ir.model.fields,field_description:resource.field_res_users_date_localization
msgid "Geolocation Date"
msgstr ""
#. module: resource
#: model:ir.model.fields,field_description:resource.field_resource_calendar_global_leave_ids
#: model:ir.ui.view,arch_db:resource.resource_calendar_form
@@ -185,11 +154,6 @@ msgstr ""
msgid "Hours"
msgstr ""
#. module: resource
#: model:ir.model.fields,field_description:resource.field_res_users_street_number
msgid "House Number"
msgstr ""
#. module: resource
#: selection:resource.resource,resource_type:0
msgid "Human"
@@ -421,11 +385,6 @@ msgstr ""
msgid "Starting Date of Leave by Month"
msgstr ""
#. module: resource
#: model:ir.model.fields,field_description:resource.field_res_users_street_name
msgid "Street Name"
msgstr ""
#. module: resource
#: selection:resource.calendar.attendance,dayofweek:0
msgid "Sunday"
@@ -437,14 +396,14 @@ msgid "Test Resource Model"
msgstr ""
#. module: resource
#: model:ir.model.fields,help:resource.field_resource_resource_time_efficiency
msgid "This field is used to calculate the the expected duration of a work order at this work center. For example, if a work order takes one hour and the efficiency factor is 100%, then the expected duration will be one hour. If the efficiency factor is 200%, however the expected duration will be 30 minutes."
#: code:addons/resource/models/resource.py:677
#, python-format
msgid "The efficiency factor cannot be equal to 0."
msgstr ""
#. module: resource
#: code:addons/resource/models/resource.py:667
#, python-format
msgid "The efficiency factor cannot be equal to 0."
#: model:ir.model.fields,help:resource.field_resource_resource_time_efficiency
msgid "This field is used to calculate the the expected duration of a work order at this work center. For example, if a work order takes one hour and the efficiency factor is 100%, then the expected duration will be one hour. If the efficiency factor is 200%, however the expected duration will be 30 minutes."
msgstr ""
#. module: resource
addons/sale/i18n/sale.pot
+59 -44
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:45+0000\n"
"PO-Revision-Date: 2017-04-18 14:45+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,10 @@ msgstr ""
msgid "\n"
"<p>Dear ${object.partner_id.name}\n"
"% set access_action = object.with_context(force_website=True).get_access_action()\n"
"% set doc_name = 'quotation' if object.state in ('draft', 'sent') else 'order confirmation'\n"
"% set is_online = access_action and access_action['type'] == 'ir.actions.act_url'\n"
"% set access_name = is_online and object.template_id and 'Accept and pay %s online' % doc_name or 'View %s' % doc_name\n"
"% set access_url = is_online and access_action['url'] or ''\n"
"% set doc_name = 'quotation' if object.state in ('draft', 'sent') else 'order confirmation'\n"
"% set access_name = is_online and object.template_id and doc_name == 'quotation' and 'Accept and pay %s online' % doc_name or 'View %s' % doc_name\n"
"% set access_url = is_online and '/mail/view?model=sale.order&res_id=%d' % (object.id) or ''\n"
"\n"
"% if object.partner_id.parent_id:\n"
" (<i>${object.partner_id.parent_id.name}</i>)\n"
@@ -87,6 +87,7 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_partner_sale_order_count
#: model:ir.model.fields,field_description:sale.field_res_users_sale_order_count
msgid "# of Sales Order"
msgstr ""
@@ -118,7 +119,7 @@ msgstr ""
#. module: sale
#. openerp-web
#: code:addons/sale/static/src/js/tour.js:83
#: code:addons/sale/static/src/js/tour.js:85
#, python-format
msgid "<b>Invite salespeople or managers</b> via email.<br/><i>Enter one email per line.</i>"
msgstr ""
@@ -208,7 +209,7 @@ msgstr ""
#. module: sale
#. openerp-web
#: code:addons/sale/static/src/js/tour.js:64
#: code:addons/sale/static/src/js/tour.js:66
#, python-format
msgid "<p><b>Print this quotation.</b> If not yet done, you will be requested to set your company data and to select a document layout.</p>"
msgstr ""
@@ -282,7 +283,7 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,help:sale.field_sale_config_settings_group_stock_packaging
msgid "Ability to select a package type in sales orders and \n"
msgid "Ability to select a package type in sales orders and\n"
" to force a quantity that is a multiple of the number of units per package."
msgstr ""
@@ -317,7 +318,7 @@ msgid "Addresses in Sales Orders"
msgstr ""
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
#: code:addons/sale/wizard/sale_make_invoice_advance.py:156
#, python-format
msgid "Advance: %s"
msgstr ""
@@ -501,7 +502,7 @@ msgstr ""
#. module: sale
#. openerp-web
#: code:addons/sale/static/src/js/tour.js:79
#: code:addons/sale/static/src/js/tour.js:81
#, python-format
msgid "Configuration options are available in the Settings app."
msgstr ""
@@ -513,6 +514,7 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_confirmation_date
#: model:ir.model.fields,field_description:sale.field_sale_report_confirmation_date
msgid "Confirmation Date"
msgstr ""
@@ -547,7 +549,7 @@ msgstr ""
#. module: sale
#: selection:product.template,track_service:0
msgid "Create a task and track hours"
msgid "Create a task per order line to track hours"
msgstr ""
#. module: sale
@@ -555,11 +557,6 @@ msgstr ""
msgid "Create and View Invoices"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
msgid "Create new projects & tasks for sold services, record time spent and get delivered quantities updated in sales orders accordingly."
msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_create_uid
#: model:ir.model.fields,field_description:sale.field_sale_layout_category_create_uid
@@ -660,7 +657,7 @@ msgid "Delivered"
msgstr ""
#. module: sale
#: code:addons/sale/models/sale.py:724
#: code:addons/sale/models/sale.py:734
#: model:ir.ui.view,arch_db:sale.view_order_form
#, python-format
msgid "Delivered Quantity"
@@ -819,7 +816,7 @@ msgid "Extended Filters"
msgstr ""
#. module: sale
#: code:addons/sale/models/sale.py:697
#: code:addons/sale/models/sale.py:707
#, python-format
msgid "Extra line with %s "
msgstr ""
@@ -980,7 +977,7 @@ msgid "Invoiced"
msgstr ""
#. module: sale
#: code:addons/sale/models/sale.py:725
#: code:addons/sale/models/sale.py:735
#: model:ir.ui.view,arch_db:sale.view_order_form
#, python-format
msgid "Invoiced Quantity"
@@ -1015,6 +1012,12 @@ msgid "Invoices will be created in draft so that you can review\n"
" them before validation."
msgstr ""
#. module: sale
#: code:addons/sale/models/sales_team.py:96
#, python-format
msgid "Invoices: Untaxed Total"
msgstr ""
#. module: sale
#: model:ir.ui.menu,name:sale.menu_sale_invoicing
#: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban
@@ -1172,6 +1175,7 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_partner_sale_warn_msg
#: model:ir.model.fields,field_description:sale.field_res_users_sale_warn_msg
msgid "Message for Sales Order"
msgstr ""
@@ -1226,7 +1230,8 @@ msgstr ""
#. module: sale
#: code:addons/sale/models/sale.py:104
#: code:addons/sale/models/sale.py:255
#: code:addons/sale/models/sale.py:256
#: code:addons/sale/models/sale.py:257
#: code:addons/sale/models/sale.py:259
#, python-format
msgid "New"
msgstr ""
@@ -1301,7 +1306,7 @@ msgstr ""
#. module: sale
#. openerp-web
#: code:addons/sale/static/src/js/tour.js:59
#: code:addons/sale/static/src/js/tour.js:61
#, python-format
msgid "Once your quotation is ready, you can save, print or send it by email."
msgstr ""
@@ -1313,7 +1318,7 @@ msgstr ""
#. module: sale
#. openerp-web
#: code:addons/sale/static/src/js/sale.js:26
#: code:addons/sale/static/src/js/sale.js:32
#, python-format
msgid "Only Integer Value should be valid."
msgstr ""
@@ -1379,7 +1384,7 @@ msgid "Ordered Qty"
msgstr ""
#. module: sale
#: code:addons/sale/models/sale.py:722
#: code:addons/sale/models/sale.py:732
#: model:ir.ui.view,arch_db:sale.view_order_form
#, python-format
msgid "Ordered Quantity"
@@ -1471,13 +1476,13 @@ msgid "Personalize sales order and invoice report"
msgstr ""
#. module: sale
#: code:addons/sale/models/sale.py:286
#: code:addons/sale/models/sale.py:289
#, python-format
msgid "Please define an accounting sales journal for this company."
msgstr ""
#. module: sale
#: code:addons/sale/models/sale.py:807
#: code:addons/sale/models/sale.py:817
#, python-format
msgid "Please define income account for this product: \"%s\" (id:%d) - or for its category: \"%s\"."
msgstr ""
@@ -1539,7 +1544,6 @@ msgid "Print"
msgstr ""
#. module: sale
#: model:ir.actions.report.xml,name:sale.report_proforma_quotation
#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_proforma_sales
msgid "Pro-Forma"
msgstr ""
@@ -1690,7 +1694,7 @@ msgid "Quotation sent"
msgstr ""
#. module: sale
#: code:addons/sale/models/sales_team.py:106
#: code:addons/sale/models/sales_team.py:101
#: model:ir.actions.act_window,name:sale.action_quotations
#: model:ir.actions.act_window,name:sale.action_quotations_salesteams
#: model:ir.model.fields,field_description:sale.field_crm_team_use_quotations
@@ -1814,6 +1818,8 @@ msgstr ""
#: model:ir.model,name:sale.model_sale_order
#: model:ir.model.fields,field_description:sale.field_res_partner_sale_order_ids
#: model:ir.model.fields,field_description:sale.field_res_partner_sale_warn
#: model:ir.model.fields,field_description:sale.field_res_users_sale_order_ids
#: model:ir.model.fields,field_description:sale.field_res_users_sale_warn
#: model:ir.ui.view,arch_db:sale.view_order_form
#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
#: model:res.request.link,name:sale.req_link_sale_order
@@ -1856,7 +1862,7 @@ msgid "Sales Order Lines related to a Sales Order of mine"
msgstr ""
#. module: sale
#: code:addons/sale/models/sales_team.py:107
#: code:addons/sale/models/sales_team.py:102
#: model:ir.actions.act_window,name:sale.action_orders
#: model:ir.actions.act_window,name:sale.action_orders_salesteams
#: model:ir.actions.act_window,name:sale.action_orders_to_invoice_salesteams
@@ -1875,6 +1881,12 @@ msgstr ""
msgid "Sales Orders Statistics"
msgstr ""
#. module: sale
#: code:addons/sale/models/sales_team.py:94
#, python-format
msgid "Sales: Untaxed Total"
msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_line_salesman_id
#: model:ir.model.fields,field_description:sale.field_sale_order_user_id
@@ -1923,6 +1935,7 @@ msgstr ""
#: model:ir.model.fields,help:sale.field_product_product_sale_line_warn
#: model:ir.model.fields,help:sale.field_product_template_sale_line_warn
#: model:ir.model.fields,help:sale.field_res_partner_sale_warn
#: model:ir.model.fields,help:sale.field_res_users_sale_warn
msgid "Selecting the \"Warning\" option will notify user with the message, Selecting \"Blocking Message\" will throw an exception with the message and block the flow. The Message has to be written in the next field."
msgstr ""
@@ -1946,6 +1959,11 @@ msgstr ""
msgid "Sell products by multiple of unit # per package"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
msgid "Sell services (e.g. project, maintenance), record time spent using Timesheets app and invoice them based on a fixed price (ordered quantity) or on the time spent (delivered quantity)"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
msgid "Sell your products on eBay"
@@ -1994,7 +2012,7 @@ msgstr ""
#. module: sale
#. openerp-web
#: code:addons/sale/static/src/js/sale.js:19
#: code:addons/sale/static/src/js/sale.js:25
#, python-format
msgid "Set an invoicing target: "
msgstr ""
@@ -2196,7 +2214,7 @@ msgid "Terms and conditions"
msgstr ""
#. module: sale
#: code:addons/sale/models/sale_analytic.py:119
#: code:addons/sale/models/sale_analytic.py:112
#, python-format
msgid "The Sales Order %s linked to the Analytic Account must be validated before registering expenses."
msgstr ""
@@ -2218,19 +2236,19 @@ msgid "The margin is computed as the sum of product sales prices minus the cost
msgstr ""
#. module: sale
#: code:addons/sale/models/sale.py:718
#: code:addons/sale/models/sale.py:728
#, python-format
msgid "The ordered quantity has been decreased. Do not forget to take it into account on your invoices and delivery orders."
msgstr ""
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:147
#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
#, python-format
msgid "The product used to invoice a down payment should be of type 'Service'. Please use another product or update this product."
msgstr ""
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:145
#: code:addons/sale/wizard/sale_make_invoice_advance.py:147
#, python-format
msgid "The product used to invoice a down payment should have an invoice policy set to \"Ordered quantities\". Please update your deposit product to be able to create a deposit invoice."
msgstr ""
@@ -2253,8 +2271,8 @@ msgid "There is no income account defined for this product: \"%s\". You may have
msgstr ""
#. module: sale
#: code:addons/sale/models/sale.py:363
#: code:addons/sale/models/sale.py:367
#: code:addons/sale/models/sale.py:366
#: code:addons/sale/models/sale.py:370
#, python-format
msgid "There is no invoicable line."
msgstr ""
@@ -2290,7 +2308,7 @@ msgid "This report performs analysis on your sales orders. Analysis check your s
msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_timesheet_grid_sale
#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_sale_timesheet
#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
msgid "Timesheets"
msgstr ""
@@ -2393,10 +2411,7 @@ msgid "Untaxed Amount"
msgstr ""
#. module: sale
#: code:addons/sale/models/sales_team.py:99
#: code:addons/sale/models/sales_team.py:101
#: model:ir.model.fields,field_description:sale.field_sale_report_price_subtotal
#, python-format
msgid "Untaxed Total"
msgstr ""
@@ -2423,14 +2438,14 @@ msgstr ""
#. module: sale
#. openerp-web
#: code:addons/sale/static/src/js/tour.js:69
#: code:addons/sale/static/src/js/tour.js:71
#, python-format
msgid "Use the breadcrumbs to <b>go back to preceeding screens</b>."
msgstr ""
#. module: sale
#. openerp-web
#: code:addons/sale/static/src/js/tour.js:73
#: code:addons/sale/static/src/js/tour.js:75
#, python-format
msgid "Use this menu to access quotations, sales orders and customers."
msgstr ""
@@ -2492,7 +2507,7 @@ msgstr ""
#. module: sale
#. openerp-web
#: code:addons/sale/static/src/js/sale.js:26
#: code:addons/sale/static/src/js/sale.js:32
#, python-format
msgid "Wrong value entered!"
msgstr ""
@@ -2504,7 +2519,7 @@ msgid "You can not delete a sent quotation or a sales order! Try to cancel it be
msgstr ""
#. module: sale
#: code:addons/sale/models/sale.py:927
#: code:addons/sale/models/sale.py:940
#, python-format
msgid "You can not remove a sales order line.\n"
"Discard changes and try setting the quantity to 0."
addons/sale/models/sale.py
+5 -3
View File
@@ -547,12 +547,14 @@ class SaleOrder(models.Model):
for tax in line.tax_id:
group = tax.tax_group_id
res.setdefault(group, 0.0)
taxes = tax.compute_all(line.price_reduce + base_tax, quantity=line.product_uom_qty,
# FORWARD-PORT UP TO SAAS-17
price_reduce = line.price_unit * (1.0 - line.discount / 100.0)
taxes = tax.compute_all(price_reduce + base_tax, quantity=line.product_uom_qty,
product=line.product_id, partner=self.partner_shipping_id)['taxes']
for t in taxes:
res[group] += t['amount']
if tax.include_base_amount:
base_tax += tax.compute_all(line.price_reduce + base_tax, quantity=1, product=line.product_id,
base_tax += tax.compute_all(price_reduce + base_tax, quantity=1, product=line.product_id,
partner=self.partner_shipping_id)['taxes'][0]['amount']
res = sorted(pycompat.items(res), key=lambda l: l[0].sequence)
res = [(l[0].name, l[1]) for l in res]
@@ -962,7 +964,7 @@ class SaleOrderLine(models.Model):
lang=self.order_id.partner_id.lang,
partner=self.order_id.partner_id.id,
quantity=self.product_uom_qty,
date_order=self.order_id.date_order,
date=self.order_id.date_order,
pricelist=self.order_id.pricelist_id.id,
uom=self.product_uom.id,
fiscal_position=self.env.context.get('fiscal_position')
addons/sale/tests/test_product_id_change.py
+48
View File
@@ -68,3 +68,51 @@ class TestOnchangeProductId(TransactionCase):
so_line = so.order_line[0]
so_line.product_id_change()
self.assertEquals(100, so_line.price_unit, "The included tax must be subtracted to the price")
def test_pricelist_application(self):
""" Test different prices are correctly applied based on dates """
support_product = self.env.ref('product.product_product_2')
support_product.list_price = 100
partner = self.res_partner_model.create(dict(name="George"))
christmas_pricelist = self.env['product.pricelist'].create({
'name': 'Christmas pricelist',
'item_ids': [(0, 0, {
'date_start': "2017-12-01",
'date_end': "2017-12-24",
'compute_price': 'percentage',
'base': 'list_price',
'percent_price': 20,
'applied_on': '3_global',
'name': 'Pre-Christmas discount'
}), (0, 0, {
'date_start': "2017-12-25",
'date_end': "2017-12-31",
'compute_price': 'percentage',
'base': 'list_price',
'percent_price': 50,
'applied_on': '3_global',
'name': 'Post-Christmas super-discount'
})]
})
so = self.env['sale.order'].create({
'partner_id': partner.id,
'date_order': '2017-12-20',
'pricelist_id': christmas_pricelist.id,
})
order_line = self.env['sale.order.line'].new({
'order_id': so.id,
'product_id': support_product.id,
})
# force compute uom and prices
order_line.product_id_change()
order_line.product_uom_change()
self.assertEqual(order_line.price_unit, 80, "First date pricelist rule not applied")
so.date_order = '2017-12-30'
order_line.product_id_change()
self.assertEqual(order_line.price_unit, 50, "Second date pricelist rule not applied")
addons/sale/views/sale_views.xml
+2 -2
View File
@@ -242,7 +242,7 @@
</div>
</group>
<group>
<field name="tax_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('type_tax_use','=','sale'),('company_id','=',parent.company_id)]"
<field name="tax_id" widget="many2many_tags" options="{'no_create': True}" domain="[('type_tax_use','=','sale'),('company_id','=',parent.company_id)]"
attrs="{'readonly': [('qty_invoiced', '&gt;', 0)]}"/>
<label for="customer_lead"/>
<div>
@@ -286,7 +286,7 @@
<field name="analytic_tag_ids" groups="analytic.group_analytic_accounting" widget="many2many_tags" options="{'color_field': 'color'}"/>
<field name="price_unit"
attrs="{'readonly': [('qty_invoiced', '&gt;', 0)]}"/>
<field name="tax_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('type_tax_use','=','sale'),('company_id','=',parent.company_id)]"
<field name="tax_id" widget="many2many_tags" options="{'no_create': True}" domain="[('type_tax_use','=','sale'),('company_id','=',parent.company_id)]"
attrs="{'readonly': [('qty_invoiced', '&gt;', 0)]}"/>
<field name="discount" groups="sale.group_discount_per_so_line"/>
<field name="price_subtotal" widget="monetary" groups="sale.group_show_price_subtotal"/>
addons/sale_stock/i18n/sale_stock.pot
+18 -38
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:46+0000\n"
"PO-Revision-Date: 2017-04-18 14:46+0000\n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,13 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: sale_stock
#: code:addons/sale_stock/models/sale_order.py:148
#, python-format
msgid "\n"
"There are %s %s available accross all warehouses."
msgstr ""
#. module: sale_stock
#: model:ir.ui.view,arch_db:sale_stock.report_delivery_document_inherit_sale_stock
msgid "<strong>Customer Reference:</strong>"
@@ -139,7 +146,7 @@ msgid "Move forward expected delivery dates by"
msgstr ""
#. module: sale_stock
#: code:addons/sale_stock/models/sale_order.py:145
#: code:addons/sale_stock/models/sale_order.py:152
#, python-format
msgid "Not enough inventory!"
msgstr ""
@@ -150,14 +157,14 @@ msgid "Order-Specific Routes"
msgstr ""
#. module: sale_stock
#: code:addons/sale_stock/models/sale_order.py:156
#: code:addons/sale_stock/models/sale_order.py:162
#, python-format
msgid "Ordered quantity decreased!"
msgstr ""
#. module: sale_stock
#: model:ir.model.fields,field_description:sale_stock.field_sale_order_line_product_packaging
msgid "Packaging"
msgid "Package"
msgstr ""
#. module: sale_stock
@@ -185,11 +192,6 @@ msgstr ""
msgid "Reserving products manually in delivery orders or by running the scheduler is advised to better manage priorities in case of long customer lead times or/and frequent stock-outs. By default, the scheduler runs automatically every 24 hours."
msgstr ""
#. module: sale_stock
#: model:ir.model,name:sale_stock.model_stock_return_picking
msgid "Return Picking"
msgstr ""
#. module: sale_stock
#: model:ir.model.fields,field_description:sale_stock.field_sale_order_line_route_id
msgid "Route"
@@ -293,32 +295,16 @@ msgid "This allows to apply a special route on sales order lines (e.g. dropshipp
msgstr ""
#. module: sale_stock
#: code:addons/sale_stock/models/sale_order.py:203
#: code:addons/sale_stock/models/sale_order.py:209
#, python-format
msgid "This product is packaged by %.2f %s. You should sell %.2f %s."
msgstr ""
#. module: sale_stock
#: model:ir.model.fields,field_description:sale_stock.field_stock_return_picking_line_to_refund_so
msgid "To Refund"
msgstr ""
#. module: sale_stock
#: model:ir.model.fields,field_description:sale_stock.field_stock_move_to_refund_so
msgid "To Refund in SO"
msgstr ""
#. module: sale_stock
#: model:ir.model,name:sale_stock.model_stock_picking
msgid "Transfer"
msgstr ""
#. module: sale_stock
#: model:ir.model.fields,help:sale_stock.field_stock_move_to_refund_so
#: model:ir.model.fields,help:sale_stock.field_stock_return_picking_line_to_refund_so
msgid "Trigger a decrease of the delivered quantity in the associated Sales Order"
msgstr ""
#. module: sale_stock
#: model:ir.model.fields,field_description:sale_stock.field_sale_order_warehouse_id
#: model:ir.model.fields,field_description:sale_stock.field_sale_report_warehouse_id
@@ -326,7 +312,7 @@ msgid "Warehouse"
msgstr ""
#. module: sale_stock
#: code:addons/sale_stock/models/sale_order.py:202
#: code:addons/sale_stock/models/sale_order.py:208
#, python-format
msgid "Warning"
msgstr ""
@@ -342,16 +328,15 @@ msgid "When to start shipping"
msgstr ""
#. module: sale_stock
#: code:addons/sale_stock/models/sale_order.py:157
#: code:addons/sale_stock/models/sale_order.py:163
#, python-format
msgid "You are decreasing the ordered quantity! Do not forget to manually update the delivery order if needed."
msgstr ""
#. module: sale_stock
#: code:addons/sale_stock/models/sale_order.py:146
#: code:addons/sale_stock/models/sale_order.py:144
#, python-format
msgid "You plan to sell %s %s but you only have %s %s available!\n"
"The stock on hand is %s %s."
msgid "You plan to sell %s %s but you only have %s %s available in %s warehouse."
msgstr ""
#. module: sale_stock
@@ -369,8 +354,3 @@ msgstr ""
msgid "stock.config.settings"
msgstr ""
#. module: sale_stock
#: model:ir.model,name:sale_stock.model_stock_return_picking_line
msgid "stock.return.picking.line"
msgstr ""
addons/sale_stock/models/sale_order.py
+4 -3
View File
@@ -249,10 +249,11 @@ class SaleOrderLine(models.Model):
def _update_line_quantity(self, values):
if self.mapped('qty_delivered') and values['product_uom_qty'] < max(self.mapped('qty_delivered')):
raise UserError('You cannot decrease the ordered quantity below your delivered quantity.\n'
raise UserError('You cannot decrease the ordered quantity below the delivered quantity.\n'
'Create a return first.')
for line in self:
pickings = self.order_id.picking_ids.filtered(lambda p: p.state not in ('done', 'cancel'))
pickings.message_post("The quantity of %s has been updated from %d to %d in %s" %
(line.product_id.name, line.product_uom_qty, values['product_uom_qty'], self.order_id.name))
for picking in pickings:
picking.message_post("The quantity of %s has been updated from %d to %d in %s" %
(line.product_id.name, line.product_uom_qty, values['product_uom_qty'], self.order_id.name))
super(SaleOrderLine, self)._update_line_quantity(values)
addons/sale_timesheet/i18n/sale_timesheet.pot
+226 -34
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~14\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-15 09:50+0000\n"
"PO-Revision-Date: 2017-02-15 09:50+0000\n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,35 @@ msgstr ""
"Plural-Forms: \n"
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_hr_employee_account_id
msgid "Account"
#: code:addons/sale_timesheet/models/account_invoice.py:32
#: code:addons/sale_timesheet/models/project.py:24
#, python-format
msgid "\n"
" <p class=\"oe_view_nocontent_create\">\n"
" Click to record timesheets.\n"
" </p><p>\n"
" You can register and track your workings hours by project every\n"
" day. Every time spent on a project will become a cost and can be re-invoiced to\n"
" customers if required.\n"
" </p>\n"
" "
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "<b>Total</b>"
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "<span class=\"badge o_progress_billable_fixed\">Billable fixed</span>\n"
" <span class=\"badge o_progress_billable_time\">Billable time</span>\n"
" <span class=\"badge o_progress_non_billable\">Non billable</span>"
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.project_project_view_kanban_inherit_sale_timesheet
msgid "<span class=\"o_label\">Overview</span>"
msgstr ""
#. module: sale_timesheet
@@ -30,40 +57,118 @@ msgstr ""
msgid "Assign to Order"
msgstr ""
#. module: sale_timesheet
#: selection:account.analytic.line,timesheet_invoice_type:0
msgid "Billable Fixed"
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_view_search
msgid "Billable Hours"
msgstr ""
#. module: sale_timesheet
#: selection:account.analytic.line,timesheet_invoice_type:0
msgid "Billable Time"
msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_account_analytic_line_timesheet_invoice_type
msgid "Billable Type"
msgstr ""
#. module: sale_timesheet
#: model:ir.filters,name:sale_timesheet.timesheet_filter_billing
msgid "Billing Rate"
msgstr ""
#. module: sale_timesheet
#: model:ir.actions.act_window,name:sale_timesheet.timesheet_action_billing_report
#: model:ir.ui.menu,name:sale_timesheet.menu_timesheet_billing_analysis
msgid "Billing Rate Analysis"
msgstr ""
#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_res_company
msgid "Companies"
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "Cost"
msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,help:sale_timesheet.field_product_product_project_id
#: model:ir.model.fields,help:sale_timesheet.field_product_template_project_id
msgid "Create a task under this project on sales order validation. This setting must be set for each company."
msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_hr_employee_currency_id
msgid "Currency"
msgstr ""
#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_hr_employee
msgid "Employee"
msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,help:sale_timesheet.field_product_product_alert_time
msgid "Number of days before an alert should be raised on the lot/serial number."
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "Fixed"
msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,help:sale_timesheet.field_product_product_life_time
msgid "Number of days before the goods may become dangerous and must not be consumed. It will be computed on the lot/serial number."
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_view_search
msgid "Fixed Price Projects"
msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,help:sale_timesheet.field_product_product_removal_time
msgid "Number of days before the goods should be removed from the stock. It will be computed on the lot/serial number."
#: model:ir.ui.view,arch_db:sale_timesheet.product_template_search_view_sale_timesheet
msgid "Fixed price services"
msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,help:sale_timesheet.field_product_product_use_time
msgid "Number of days before the goods starts deteriorating, without being dangerous yet. It will be computed on the lot/serial number."
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "Hours"
msgstr ""
#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_account_invoice
#: model:ir.model.fields,field_description:sale_timesheet.field_account_analytic_line_timesheet_invoice_id
msgid "Invoice"
msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,help:sale_timesheet.field_account_analytic_line_timesheet_invoice_id
msgid "Invoice created from the timesheet"
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "Invoiced"
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.view_product_timesheet_form
msgid "Keep empty to get a new project per order..."
msgstr ""
#. module: sale_timesheet
#: selection:account.analytic.line,timesheet_invoice_type:0
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "Non Billable"
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_view_search
msgid "Non Billable Hours"
msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_account_invoice_timesheet_count
msgid "Number of timesheets"
msgstr ""
#. module: sale_timesheet
@@ -71,6 +176,17 @@ msgstr ""
msgid "Order Line"
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "Overview"
msgstr ""
#. module: sale_timesheet
#: code:addons/sale_timesheet/models/project.py:43
#, python-format
msgid "Overview of %s"
msgstr ""
#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_procurement_order
msgid "Procurement"
@@ -86,32 +202,24 @@ msgstr ""
msgid "Product"
msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_product_product_alert_time
msgid "Product Alert Time"
msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_product_product_life_time
msgid "Product Life Time"
msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_product_product_removal_time
msgid "Product Removal Time"
msgstr ""
#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_product_template
msgid "Product Template"
msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_product_product_use_time
msgid "Product Use Time"
#: model:ir.actions.act_window,name:sale_timesheet.product_template_action_fixed
#: model:ir.actions.act_window,name:sale_timesheet.product_template_action_time_based
msgid "Products"
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "Profitability"
msgstr ""
#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_project_project
#: model:ir.model.fields,field_description:sale_timesheet.field_product_product_project_id
#: model:ir.model.fields,field_description:sale_timesheet.field_product_template_project_id
#: model:ir.ui.view,arch_db:sale_timesheet.view_order_form_inherit_sale_timesheet
@@ -123,6 +231,16 @@ msgstr ""
msgid "Project associated to this sale"
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "Rates"
msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_account_analytic_line_timesheet_revenue
msgid "Revenue"
msgstr ""
#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_sale_order
#: model:ir.ui.view,arch_db:sale_timesheet.view_sale_service_inherit_form2
@@ -135,6 +253,20 @@ msgstr ""
msgid "Sales Order Line"
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.hr_timesheet_config_settings_view_form
#: model:ir.ui.view,arch_db:sale_timesheet.project_config_settings_view_form
#: model:ir.ui.view,arch_db:sale_timesheet.sale_config_settings_view_form_inherit_sale_timesheet
msgid "Setup your fixed price services"
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.hr_timesheet_config_settings_view_form
#: model:ir.ui.view,arch_db:sale_timesheet.project_config_settings_view_form
#: model:ir.ui.view,arch_db:sale_timesheet.sale_config_settings_view_form_inherit_sale_timesheet
msgid "Setup your time-based services"
msgstr ""
#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_project_task
#: model:ir.model.fields,field_description:sale_timesheet.field_procurement_order_task_id
@@ -142,7 +274,7 @@ msgid "Task"
msgstr ""
#. module: sale_timesheet
#: code:addons/sale_timesheet/models/procurement.py:80
#: code:addons/sale_timesheet/models/procurement.py:84
#, python-format
msgid "Task Created (%s): <a href=# data-oe-model=project.task data-oe-id=%d>%s</a>"
msgstr ""
@@ -159,7 +291,12 @@ msgid "Tasks associated to this sale"
msgstr ""
#. module: sale_timesheet
#: code:addons/sale_timesheet/models/procurement.py:84
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "There is no timesheet for now."
msgstr ""
#. module: sale_timesheet
#: code:addons/sale_timesheet/models/procurement.py:88
#, python-format
msgid "This task has been created from: <a href=# data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)"
msgstr ""
@@ -170,6 +307,31 @@ msgid "This will set the unit of measure used in projects and tasks.\n"
"If you use the timesheet linked to projects, don't forget to setup the right unit of measure in your employees."
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "Time and material"
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "Time by people"
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.product_template_search_view_sale_timesheet
msgid "Time-based services"
msgstr ""
#. module: sale_timesheet
#. openerp-web
#: code:addons/sale_timesheet/static/src/js/timesheet_plan.js:141
#: model:ir.actions.act_window,name:sale_timesheet.action_timesheet_from_invoice
#: model:ir.actions.act_window,name:sale_timesheet.timesheet_action_from_plan
#: model:ir.actions.act_window,name:sale_timesheet.timesheet_action_plan_pivot
#, python-format
msgid "Timesheet"
msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_hr_employee_timesheet_cost
msgid "Timesheet Cost"
@@ -191,11 +353,31 @@ msgid "Timesheet activities associated to this sale"
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.hr_timesheet_employee_extd_form
#: code:addons/sale_timesheet/models/account_invoice.py:26
#: model:ir.model.fields,field_description:sale_timesheet.field_account_invoice_timesheet_ids
#: model:ir.ui.view,arch_db:sale_timesheet.account_invoice_view_form_inherit_sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.view_order_form_inherit_sale_timesheet
#, python-format
msgid "Timesheets"
msgstr ""
#. module: sale_timesheet
#: code:addons/sale_timesheet/models/project.py:18
#, python-format
msgid "Timesheets of %s"
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "To invoice"
msgstr ""
#. module: sale_timesheet
#: code:addons/sale_timesheet/models/account.py:32
#, python-format
msgid "You can not modify already invoiced timesheets."
msgstr ""
#. module: sale_timesheet
#: code:addons/sale_timesheet/models/sale_order.py:55
#, python-format
@@ -203,8 +385,18 @@ msgid "You can use only one product on timesheet within the same sales order. Yo
msgstr ""
#. module: sale_timesheet
#: code:addons/sale_timesheet/models/project.py:17
#: code:addons/sale_timesheet/models/project.py:63
#, python-format
msgid "You cannot delete a task related to a Sales Order. You can only archive this task."
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "hours"
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.hr_timesheet_employee_extd_form
msgid "per hour"
msgstr ""
addons/sales_team/i18n/sales_team.pot
+68 -42
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:46+0000\n"
"PO-Revision-Date: 2017-04-18 14:46+0000\n"
"POT-Creation-Date: 2017-07-25 10:04+0000\n"
"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -81,6 +81,11 @@ msgstr ""
msgid "Activity Types"
msgstr ""
#. module: sales_team
#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_view_kanban
msgid "Add to My Favorites"
msgstr ""
#. module: sales_team
#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_search
msgid "Archived"
@@ -103,7 +108,7 @@ msgid "Bar"
msgstr ""
#. module: sales_team
#: code:addons/sales_team/models/crm_team.py:237
#: code:addons/sales_team/models/crm_team.py:262
#, python-format
msgid "Big Pretty Button :)"
msgstr ""
@@ -140,6 +145,11 @@ msgstr ""
msgid "Click here to define a new sales channel."
msgstr ""
#. module: sales_team
#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_view_kanban
msgid "Click to add/remove from favorite"
msgstr ""
#. module: sales_team
#. openerp-web
#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:150
@@ -246,7 +256,7 @@ msgstr ""
#. module: sales_team
#. openerp-web
#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:18
#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:246
#: model:ir.actions.act_window,name:sales_team.crm_team_salesteams_act
#: model:ir.ui.menu,name:sales_team.menu_sales_team_act
#: model:ir.ui.view,arch_db:sales_team.crm_team_view_form
@@ -275,6 +285,16 @@ msgstr ""
msgid "Display Name"
msgstr ""
#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team_favorite_user_ids
msgid "Favorite Members"
msgstr ""
#. module: sales_team
#: model:ir.model.fields,help:sales_team.field_crm_team_is_favorite
msgid "Favorite teams to display them in the dashboard and access them easily."
msgstr ""
#. module: sales_team
#: model:ir.ui.menu,name:sales_team.menu_country_state_partner
msgid "Fed. States"
@@ -367,6 +387,7 @@ msgstr ""
#. module: sales_team
#. openerp-web
#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:190
#: selection:crm.team,dashboard_graph_period:0
#, python-format
msgid "Last Month"
msgstr ""
@@ -383,6 +404,16 @@ msgstr ""
msgid "Last Updated on"
msgstr ""
#. module: sales_team
#: selection:crm.team,dashboard_graph_period:0
msgid "Last Week"
msgstr ""
#. module: sales_team
#: selection:crm.team,dashboard_graph_period:0
msgid "Last Year"
msgstr ""
#. module: sales_team
#: selection:crm.team,dashboard_graph_type:0
msgid "Line"
@@ -416,8 +447,8 @@ msgid "Month"
msgstr ""
#. module: sales_team
#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_view_kanban
msgid "More <i class=\"fa fa-caret-down\"/>"
#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_search
msgid "My Favorites"
msgstr ""
#. module: sales_team
@@ -429,11 +460,6 @@ msgstr ""
msgid "My Pipeline"
msgstr ""
#. module: sales_team
#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_search
msgid "My Salesteams"
msgstr ""
#. module: sales_team
#. openerp-web
#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:50
@@ -448,9 +474,15 @@ msgstr ""
msgid "Next Activities"
msgstr ""
#. module: sales_team
#: code:addons/sales_team/models/crm_team.py:248
#, python-format
msgid "Not Defined"
msgstr ""
#. module: sales_team
#. openerp-web
#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:65
#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:217
#, python-format
msgid "Only Integer Value should be valid."
msgstr ""
@@ -462,11 +494,6 @@ msgstr ""
msgid "Performance"
msgstr ""
#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team_dashboard_graph_period
msgid "Period"
msgstr ""
#. module: sales_team
#: selection:crm.team,dashboard_graph_model:0
msgid "Pipeline"
@@ -482,6 +509,11 @@ msgstr ""
msgid "Recommended Apps"
msgstr ""
#. module: sales_team
#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_view_kanban
msgid "Remove from My Favorites"
msgstr ""
#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team_reply_to
msgid "Reply-To"
@@ -492,11 +524,6 @@ msgstr ""
msgid "Reporting"
msgstr ""
#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_res_users_property_product_pricelist
msgid "Sale Pricelist"
msgstr ""
#. module: sales_team
#: selection:crm.team,dashboard_graph_model:0
#: model:crm.team,name:sales_team.team_sales_department
@@ -550,6 +577,16 @@ msgstr ""
msgid "Save"
msgstr ""
#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team_dashboard_graph_period
msgid "Scale"
msgstr ""
#. module: sales_team
#: model:ir.ui.menu,name:sales_team.res_partner_industry_menu
msgid "Sectors of Activity"
msgstr ""
#. module: sales_team
#: model:ir.ui.view,arch_db:sales_team.sale_config_settings_view_form
msgid "Sell recurring services with automated billing"
@@ -571,6 +608,11 @@ msgstr ""
msgid "Settings"
msgstr ""
#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team_is_favorite
msgid "Show on dashboard"
msgstr ""
#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_module_sale_contract
msgid "Subscriptions"
@@ -627,26 +669,10 @@ msgstr ""
#. module: sales_team
#. openerp-web
#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:102
#: selection:crm.team,dashboard_graph_period:0
#, python-format
msgid "This Month"
msgstr ""
#. module: sales_team
#: selection:crm.team,dashboard_graph_period:0
msgid "This Week"
msgstr ""
#. module: sales_team
#: selection:crm.team,dashboard_graph_period:0
msgid "This Year"
msgstr ""
#. module: sales_team
#: model:ir.model.fields,help:sales_team.field_res_users_property_product_pricelist
msgid "This pricelist will be used, instead of the default one, for sales to the current partner"
msgstr ""
#. module: sales_team
#. openerp-web
#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:29
@@ -720,8 +746,8 @@ msgid "Type"
msgstr ""
#. module: sales_team
#: code:addons/sales_team/models/crm_team.py:124
#: code:addons/sales_team/models/crm_team.py:127
#: code:addons/sales_team/models/crm_team.py:139
#: code:addons/sales_team/models/crm_team.py:166
#, python-format
msgid "Undefined graph model for Sales Channel: %s"
msgstr ""
@@ -769,7 +795,7 @@ msgstr ""
#. module: sales_team
#. openerp-web
#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:65
#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:217
#, python-format
msgid "Wrong value entered!"
msgstr ""
addons/stock/i18n/stock.pot
+203 -159
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~15\n"
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-18 14:45+0000\n"
"PO-Revision-Date: 2017-04-18 14:45+0000\n"
"POT-Creation-Date: 2017-07-25 10:03+0000\n"
"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -492,7 +492,6 @@ msgid "Accurate visibility on all your operations"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_report_stock_lines_date_active
#: model:ir.model.fields,field_description:stock.field_stock_incoterms_active
#: model:ir.model.fields,field_description:stock.field_stock_location_active
#: model:ir.model.fields,field_description:stock.field_stock_location_path_active
@@ -593,7 +592,7 @@ msgid "All returned moves"
msgstr ""
#. module: stock
#: code:addons/stock/models/procurement.py:220
#: code:addons/stock/models/procurement.py:221
#, python-format
msgid "All stock moves have been cancelled for this procurement."
msgstr ""
@@ -724,13 +723,13 @@ msgid "Back Orders"
msgstr ""
#. module: stock
#: code:addons/stock/wizard/stock_backorder_confirmation.py:31
#: code:addons/stock/wizard/stock_backorder_confirmation.py:30
#, python-format
msgid "Back order <em>%s</em> <b>cancelled</b>."
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_picking.py:981
#: code:addons/stock/models/stock_picking.py:987
#, python-format
msgid "Back order <em>%s</em> <b>created</b>."
msgstr ""
@@ -834,6 +833,26 @@ msgstr ""
msgid "By unchecking the active field, you may hide an INCOTERM you will not use."
msgstr ""
#. module: stock
#: model:stock.incoterms,name:stock.incoterm_CIP
msgid "CARRIAGE AND INSURANCE PAID TO"
msgstr ""
#. module: stock
#: model:stock.incoterms,name:stock.incoterm_CPT
msgid "CARRIAGE PAID TO"
msgstr ""
#. module: stock
#: model:stock.incoterms,name:stock.incoterm_CFR
msgid "COST AND FREIGHT"
msgstr ""
#. module: stock
#: model:stock.incoterms,name:stock.incoterm_CIF
msgid "COST, INSURANCE AND FREIGHT"
msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_picking_calendar
msgid "Calendar View"
@@ -1109,11 +1128,6 @@ msgstr ""
msgid "Consignment"
msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.report_stock_lines_date_search
msgid "Consumable"
msgstr ""
#. module: stock
#: model:ir.model,name:stock.model_res_partner
msgid "Contact"
@@ -1182,7 +1196,7 @@ msgid "Create Backorder"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_picking.py:815
#: code:addons/stock/models/stock_picking.py:821
#, python-format
msgid "Create Backorder?"
msgstr ""
@@ -1381,6 +1395,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_partner_property_stock_customer
#: model:ir.model.fields,field_description:stock.field_res_users_property_stock_customer
#: selection:stock.location,usage:0
msgid "Customer Location"
msgstr ""
@@ -1396,6 +1411,41 @@ msgstr ""
msgid "Customers"
msgstr ""
#. module: stock
#: model:stock.incoterms,name:stock.incoterm_DAF
msgid "DELIVERED AT FRONTIER"
msgstr ""
#. module: stock
#: model:stock.incoterms,name:stock.incoterm_DAP
msgid "DELIVERED AT PLACE"
msgstr ""
#. module: stock
#: model:stock.incoterms,name:stock.incoterm_DAT
msgid "DELIVERED AT TERMINAL"
msgstr ""
#. module: stock
#: model:stock.incoterms,name:stock.incoterm_DDP
msgid "DELIVERED DUTY PAID"
msgstr ""
#. module: stock
#: model:stock.incoterms,name:stock.incoterm_DDU
msgid "DELIVERED DUTY UNPAID"
msgstr ""
#. module: stock
#: model:stock.incoterms,name:stock.incoterm_DEQ
msgid "DELIVERED EX QUAY"
msgstr ""
#. module: stock
#: model:stock.incoterms,name:stock.incoterm_DES
msgid "DELIVERED EX SHIP"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_delivery_dhl
msgid "DHL"
@@ -1430,32 +1480,6 @@ msgstr ""
msgid "Date of Transfer"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_report_stock_lines_date_date
msgid "Date of latest Inventory"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_report_stock_lines_date_move_date
msgid "Date of latest Stock Move"
msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.report_stock_lines_date_tree
msgid "Dates of Inventories"
msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.report_stock_lines_date_form
#: model:ir.ui.view,arch_db:stock.report_stock_lines_date_search
msgid "Dates of Inventories & Moves"
msgstr ""
#. module: stock
#: model:ir.model,name:stock.model_report_stock_lines_date
msgid "Dates of Inventories and latest Moves"
msgstr ""
#. module: stock
#: selection:stock.warehouse.orderpoint,lead_type:0
msgid "Day(s) to get the products"
@@ -1550,7 +1574,7 @@ msgid "Delay (days)"
msgstr ""
#. module: stock
#: code:addons/stock/models/product.py:345
#: code:addons/stock/models/product.py:346
#, python-format
msgid "Delivered Qty"
msgstr ""
@@ -1574,6 +1598,11 @@ msgstr ""
msgid "Delivery Orders"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_tracking_lot
msgid "Delivery Packages"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_delivery_route_id
msgid "Delivery Route"
@@ -1701,7 +1730,6 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_product_putaway_display_name
#: model:ir.model.fields,field_description:stock.field_product_removal_display_name
#: model:ir.model.fields,field_description:stock.field_report_stock_forecast_display_name
#: model:ir.model.fields,field_description:stock.field_report_stock_lines_date_display_name
#: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation_display_name
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_display_name
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_display_name
@@ -1730,11 +1758,6 @@ msgstr ""
msgid "Display Name"
msgstr ""
#. module: stock
#: model:ir.actions.act_window,help:stock.action_stock_line_date
msgid "Display the latest Inventories and Moves done on your products and easily sort them with specific filtering criteria. If you do frequent and partial inventories, you need this report in order to ensure that the stock of each product is controlled at least once a year. This also lets you find out which products have seen little move lately and may deserve special measures (discounted sale, quality control...)"
msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.inventory_planner
msgid "Do not hesitate to send us an email to describe your experience or to suggest improvements!"
@@ -1786,6 +1809,11 @@ msgstr ""
msgid "Draft Moves"
msgstr ""
#. module: stock
#: model:stock.incoterms,name:stock.incoterm_EXW
msgid "EX WORKS"
msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.inventory_planner
msgid "Edit its details or add new ones"
@@ -1811,7 +1839,7 @@ msgid "Every stock operation in Odoo moves the products from one\n"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_quant.py:669
#: code:addons/stock/models/stock_quant.py:672
#, python-format
msgid "Everything inside a package should be in the same location"
msgstr ""
@@ -1844,7 +1872,7 @@ msgid "External note..."
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_picking.py:955
#: code:addons/stock/models/stock_picking.py:961
#, python-format
msgid "Extra Move: "
msgstr ""
@@ -1854,6 +1882,21 @@ msgstr ""
msgid "FIFO, LIFO..."
msgstr ""
#. module: stock
#: model:stock.incoterms,name:stock.incoterm_FAS
msgid "FREE ALONGSIDE SHIP"
msgstr ""
#. module: stock
#: model:stock.incoterms,name:stock.incoterm_FCA
msgid "FREE CARRIER"
msgstr ""
#. module: stock
#: model:stock.incoterms,name:stock.incoterm_FOB
msgid "FREE ON BOARD"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_delivery_fedex
msgid "FedEx"
@@ -1904,7 +1947,7 @@ msgid "Forecast quantity (computed as Quantity On Hand - Outgoing + Incoming)\n"
msgstr ""
#. module: stock
#: code:addons/stock/models/product.py:340
#: code:addons/stock/models/product.py:341
#: model:ir.model.fields,field_description:stock.field_product_template_virtual_available
#: model:ir.model.fields,field_description:stock.field_stock_move_availability
#, python-format
@@ -1922,31 +1965,31 @@ msgid "Full Location Name"
msgstr ""
#. module: stock
#: code:addons/stock/models/product.py:343
#: code:addons/stock/models/product.py:344
#, python-format
msgid "Future Deliveries"
msgstr ""
#. module: stock
#: code:addons/stock/models/product.py:348
#: code:addons/stock/models/product.py:349
#, python-format
msgid "Future P&L"
msgstr ""
#. module: stock
#: code:addons/stock/models/product.py:358
#: code:addons/stock/models/product.py:359
#, python-format
msgid "Future Productions"
msgstr ""
#. module: stock
#: code:addons/stock/models/product.py:353
#: code:addons/stock/models/product.py:354
#, python-format
msgid "Future Qty"
msgstr ""
#. module: stock
#: code:addons/stock/models/product.py:335
#: code:addons/stock/models/product.py:336
#, python-format
msgid "Future Receipts"
msgstr ""
@@ -2073,7 +2116,6 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_product_putaway_id
#: model:ir.model.fields,field_description:stock.field_product_removal_id
#: model:ir.model.fields,field_description:stock.field_report_stock_forecast_id
#: model:ir.model.fields,field_description:stock.field_report_stock_lines_date_id
#: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation_id
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_id
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_id
@@ -2093,7 +2135,7 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_picking_type_id
#: model:ir.model.fields,field_description:stock.field_stock_production_lot_id
#: model:ir.model.fields,field_description:stock.field_stock_quant_id
#: model:ir.model.fields,field_description:stock.field_stock_quant_package_id_8746
#: model:ir.model.fields,field_description:stock.field_stock_quant_package_id_8797
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_id
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_id
#: model:ir.model.fields,field_description:stock.field_stock_scrap_id
@@ -2223,7 +2265,7 @@ msgid "Immediate Transfer"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_picking.py:797
#: code:addons/stock/models/stock_picking.py:803
#, python-format
msgid "Immediate Transfer?"
msgstr ""
@@ -2395,6 +2437,24 @@ msgstr ""
msgid "Internal reference number in case it differs from the manufacturer's lot/serial number"
msgstr ""
#. module: stock
#: code:addons/stock/models/product.py:258
#, python-format
msgid "Invalid domain left operand %s"
msgstr ""
#. module: stock
#: code:addons/stock/models/product.py:260
#, python-format
msgid "Invalid domain operator %s"
msgstr ""
#. module: stock
#: code:addons/stock/models/product.py:262
#, python-format
msgid "Invalid domain right operand %s"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_inventory_category_id
msgid "Inventoried Category"
@@ -2504,6 +2564,11 @@ msgstr ""
msgid "Inventory Move"
msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_inventory_filter
msgid "Inventory Product"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_inventory_name
#: model:ir.ui.view,arch_db:stock.view_inventory_filter
@@ -2600,7 +2665,6 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_product_putaway___last_update
#: model:ir.model.fields,field_description:stock.field_product_removal___last_update
#: model:ir.model.fields,field_description:stock.field_report_stock_forecast___last_update
#: model:ir.model.fields,field_description:stock.field_report_stock_lines_date___last_update
#: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation___last_update
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty___last_update
#: model:ir.model.fields,field_description:stock.field_stock_config_settings___last_update
@@ -2708,12 +2772,6 @@ msgstr ""
msgid "Late Transfers"
msgstr ""
#. module: stock
#: model:ir.actions.act_window,name:stock.action_stock_line_date
#: model:ir.ui.menu,name:stock.menu_report_stock_line_date
msgid "Latest Inventories & Moves"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking_launch_pack_operations
msgid "Launch Pack Operations"
@@ -2883,7 +2941,7 @@ msgid "Lot/Serial Number"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_pack_operation.py:197
#: code:addons/stock/models/stock_pack_operation.py:198
#, python-format
msgid "Lot/Serial Number Details"
msgstr ""
@@ -2894,7 +2952,7 @@ msgid "Lot/Serial Number Inventory"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_pack_operation.py:279
#: code:addons/stock/models/stock_pack_operation.py:280
#, python-format
msgid "Lot/Serial Number required"
msgstr ""
@@ -3006,7 +3064,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
msgid "Manage product packaging"
msgid "Manage product packages (e.g. pack of 6 bottles, box of 10 pieces)"
msgstr ""
#. module: stock
@@ -3061,6 +3119,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_partner_picking_warn_msg
#: model:ir.model.fields,field_description:stock.field_res_users_picking_warn_msg
msgid "Message for Stock Picking"
msgstr ""
@@ -3105,11 +3164,6 @@ msgstr ""
msgid "Modify"
msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
msgid "More <i class=\"fa fa-caret-down\"/>"
msgstr ""
#. module: stock
#: model:ir.actions.act_window,help:stock.action_picking_tree
msgid "Most operations are prepared automatically by Odoo according\n"
@@ -3124,7 +3178,7 @@ msgid "Move"
msgstr ""
#. module: stock
#: code:addons/stock/models/procurement.py:53
#: code:addons/stock/models/procurement.py:54
#, python-format
msgid "Move From Another Location"
msgstr ""
@@ -3265,11 +3319,6 @@ msgstr ""
msgid "No Backorder"
msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.report_stock_lines_date_search
msgid "No Inventory yet"
msgstr ""
#. module: stock
#: selection:res.partner,picking_warn:0
msgid "No Message"
@@ -3281,18 +3330,13 @@ msgstr ""
msgid "No Rescheduling Propagation"
msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.report_stock_lines_date_search
msgid "No Stock Move yet"
msgstr ""
#. module: stock
#: selection:product.template,tracking:0
msgid "No Tracking"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_picking.py:828
#: code:addons/stock/models/stock_picking.py:834
#, python-format
msgid "No negative quantities allowed"
msgstr ""
@@ -3304,7 +3348,7 @@ msgid "No products to return (only lines in Done state and not fully returned ye
msgstr ""
#. module: stock
#: code:addons/stock/models/procurement.py:181
#: code:addons/stock/models/procurement.py:182
#, python-format
msgid "No source location defined!"
msgstr ""
@@ -3451,7 +3495,7 @@ msgid "Operation"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_pack_operation.py:213
#: code:addons/stock/models/stock_pack_operation.py:214
#, python-format
msgid "Operation Details"
msgstr ""
@@ -3642,7 +3686,7 @@ msgid "Owner of the quants"
msgstr ""
#. module: stock
#: code:addons/stock/models/product.py:350
#: code:addons/stock/models/product.py:351
#, python-format
msgid "P&L Qty"
msgstr ""
@@ -3718,14 +3762,8 @@ msgstr ""
msgid "Package Type"
msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
msgid "Package Types"
msgstr ""
#. module: stock
#: model:ir.actions.act_window,name:stock.action_package_view
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_tracking_lot
#: model:ir.ui.menu,name:stock.menu_package
#: model:ir.ui.menu,name:stock.menu_packages_config
#: model:ir.ui.view,arch_db:stock.view_pack_operation_details_form
@@ -3738,7 +3776,6 @@ msgid "Packages are usually created by pack operations made on transfers and can
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_packaging
#: model:ir.ui.view,arch_db:stock.quant_package_search_view
msgid "Packaging"
msgstr ""
@@ -3930,13 +3967,13 @@ msgid "Planner"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_picking.py:784
#: code:addons/stock/models/stock_picking.py:790
#, python-format
msgid "Please create some Initial Demand or Mark as Todo and create some Operations. "
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_picking.py:1020
#: code:addons/stock/models/stock_picking.py:1026
#, python-format
msgid "Please process some quantities to put in the pack first!"
msgstr ""
@@ -4074,7 +4111,7 @@ msgid "Procurements"
msgstr ""
#. module: stock
#: code:addons/stock/models/product.py:360
#: code:addons/stock/models/product.py:361
#, python-format
msgid "Produced Qty"
msgstr ""
@@ -4083,7 +4120,6 @@ msgstr ""
#: model:ir.model,name:stock.model_product_product
#: model:ir.model.fields,field_description:stock.field_make_procurement_product_id
#: model:ir.model.fields,field_description:stock.field_report_stock_forecast_product_id
#: model:ir.model.fields,field_description:stock.field_report_stock_lines_date_product_id
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_product_id
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line_product_id
#: model:ir.model.fields,field_description:stock.field_stock_move_product_id
@@ -4139,8 +4175,10 @@ msgid "Product Name"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_packaging
#: model:ir.ui.menu,name:stock.menu_product_packagings
msgid "Product Packaging"
#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
msgid "Product Packages"
msgstr ""
#. module: stock
@@ -4205,7 +4243,7 @@ msgid "Products you scrap will be removed from the stock and moved to a specific
msgstr ""
#. module: stock
#: code:addons/stock/models/product.py:323
#: code:addons/stock/models/product.py:324
#, python-format
msgid "Products: "
msgstr ""
@@ -4256,9 +4294,8 @@ msgid "Put Away Strategy"
msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_config_settings_group_stock_tracking_lot
#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
msgid "Put products in packages and get shipping labels per package unit thanks to shipping connectors."
msgid "Put your products in packs (e.g. parcels, boxes) and track them"
msgstr ""
#. module: stock
@@ -4450,7 +4487,7 @@ msgid "Receive goods directly in stock (1 step)"
msgstr ""
#. module: stock
#: code:addons/stock/models/product.py:337
#: code:addons/stock/models/product.py:338
#, python-format
msgid "Received Qty"
msgstr ""
@@ -4542,7 +4579,7 @@ msgid "Removal Strategy"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_quant.py:467
#: code:addons/stock/models/stock_quant.py:470
#, python-format
msgid "Removal strategy %s not implemented."
msgstr ""
@@ -4809,7 +4846,7 @@ msgid "Schedulers"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_picking.py:1032
#: code:addons/stock/models/stock_picking.py:1038
#: model:ir.actions.act_window,name:stock.action_stock_scrap
#: model:ir.ui.menu,name:stock.menu_stock_scrap
#: model:ir.ui.view,arch_db:stock.stock_scrap_form_view
@@ -4856,12 +4893,6 @@ msgstr ""
msgid "Search Stock Location Paths"
msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_config_settings_group_stock_packaging
#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
msgid "Select or scan the packaging used to transfer products in operations. This allows to update or check the unit # transferred (which must be a multiple of the unit # per package). Packaging types are set on product detail form."
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_inventory.py:108
#, python-format
@@ -4875,6 +4906,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_res_partner_picking_warn
#: model:ir.model.fields,help:stock.field_res_users_picking_warn
msgid "Selecting the \"Warning\" option will notify user with the message, Selecting \"Blocking Message\" will throw an exception with the message and block the flow. The Message has to be written in the next field."
msgstr ""
@@ -4893,31 +4925,31 @@ msgid "Sequence"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_warehouse.py:679
#: code:addons/stock/models/stock_warehouse.py:680
#, python-format
msgid "Sequence in"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_warehouse.py:683
#: code:addons/stock/models/stock_warehouse.py:684
#, python-format
msgid "Sequence internal"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_warehouse.py:680
#: code:addons/stock/models/stock_warehouse.py:681
#, python-format
msgid "Sequence out"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_warehouse.py:681
#: code:addons/stock/models/stock_warehouse.py:682
#, python-format
msgid "Sequence packing"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_warehouse.py:682
#: code:addons/stock/models/stock_warehouse.py:683
#, python-format
msgid "Sequence picking"
msgstr ""
@@ -5060,7 +5092,7 @@ msgid "Show various information on stock availability for this move"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_picking.py:792
#: code:addons/stock/models/stock_picking.py:798
#, python-format
msgid "Some products require lots/serial numbers, so you need to specify those first!"
msgstr ""
@@ -5234,6 +5266,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_partner_picking_warn
#: model:ir.model.fields,field_description:stock.field_res_users_picking_warn
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_picking_id
msgid "Stock Picking"
msgstr ""
@@ -5258,11 +5291,6 @@ msgstr ""
msgid "Stock moves that have been processed"
msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.report_stock_lines_date_search
msgid "Stockable"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_multi_locations
msgid "Storage Locations"
@@ -5482,6 +5510,12 @@ msgstr ""
msgid "The parent location that includes this location. Example : The 'Dispatch Zone' is the 'Gate 1' parent location."
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_picking.py:787
#, python-format
msgid "The pick is already validated"
msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_warehouse_orderpoint_qty_multiple
msgid "The procurement quantity will be rounded up to this multiple. If it is 0, the exact quantity will be used."
@@ -5498,7 +5532,7 @@ msgid "The push rule that created this stock move"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_pack_operation.py:169
#: code:addons/stock/models/stock_pack_operation.py:170
#, python-format
msgid "The quantity to split should be smaller than the quantity To Do. "
msgstr ""
@@ -5515,7 +5549,7 @@ msgid "The requested operation cannot be processed because of a programming erro
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_move.py:825
#: code:addons/stock/models/stock_move.py:828
#, python-format
msgid "The roundings of your unit of measure %s on the move vs. %s on the product don't allow to do these operations or you are not transferring the picking at once. "
msgstr ""
@@ -5653,11 +5687,13 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_res_partner_property_stock_customer
#: model:ir.model.fields,help:stock.field_res_users_property_stock_customer
msgid "This stock location will be used, instead of the default one, as the destination location for goods you send to this partner"
msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_res_partner_property_stock_supplier
#: model:ir.model.fields,help:stock.field_res_users_property_stock_supplier
msgid "This stock location will be used, instead of the default one, as the source location for goods you receive from the current partner"
msgstr ""
@@ -5733,6 +5769,11 @@ msgstr ""
msgid "Today Activities"
msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_stock_quant_tree
msgid "Total"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_inventory_total_qty
msgid "Total Quantity"
@@ -5744,7 +5785,7 @@ msgid "Total routes"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_production_lot.py:42
#: code:addons/stock/models/stock_production_lot.py:52
#: model:ir.ui.view,arch_db:stock.inventory_planner
#: model:ir.ui.view,arch_db:stock.product_form_view_procurement_button
#: model:ir.ui.view,arch_db:stock.product_template_form_view_procurement_button
@@ -5770,11 +5811,6 @@ msgstr ""
msgid "Track product location in your warehouse"
msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
msgid "Track product packages (e.g.pallets, boxes)"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_product_product_tracking
#: model:ir.model.fields,field_description:stock.field_product_template_tracking
@@ -5783,7 +5819,7 @@ msgid "Tracking"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_move.py:966
#: code:addons/stock/models/stock_move.py:969
#: model:ir.model,name:stock.model_stock_picking
#: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
#: model:ir.ui.view,arch_db:stock.view_picking_form
@@ -5910,7 +5946,7 @@ msgid "Units of Measures"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_quant.py:566
#: code:addons/stock/models/stock_quant.py:569
#, python-format
msgid "Unknown Pack"
msgstr ""
@@ -5936,7 +5972,7 @@ msgid "Unpack"
msgstr ""
#. module: stock
#: code:addons/stock/models/product.py:355
#: code:addons/stock/models/product.py:356
#, python-format
msgid "Unplanned Qty"
msgstr ""
@@ -6045,6 +6081,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_partner_property_stock_supplier
#: model:ir.model.fields,field_description:stock.field_res_users_property_stock_supplier
#: selection:stock.location,usage:0
msgid "Vendor Location"
msgstr ""
@@ -6168,7 +6205,7 @@ msgid "Warehouse to consider for the route selection"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_warehouse.py:709
#: code:addons/stock/models/stock_warehouse.py:710
#, python-format
msgid "Warehouse's Routes"
msgstr ""
@@ -6193,7 +6230,7 @@ msgid "Warning on the Picking"
msgstr ""
#. module: stock
#: code:addons/stock/models/product.py:316
#: code:addons/stock/models/product.py:317
#, python-format
msgid "Warning!"
msgstr ""
@@ -6291,6 +6328,12 @@ msgstr ""
msgid "Wizard checks all the stock minimum rules and generate procurement order."
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_production_lot.py:37
#, python-format
msgid "You are not allowed to create a lot for this picking type"
msgstr ""
#. module: stock
#: model:ir.actions.act_window,help:stock.action_routes_form
msgid "You can define here the main routes that run through\n"
@@ -6324,13 +6367,13 @@ msgid "You can either do it immediately or mark it as Todo for future processing
msgstr ""
#. module: stock
#: code:addons/stock/models/product.py:499
#: code:addons/stock/models/product.py:506
#, python-format
msgid "You can not change the unit of measure of a product that has already been used in a done stock move. If you need to change the unit of measure, you may deactivate this product."
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_pack_operation.py:158
#: code:addons/stock/models/stock_pack_operation.py:159
#, python-format
msgid "You can not delete pack operations of a done picking"
msgstr ""
@@ -6342,7 +6385,7 @@ msgid "You can not reserve a negative quantity or a negative quant."
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_move.py:909
#: code:addons/stock/models/stock_move.py:912
#, python-format
msgid "You can only delete draft moves."
msgstr ""
@@ -6353,11 +6396,17 @@ msgid "You can review and edit the predefined units via the"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_move.py:656
#: code:addons/stock/models/stock_move.py:659
#, python-format
msgid "You cannot cancel a stock move that has been set to 'Done'."
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_scrap.py:72
#, python-format
msgid "You cannot delete a scrap which is done."
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_inventory.py:375
#, python-format
@@ -6371,7 +6420,7 @@ msgid "You cannot move to a location of type view %s."
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_scrap.py:85
#: code:addons/stock/models/stock_scrap.py:91
#, python-format
msgid "You cannot scrap a move without having available stock for %s. You can correct it with an inventory adjustment."
msgstr ""
@@ -6384,19 +6433,13 @@ msgid "You cannot set a negative product quantity in an inventory line:\n"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_production_lot.py:37
#, python-format
msgid "You are not allowed to create a lot for this picking type"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_move.py:927
#: code:addons/stock/models/stock_move.py:930
#, python-format
msgid "You cannot split a draft move. It needs to be confirmed first."
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_move.py:923
#: code:addons/stock/models/stock_move.py:926
#, python-format
msgid "You cannot split a move done"
msgstr ""
@@ -6408,7 +6451,7 @@ msgid "You do not have any products reserved for this picking. Please click the
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_move.py:808
#: code:addons/stock/models/stock_move.py:811
#, python-format
msgid "You have a difference between the quantity on the operation and the quantities specified for the lots. "
msgstr ""
@@ -6435,13 +6478,13 @@ msgid "You have processed less products than the initial demand."
msgstr ""
#. module: stock
#: code:addons/stock/models/product.py:317
#: code:addons/stock/models/product.py:318
#, python-format
msgid "You have products in stock that have no lot number. You can assign serial numbers by doing an inventory. "
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_warehouse.py:789
#: code:addons/stock/models/stock_warehouse.py:790
#, python-format
msgid "You have to select a product unit of measure in the same category than the default unit of measure of the product"
msgstr ""
@@ -6465,8 +6508,8 @@ msgid "You must define a warehouse for the company: %s."
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_move.py:552
#: code:addons/stock/models/stock_pack_operation.py:232
#: code:addons/stock/models/stock_move.py:555
#: code:addons/stock/models/stock_pack_operation.py:233
#, python-format
msgid "You need to provide a Lot/Serial Number for product %s"
msgstr ""
@@ -6478,11 +6521,17 @@ msgid "You should only receive by the piece with the same serial number"
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_pack_operation.py:236
#: code:addons/stock/models/stock_pack_operation.py:237
#, python-format
msgid "You should provide a different serial number for each piece"
msgstr ""
#. module: stock
#: code:addons/stock/models/product.py:372
#, python-format
msgid "You still have some active reordering rules on this product. Please archive or delete them first."
msgstr ""
#. module: stock
#: code:addons/stock/models/stock_move.py:223
#, python-format
@@ -6655,11 +6704,6 @@ msgstr ""
msgid "stock.scrap"
msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.report_delivery_document
msgid "t-field-options='{\"widget\": \"contact\", \"fields\": [\"address\", \"name\", \"phone\", \"fax\"], \"no_marker\": true}'/&gt;"
msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.inventory_planner
msgid "the list of products"
addons/stock/models/product.py
+4
View File
@@ -251,6 +251,10 @@ class Product(models.Model):
if value == 0.0 and operator in ('=', '>=', '<='):
return self._search_product_quantity(operator, value, 'qty_available')
product_ids = self._search_qty_available_new(operator, value, self._context.get('lot_id'), self._context.get('owner_id'), self._context.get('package_id'))
if (value > 0 and operator in ('<=', '<')) or (value < 0 and operator in ('>=', '>')):
# include also unavailable products
domain = self._search_product_quantity(operator, value, 'qty_available')
product_ids += domain[0][2]
return [('id', 'in', product_ids)]
def _search_qty_available_new(self, operator, value, lot_id=False, owner_id=False, package_id=False):
addons/stock/models/stock_move.py
+2 -12
View File
@@ -694,7 +694,7 @@ class StockMove(models.Model):
for reserved_quant, quantity in quants:
to_update = self.move_line_ids.filtered(lambda m: m.location_id.id == reserved_quant.location_id.id and m.lot_id.id == reserved_quant.lot_id.id and m.package_id.id == reserved_quant.package_id.id and m.owner_id.id == reserved_quant.owner_id.id)
if to_update:
to_update[0].with_context(bypass_reservation_update=True).product_uom_qty += self.product_id.uom_id._compute_quantity(taken_quantity, self.product_uom, rounding_method='HALF-UP')
to_update[0].with_context(bypass_reservation_update=True).product_uom_qty += self.product_id.uom_id._compute_quantity(quantity, self.product_uom, rounding_method='HALF-UP')
else:
if self.product_id.tracking == 'serial':
for i in range(0, int(quantity)):
@@ -883,17 +883,7 @@ class StockMove(models.Model):
# If you were already putting stock.move.lots on the next one in the work order, transfer those to the new move
move.move_line_ids.filtered(lambda x: x.qty_done == 0.0).write({'move_id': new_move})
self.browse(new_move).quantity_done = 0.0
for packop in move.move_line_ids:
if float_compare(packop.qty_done, 0, precision_rounding=rounding) > 0:
if move.has_tracking != 'none' and (move.picking_type_id.use_create_lots or move.picking_type_id.use_existing_lots):
if packop.lot_name and not packop.lot_id:
lot = self.env['stock.production.lot'].create(
{'name': packop.lot_name, 'product_id': packop.product_id.id})
packop.write({'lot_id': lot.id})
if not packop.lot_id:
raise UserError(_('You need to supply a lot/serial number.'))
# execute `action_done` even if nothing was done, to free the reservation
packop.action_done()
move.move_line_ids.action_done()
picking = self and self[0].picking_id or False
moves_todo.write({'state': 'done', 'date': fields.Datetime.now()})
moves_todo.mapped('move_dest_ids').action_assign()
addons/stock/models/stock_move_line.py
+55 -9
View File
@@ -132,10 +132,10 @@ class StockMoveLine(models.Model):
if ml.location_id.should_impact_quants() and ml.product_id.type == 'product':
qty_to_decrease = ml.product_qty - ml.product_uom_id._compute_quantity(vals['product_uom_qty'], ml.product_id.uom_id, rounding_method='HALF-UP')
try:
Quant._update_reserved_quantity(ml.product_id, ml.location_id, -qty_to_decrease, lot_id=ml.lot_id, package_id=ml.package_id, owner_id=ml.owner_id)
Quant._update_reserved_quantity(ml.product_id, ml.location_id, -qty_to_decrease, lot_id=ml.lot_id, package_id=ml.package_id, owner_id=ml.owner_id, strict=True)
except UserError:
if ml.lot_id:
Quant._update_reserved_quantity(ml.product_id, ml.location_id, -qty_to_decrease, lot_id=False, package_id=ml.package_id, owner_id=ml.owner_id)
Quant._update_reserved_quantity(ml.product_id, ml.location_id, -qty_to_decrease, lot_id=False, package_id=ml.package_id, owner_id=ml.owner_id, strict=True)
else:
raise
@@ -156,10 +156,10 @@ class StockMoveLine(models.Model):
for ml in self.filtered(lambda ml: ml.state in ['partially_available', 'assigned']):
if ml.location_id.should_impact_quants() and ml.product_id.type == 'product':
try:
Quant._update_reserved_quantity(ml.product_id, ml.location_id, -ml.product_qty, lot_id=ml.lot_id, package_id=ml.package_id, owner_id=ml.owner_id)
Quant._update_reserved_quantity(ml.product_id, ml.location_id, -ml.product_qty, lot_id=ml.lot_id, package_id=ml.package_id, owner_id=ml.owner_id, strict=True)
except UserError:
if ml.lot_id:
Quant._update_reserved_quantity(ml.product_id, ml.location_id, -ml.product_qty, lot_id=False, package_id=ml.package_id, owner_id=ml.owner_id)
Quant._update_reserved_quantity(ml.product_id, ml.location_id, -ml.product_qty, lot_id=False, package_id=ml.package_id, owner_id=ml.owner_id, strict=True)
else:
raise
@@ -233,14 +233,60 @@ class StockMoveLine(models.Model):
# Unlinking a pack operation should unreserve.
if ml.location_id.should_impact_quants() and ml.product_id.type == 'product' and not float_is_zero(ml.product_qty, precision_digits=precision):
self.env['stock.quant']._update_reserved_quantity(ml.product_id, ml.location_id, -ml.product_qty, lot_id=ml.lot_id,
package_id=ml.package_id, owner_id=ml.owner_id)
package_id=ml.package_id, owner_id=ml.owner_id, strict=True)
return super(StockMoveLine, self).unlink()
def action_done(self):
""" This method will finalize the work with a move line by "moving" quants to the
destination location.
""" This method is called during a move's `action_done`. It'll actually move a quant from
the source location to the destination location, and unreserve if needed in the source
location.
This method is intended to be called on all the move lines of a move. This method is not
intended to be called when editing a `done` move (that's what the override of `write` here
is done.
"""
# First, we loop over all the move lines to do a preliminary check: `qty_done` should not
# be negative and, according to the presence of a picking type or a linked inventory
# adjustment, enforce some rules on the `lot_id` field. If `qty_done` is null, we unlink
# the line. It is mandatory in order to free the reservation and correctly apply
# `action_done` on the next move lines.
ml_to_delete = self.env['stock.move.line']
for ml in self:
qty_done_float_compared = float_compare(ml.qty_done, 0, precision_rounding=ml.product_uom_id.rounding)
if qty_done_float_compared > 0:
if ml.product_id.tracking != 'none':
picking_type_id = ml.move_id.picking_type_id
if picking_type_id:
if picking_type_id.use_create_lots:
# If a picking type is linked, we may have to create a production lot on
# the fly before assigning it to the move line if the user checked both
# `use_create_lots` and `use_existing_lots`.
if ml.lot_name and not ml.lot_id:
lot = self.env['stock.production.lot'].create(
{'name': ml.lot_name, 'product_id': ml.product_id.id}
)
ml.write({'lot_id': lot.id})
elif not picking_type_id.use_create_lots and not picking_type_id.use_existing_lots:
# If the user disabled both `use_create_lots` and `use_existing_lots`
# checkboxes on the picking type, he's allowed to enter tracked
# products without a `lot_id`.
continue
elif ml.move_id.inventory_id:
# If an inventory adjustment is linked, the user is allowed to enter
# tracked products without a `lot_id`.
continue
if not ml.lot_id:
raise UserError(_('You need to supply a lot/serial number.'))
elif qty_done_float_compared < 0:
raise UserError(_('No negative quantities allowed'))
else:
ml_to_delete |= ml
ml_to_delete.unlink()
# Now, we can actually move the quant.
for ml in self - ml_to_delete:
if ml.product_id.type != 'consu':
Quant = self.env['stock.quant']
rounding = ml.product_uom_id.rounding
@@ -252,9 +298,9 @@ class StockMoveLine(models.Model):
# unreserve what's been reserved
if ml.location_id.should_impact_quants() and ml.product_id.type == 'product' and ml.product_qty:
try:
Quant._update_reserved_quantity(ml.product_id, ml.location_id, -ml.product_qty, lot_id=ml.lot_id, package_id=ml.package_id, owner_id=ml.owner_id)
Quant._update_reserved_quantity(ml.product_id, ml.location_id, -ml.product_qty, lot_id=ml.lot_id, package_id=ml.package_id, owner_id=ml.owner_id, strict=True)
except UserError:
Quant._update_reserved_quantity(ml.product_id, ml.location_id, -ml.product_qty, lot_id=False, package_id=ml.package_id, owner_id=ml.owner_id)
Quant._update_reserved_quantity(ml.product_id, ml.location_id, -ml.product_qty, lot_id=False, package_id=ml.package_id, owner_id=ml.owner_id, strict=True)
# move what's been actually done
quantity = ml.product_uom_id._compute_quantity(ml.qty_done, ml.move_id.product_id.uom_id, rounding_method='HALF-UP')
addons/stock/models/stock_picking.py
+1 -11
View File
@@ -553,6 +553,7 @@ class Picking(models.Model):
todo_moves |= new_move
#'qty_done': ops.qty_done})
todo_moves.action_done()
self.write({'date_done': fields.Datetime.now()})
return True
do_transfer = action_done #TODO:replace later
@@ -590,7 +591,6 @@ class Picking(models.Model):
@api.multi
def button_validate(self):
self.ensure_one()
move_line_delete = self.env['stock.move.line']
if not self.move_lines and not self.move_line_ids:
raise UserError(_('Please add some lines to move'))
# In draft or with no pack operations edited yet, ask if we can just do everything
@@ -632,16 +632,6 @@ class Picking(models.Model):
'res_id': wiz.id,
'context': self.env.context,
}
for operation in self.move_line_ids:
if operation.qty_done < 0:
raise UserError(_('No negative quantities allowed'))
if operation.qty_done > 0:
pass
#operation.write({'product_qty': operation.qty_done})
else:
move_line_delete |= operation
if move_line_delete:
move_line_delete.unlink()
self.action_done()
return
addons/stock/models/stock_production_lot.py
+4 -4
View File
@@ -30,10 +30,10 @@ class ProductionLot(models.Model):
@api.model
def create(self, vals):
pack_id = self.env.context.get('active_pack_operation', False)
if pack_id:
pack = self.env['stock.move.line'].browse(pack_id)
if pack.picking_id and not pack.picking_id.picking_type_id.use_create_lots:
active_picking_id = self.env.context.get('active_picking_id', False)
if active_picking_id:
picking_id = self.env['stock.picking'].browse(active_picking_id)
if picking_id and not picking_id.picking_type_id.use_create_lots:
raise UserError(_("You are not allowed to create a lot for this picking type"))
return super(ProductionLot, self).create(vals)
addons/stock/models/stock_quant.py
+10 -8
View File
@@ -183,15 +183,17 @@ class StockQuant(models.Model):
max_quantity_on_quant = quant.quantity - quant.reserved_quantity
if max_quantity_on_quant <= 0:
continue
max_quantity_on_quant = min(max_quantity_on_quant, quantity)
quant.reserved_quantity += max_quantity_on_quant
reserved_quants.append((quant, max_quantity_on_quant))
quantity -= max_quantity_on_quant
available_quantity -= max_quantity_on_quant
else:
max_quantity_on_quant = quant.reserved_quantity
max_quantity_on_quant = min(max_quantity_on_quant, quantity)
quant.reserved_quantity += max_quantity_on_quant
reserved_quants.append((quant, max_quantity_on_quant))
quantity -= max_quantity_on_quant
available_quantity -= max_quantity_on_quant
max_quantity_on_quant = min(quant.reserved_quantity, abs(quantity))
quant.reserved_quantity -= max_quantity_on_quant
reserved_quants.append((quant, -max_quantity_on_quant))
quantity += max_quantity_on_quant
available_quantity += max_quantity_on_quant
if quantity == 0 or available_quantity == 0:
break
addons/stock/tests/test_move.py
+86
View File
@@ -544,6 +544,53 @@ class StockMove(TransactionCase):
self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product2, self.stock_location), 0.0)
self.assertEqual(len(self.env['stock.quant']._gather(self.product2, self.stock_location)), 0.0)
def test_mixed_tracking_reservation_7(self):
""" Similar test_mixed_tracking_reservation_2 but creates first the tracked quant, then the
untracked ones. When adding a lot to the untracked move line, it should not decrease the
untracked quant then increase a non-existing tracked one that will fallback on the
untracked quant.
"""
lot1 = self.env['stock.production.lot'].create({
'name': 'lot1',
'product_id': self.product2.id,
})
lot2 = self.env['stock.production.lot'].create({
'name': 'lot2',
'product_id': self.product2.id,
})
self.env['stock.quant']._update_available_quantity(self.product2, self.stock_location, 1, lot_id=lot1)
self.env['stock.quant']._update_available_quantity(self.product2, self.stock_location, 1)
self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product2, self.stock_location), 2.0)
# creation
move1 = self.env['stock.move'].create({
'name': 'test_in_1',
'location_id': self.stock_location.id,
'location_dest_id': self.customer_location.id,
'product_id': self.product2.id,
'product_uom': self.uom_unit.id,
'product_uom_qty': 2.0,
})
move1.action_confirm()
move1.action_assign()
self.assertEqual(len(move1.move_line_ids), 2)
for ml in move1.move_line_ids:
self.assertEqual(ml.product_qty, 1.0)
untracked_move_line = move1.move_line_ids.filtered(lambda ml: not ml.lot_id).lot_id = lot2
for ml in move1.move_line_ids:
self.assertEqual(ml.product_qty, 1.0)
move1.move_line_ids.write({'qty_done': 1.0})
move1.action_done()
self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product2, self.stock_location), 0.0)
self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product2, self.stock_location, lot_id=lot1, strict=True), 0.0)
self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product2, self.stock_location, lot_id=lot2, strict=True), 0.0)
quants = self.env['stock.quant']._gather(self.product2, self.stock_location)
self.assertEqual(len(quants), 0)
def test_putaway_1(self):
""" Receive products from a supplier. Check that putaway rules are rightly applied on
the receipt move line.
@@ -784,6 +831,45 @@ class StockMove(TransactionCase):
self.assertEqual(quants.reserved_quantity, 0.0)
self.assertEqual(len(move1.move_line_ids), 0.0)
def test_unreserve_5(self):
""" Check the unreservation of a stock move reserved on multiple quants.
"""
# make some stock
self.env['stock.quant']._update_available_quantity(self.product1, self.stock_location, 3)
self.env['stock.quant'].create({
'product_id': self.product1.id,
'location_id': self.stock_location.id,
'quantity': 2,
})
self.assertEqual(len(self.env['stock.quant']._gather(self.product1, self.stock_location)), 2)
self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product1, self.stock_location), 5)
# creation
move1 = self.env['stock.move'].create({
'name': 'test_unreserve_5',
'location_id': self.stock_location.id,
'location_dest_id': self.customer_location.id,
'product_id': self.product1.id,
'product_uom': self.uom_unit.id,
'product_uom_qty': 5.0,
})
self.assertEqual(move1.state, 'draft')
# confirmation
move1.action_confirm()
self.assertEqual(move1.state, 'confirmed')
# assignment
move1.action_assign()
self.assertEqual(move1.state, 'assigned')
self.assertEqual(len(move1.move_line_ids), 1)
move1.do_unreserve()
quants = self.env['stock.quant']._gather(self.product1, self.stock_location)
self.assertEqual(len(quants), 2.0)
for quant in quants:
self.assertEqual(quant.reserved_quantity, 0)
def test_link_assign_1(self):
""" Test the assignment mechanism when two chained stock moves try to move one unit of an
untracked product.
addons/stock/tests/test_move2.py
+223 -1
View File
@@ -2,6 +2,7 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from odoo.addons.stock.tests.common import TestStockCommon
from odoo.exceptions import UserError
class TestPickShip(TestStockCommon):
@@ -23,7 +24,7 @@ class TestPickShip(TestStockCommon):
'location_dest_id': self.customer_location,
'state': 'waiting',
})
picking_pick = self.env['stock.picking'].create({
'location_id': self.stock_location,
'location_dest_id': self.pack_location,
@@ -257,6 +258,7 @@ class TestSinglePicking(TestStockCommon):
# valid with backorder creation
delivery_order.move_lines[0].move_line_ids[0].qty_done = 1
delivery_order.do_transfer()
self.assertNotEqual(delivery_order.date_done, False)
self.assertEqual(self.env['stock.quant']._get_available_quantity(self.productA, pack_location), 0.0)
backorder = self.env['stock.picking'].search([('backorder_id', '=', delivery_order.id)])
@@ -294,6 +296,7 @@ class TestSinglePicking(TestStockCommon):
# valid with backorder creation
delivery_order.move_lines[0].move_line_ids[0].qty_done = 1
delivery_order.do_transfer()
self.assertNotEqual(delivery_order.date_done, False)
self.assertEqual(self.env['stock.quant']._get_available_quantity(self.productA, pack_location), 0.0)
backorder = self.env['stock.picking'].search([('backorder_id', '=', delivery_order.id)])
@@ -699,3 +702,222 @@ class TestSinglePicking(TestStockCommon):
self.assertEqual(len(move1.move_line_ids), 2)
self.assertEqual(move1.move_line_ids[0].lot_id.id, serial1.id)
self.assertEqual(move1.move_line_ids[1].lot_id.id, serial2.id)
def test_add_move_when_picking_is_available_1(self):
""" Check that any move added in a picking once it's assigned is directly considered as
assigned and bypass the reservation.
"""
delivery_order = self.env['stock.picking'].create({
'location_id': self.pack_location,
'location_dest_id': self.customer_location,
'partner_id': self.partner_delta_id,
'picking_type_id': self.picking_type_out,
})
self.MoveObj.create({
'name': self.productA.name,
'product_id': self.productA.id,
'product_uom_qty': 2,
'product_uom': self.productA.uom_id.id,
'picking_id': delivery_order.id,
'location_id': self.pack_location,
'location_dest_id': self.customer_location,
})
# make some stock
pack_location = self.env['stock.location'].browse(self.pack_location)
self.env['stock.quant']._update_available_quantity(self.productA, pack_location, 2)
# assign
delivery_order.action_confirm()
delivery_order.action_assign()
self.assertEqual(delivery_order.state, 'assigned')
# add a move
move2 = self.MoveObj\
.with_context(default_picking_id=delivery_order.id)\
.create({
'name': self.productA.name,
'product_id': self.productB.id,
'product_uom_qty': 1,
'product_uom': self.productA.uom_id.id,
'picking_id': delivery_order.id,
'location_id': self.pack_location,
'location_dest_id': self.customer_location,
})
self.assertEqual(move2.state, 'assigned')
self.assertEqual(delivery_order.state, 'assigned')
def test_use_create_lot_use_existing_lot_1(self):
""" Check the behavior of a picking when `use_create_lot` and `use_existing_lot` are
set to False and there's a move for a tracked product.
"""
self.env['stock.picking.type']\
.browse(self.picking_type_out)\
.write({
'use_create_lots': False,
'use_existing_lots': False,
})
self.productA.tracking = 'lot'
delivery_order = self.env['stock.picking'].create({
'location_id': self.pack_location,
'location_dest_id': self.customer_location,
'partner_id': self.partner_delta_id,
'picking_type_id': self.picking_type_out,
})
self.MoveObj.create({
'name': self.productA.name,
'product_id': self.productA.id,
'product_uom_qty': 2,
'product_uom': self.productA.uom_id.id,
'picking_id': delivery_order.id,
'picking_type_id': self.picking_type_out,
'location_id': self.pack_location,
'location_dest_id': self.customer_location,
})
delivery_order.action_confirm()
delivery_order.force_assign()
delivery_order.move_lines.quantity_done = 2
# do not set a lot_id or lot_name, it should work
delivery_order.action_done()
def test_use_create_lot_use_existing_lot_2(self):
""" Check the behavior of a picking when `use_create_lot` and `use_existing_lot` are
set to True and there's a move for a tracked product.
"""
self.env['stock.picking.type']\
.browse(self.picking_type_out)\
.write({
'use_create_lots': True,
'use_existing_lots': True,
})
self.productA.tracking = 'lot'
delivery_order = self.env['stock.picking'].create({
'location_id': self.pack_location,
'location_dest_id': self.customer_location,
'partner_id': self.partner_delta_id,
'picking_type_id': self.picking_type_out,
})
self.MoveObj.create({
'name': self.productA.name,
'product_id': self.productA.id,
'product_uom_qty': 2,
'product_uom': self.productA.uom_id.id,
'picking_id': delivery_order.id,
'picking_type_id': self.picking_type_out,
'location_id': self.pack_location,
'location_dest_id': self.customer_location,
})
delivery_order.action_confirm()
delivery_order.force_assign()
delivery_order.move_lines.quantity_done = 2
move_line = delivery_order.move_lines.move_line_ids
# not lot_name set, should raise
with self.assertRaises(UserError):
delivery_order.action_done()
# enter a new lot name, should work
move_line.lot_name = 'newlot'
delivery_order.action_done()
def test_use_create_lot_use_existing_lot_3(self):
""" Check the behavior of a picking when `use_create_lot` is set to True and
`use_existing_lot` is set to False and there's a move for a tracked product.
"""
self.env['stock.picking.type']\
.browse(self.picking_type_out)\
.write({
'use_create_lots': True,
'use_existing_lots': False,
})
self.productA.tracking = 'lot'
delivery_order = self.env['stock.picking'].create({
'location_id': self.pack_location,
'location_dest_id': self.customer_location,
'partner_id': self.partner_delta_id,
'picking_type_id': self.picking_type_out,
})
self.MoveObj.create({
'name': self.productA.name,
'product_id': self.productA.id,
'product_uom_qty': 2,
'product_uom': self.productA.uom_id.id,
'picking_id': delivery_order.id,
'picking_type_id': self.picking_type_out,
'location_id': self.pack_location,
'location_dest_id': self.customer_location,
})
delivery_order.action_confirm()
delivery_order.force_assign()
delivery_order.move_lines.quantity_done = 2
move_line = delivery_order.move_lines.move_line_ids
# not lot_name set, should raise
with self.assertRaises(UserError):
delivery_order.action_done()
# enter a new lot name, should work
move_line.lot_name = 'newlot'
delivery_order.action_done()
def test_use_create_lot_use_existing_lot_4(self):
""" Check the behavior of a picking when `use_create_lot` is set to False and
`use_existing_lot` is set to True and there's a move for a tracked product.
"""
self.env['stock.picking.type']\
.browse(self.picking_type_out)\
.write({
'use_create_lots': False,
'use_existing_lots': True,
})
self.productA.tracking = 'lot'
delivery_order = self.env['stock.picking'].create({
'location_id': self.pack_location,
'location_dest_id': self.customer_location,
'partner_id': self.partner_delta_id,
'picking_type_id': self.picking_type_out,
})
self.MoveObj.create({
'name': self.productA.name,
'product_id': self.productA.id,
'product_uom_qty': 2,
'product_uom': self.productA.uom_id.id,
'picking_id': delivery_order.id,
'picking_type_id': self.picking_type_out,
'location_id': self.pack_location,
'location_dest_id': self.customer_location,
})
delivery_order.action_confirm()
delivery_order.force_assign()
delivery_order.move_lines.quantity_done = 2
move_line = delivery_order.move_lines.move_line_ids
# not lot_name set, should raise
with self.assertRaises(UserError):
delivery_order.action_done()
# creating a lot from the view should raise
with self.assertRaises(UserError):
self.env['stock.production.lot']\
.with_context(active_picking_id=delivery_order.id)\
.create({
'name': 'lot1',
'product_id': self.productA.id,
})
# enter an existing lot_id, should work
lot1 = self.env['stock.production.lot'].create({
'name': 'lot1',
'product_id': self.productA.id,
})
move_line.lot_id = lot1
delivery_order.action_done()
addons/stock/tests/test_quant.py
+4 -4
View File
@@ -475,7 +475,7 @@ class StockQuant(TransactionCase):
})
self.assertEqual(self.env['stock.quant']._get_available_quantity(product1, stock_location), 0.0)
self.assertEqual(len(self.env['stock.quant']._gather(product1, stock_location)), 1)
self.env['stock.quant']._update_reserved_quantity(product1, stock_location, -10.0)
self.env['stock.quant']._update_reserved_quantity(product1, stock_location, -10.0, strict=True)
self.assertEqual(self.env['stock.quant']._get_available_quantity(product1, stock_location), 10.0)
self.assertEqual(len(self.env['stock.quant']._gather(product1, stock_location)), 1)
@@ -491,7 +491,7 @@ class StockQuant(TransactionCase):
self.env['stock.quant']._update_reserved_quantity(product1, stock_location, 1.0)
self.assertEqual(self.env['stock.quant']._get_available_quantity(product1, stock_location), 0.0)
with self.assertRaises(UserError):
self.env['stock.quant']._update_reserved_quantity(product1, stock_location, -1.0)
self.env['stock.quant']._update_reserved_quantity(product1, stock_location, -1.0, strict=True)
self.assertEqual(self.env['stock.quant']._get_available_quantity(product1, stock_location), 0.0)
def test_action_done_1(self):
@@ -505,7 +505,7 @@ class StockQuant(TransactionCase):
self.assertEqual(self.env['stock.quant']._get_available_quantity(product1, stock_location), 2.0)
self.env['stock.quant']._update_reserved_quantity(product1, stock_location, 2.0)
self.assertEqual(self.env['stock.quant']._get_available_quantity(product1, stock_location), 0.0)
self.env['stock.quant']._update_reserved_quantity(product1, stock_location, -2.0)
self.env['stock.quant']._update_reserved_quantity(product1, stock_location, -2.0, strict=True)
self.assertEqual(self.env['stock.quant']._get_available_quantity(product1, stock_location), 2.0)
self.env['stock.quant']._update_available_quantity(product1, stock_location, -2.0)
self.assertEqual(self.env['stock.quant']._get_available_quantity(product1, stock_location), 0.0)
@@ -545,7 +545,7 @@ class StockQuant(TransactionCase):
self.assertEqual(self.env['stock.quant']._get_available_quantity(product1, stock_location, lot_id=lot1), 1.0)
with self.assertRaises(UserError):
self.env['stock.quant']._update_reserved_quantity(product1, stock_location, -1.0)
self.env['stock.quant']._update_reserved_quantity(product1, stock_location, -1.0, strict=True)
self.assertEqual(self.env['stock.quant']._get_available_quantity(product1, stock_location), 2.0)
self.assertEqual(self.env['stock.quant']._get_available_quantity(product1, stock_location, strict=True), 1.0)
addons/stock/tests/test_stock_flow.py
+4 -4
View File
@@ -1237,7 +1237,6 @@ class TestStockFlow(TestStockCommon):
def test_30_check_with_no_incoming_lot(self):
""" Picking in without lots and picking out with"""
# Change basic operation type not to get lots
# Create product with lot tracking
picking_in = self.env['stock.picking.type'].browse(self.picking_type_in)
@@ -1254,6 +1253,7 @@ class TestStockFlow(TestStockCommon):
'product_uom_qty': 4,
'product_uom': self.productA.uom_id.id,
'picking_id': picking_in.id,
'picking_type_id': self.picking_type_in,
'location_id': self.supplier_location,
'location_dest_id': self.stock_location})
@@ -1737,8 +1737,8 @@ class TestStockFlow(TestStockCommon):
self.assertEquals(picking_out.state, "assigned")
def test_74_move_state_waiting_mto(self):
""" This test will check that when a move is unreserved, it state change to 'waiting' if
it has ancestors or is has a 'procure_method' equal to 'make_to_order' else the state
""" This test will check that when a move is unreserved, its state changes to 'waiting' if
it has ancestors or if it has a 'procure_method' equal to 'make_to_order' else the state
changes to 'confirmed'.
"""
picking_out = self.PickingObj.create({
@@ -1763,7 +1763,7 @@ class TestStockFlow(TestStockCommon):
'picking_id': picking_out.id,
'location_id': self.stock_location,
'location_dest_id': self.customer_location})
the_ancestor = self.MoveObj.create({
self.MoveObj.create({
'name': self.productA.name,
'product_id': self.productA.id,
'product_uom_qty': 2,

Some files were not shown because too many files have changed in this diff Show More