Skip to content
Permalink
Browse files

[MERGE] forward port branch saas-12.1 up to 0f4abc5

  • Loading branch information...
KangOl committed Feb 22, 2019
2 parents 1af67ff + 0f4abc5 commit 0e7675847f05a63cf013210dabac82c94845217f
Showing with 5,470 additions and 2,598 deletions.
  1. +3 −9 addons/account/i18n/ca.po
  2. +3 −10 addons/account/i18n/es.po
  3. +6 −10 addons/account/i18n/fr.po
  4. +9 −5 addons/account/i18n/hu.po
  5. +134 −122 addons/account/i18n/mn.po
  6. +11 −11 addons/account/i18n/nl.po
  7. +2 −7 addons/account/i18n/ro.po
  8. +1 −1 addons/account/i18n/sv.po
  9. +9 −7 addons/account/i18n/uk.po
  10. +11 −14 addons/account/i18n/zh_TW.po
  11. +1 −1 addons/account/models/account.py
  12. +4 −1 addons/account/models/account_bank_statement.py
  13. +1 −1 addons/account/models/account_invoice.py
  14. +141 −88 addons/account/models/account_move.py
  15. +2 −0 addons/account/models/account_payment.py
  16. +1 −1 addons/account/models/chart_template.py
  17. +1 −1 addons/account/security/ir.model.access.csv
  18. +2 −2 addons/account/static/src/js/reconciliation/reconciliation_model.js
  19. +1 −1 addons/account/static/src/js/reconciliation/reconciliation_renderer.js
  20. +2 −1 addons/account/static/src/xml/account_reconciliation.xml
  21. +6 −0 addons/account/tests/account_test_no_chart.py
  22. +8 −0 addons/account/tests/test_reconciliation.py
  23. +0 −1 addons/account/views/res_config_settings_views.xml
  24. +15 −8 addons/account_bank_statement_import/i18n/mn.po
  25. +3 −3 addons/account_check_printing/i18n/sv.po
  26. +9 −10 addons/account_facturx/models/account_invoice.py
  27. +13 −7 addons/account_voucher/i18n/mn.po
  28. +32 −3 addons/account_voucher/models/account_voucher.py
  29. +13 −7 addons/analytic/i18n/mn.po
  30. +1 −1 addons/auth_signup/models/res_partner.py
  31. +0 −3 addons/base_automation/views/base_automation_view.xml
  32. +1 −0 addons/base_import_module/views/base_import_module_view.xml
  33. +1 −0 addons/bus/static/src/js/longpolling_bus.js
  34. +1 −1 addons/crm/models/crm_lead.py
  35. +0 −2 addons/crm/views/crm_lead_views.xml
  36. +3 −2 addons/digest/data/digest_template_data.xml
  37. +1 −1 addons/digest/models/digest.py
  38. +3 −1 addons/google_calendar/models/google_calendar.py
  39. +7 −0 addons/hr/security/hr_security.xml
  40. +11 −0 addons/hr/views/hr_views.xml
  41. +4 −6 addons/hr_attendance/static/src/js/kiosk_confirm.js
  42. +2 −3 addons/hr_attendance/static/src/js/my_attendances.js
  43. +21 −15 addons/hr_expense/models/hr_expense.py
  44. +67 −0 addons/hr_expense/tests/test_expenses.py
  45. +2 −2 addons/hr_holidays/models/hr_leave.py
  46. +2 −2 addons/hr_holidays/models/hr_leave_allocation.py
  47. +4 −1 addons/hr_holidays/models/hr_leave_type.py
  48. +0 −1 addons/hr_payroll/__manifest__.py
  49. +78 −68 addons/hr_payroll/models/hr_benefit.py
  50. +12 −7 addons/hr_payroll/models/hr_employee.py
  51. +14 −8 addons/hr_payroll/models/hr_leave.py
  52. +1 −1 addons/hr_payroll/models/hr_payslip.py
  53. +5 −4 addons/hr_payroll/models/resource.py
  54. +2 −1 addons/hr_payroll/security/ir.model.access.csv
  55. +6 −8 addons/hr_payroll/static/src/js/benefit.js
  56. +82 −62 addons/hr_payroll/tests/test_benefit.py
  57. +2 −3 addons/hr_payroll/views/hr_benefit_views.xml
  58. +6 −6 addons/hr_payroll/wizard/hr_payroll_contribution_register_report.py
  59. +2 −3 addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
  60. +7 −7 addons/hr_payroll_account/models/hr_payroll_account.py
  61. +1 −0 addons/im_livechat/models/im_livechat_channel.py
  62. +137 −334 addons/l10n_ch/i18n_extra/de.po
  63. +111 −501 addons/l10n_ch/i18n_extra/it.po
  64. +106 −477 addons/l10n_ch/i18n_extra/l10n_ch.pot
  65. +1 −1 addons/l10n_it/__manifest__.py
  66. +5 −0 addons/l10n_it_edi/__init__.py
  67. +22 −0 addons/l10n_it_edi/__manifest__.py
  68. +23 −0 addons/l10n_it_edi/data/account_invoice_demo.xml
  69. +175 −0 addons/l10n_it_edi/data/invoice_it_template.xml
  70. +8 −0 addons/l10n_it_edi/models/__init__.py
  71. +758 −0 addons/l10n_it_edi/models/account_invoice.py
  72. +21 −0 addons/l10n_it_edi/models/ddt.py
  73. +358 −0 addons/l10n_it_edi/models/ir_mail_server.py
  74. +110 −0 addons/l10n_it_edi/models/res_company.py
  75. +28 −0 addons/l10n_it_edi/models/res_partner.py
  76. +2 −0 addons/l10n_it_edi/security/ir.model.access.csv
  77. +2 −0 addons/l10n_it_edi/tests/__init__.py
  78. +32 −0 addons/l10n_it_edi/tests/test_generate.py
  79. +265 −0 addons/l10n_it_edi/views/l10n_it_view.xml
  80. +4 −0 addons/l10n_mx/data/account_data.xml
  81. +34 −0 addons/l10n_mx/data/account_tax_data.xml
  82. +3 −1 addons/mail/data/mail_data.xml
  83. +30 −15 addons/mail/models/mail_channel.py
  84. +1 −1 addons/mail/models/mail_message.py
  85. +3 −1 addons/mail/models/mail_thread.py
  86. +7 −2 addons/mail/static/src/js/chatter.js
  87. +3 −23 addons/mail/static/src/js/models/threads/channel.js
  88. +3 −1 addons/mail/static/src/js/models/threads/dm_chat.js
  89. +1 −37 addons/mail/static/src/js/models/threads/mixins/channel_seen_mixin.js
  90. +31 −0 addons/mail/static/src/js/services/mail_manager.js
  91. +29 −2 addons/mail/static/src/js/services/mail_notification_manager.js
  92. +1 −0 addons/mail/static/src/js/thread_widget.js
  93. +3 −0 addons/mail/static/src/js/thread_windows/thread_window.js
  94. +2 −2 addons/mail/static/src/scss/thread.scss
  95. +7 −1 addons/mail/static/src/xml/chatter.xml
  96. +76 −52 addons/mail/static/tests/discuss_seen_indicator_tests.js
  97. +56 −4 addons/mail/static/tests/systray/systray_messaging_menu_tests.js
  98. +6 −0 addons/mass_mailing/models/mass_mailing.py
  99. +1 −1 addons/mrp/models/mrp_workcenter.py
  100. +1 −1 addons/note/static/src/js/systray_activity_menu.js
  101. +0 −1 addons/note/static/tests/systray_activity_menu_tests.js
  102. +4 −6 addons/point_of_sale/models/pos_order.py
  103. +2 −0 addons/point_of_sale/models/pos_session.py
  104. +4 −2 addons/point_of_sale/static/src/js/gui.js
  105. +2 −2 addons/point_of_sale/static/src/js/screens.js
  106. +5 −1 addons/point_of_sale/views/pos_templates.xml
  107. +10 −0 addons/portal/models/portal_mixin.py
  108. +5 −5 addons/portal/wizard/portal_share.py
  109. +12 −2 addons/project/models/project.py
  110. +1 −1 addons/project/models/res_partner.py
  111. +0 −5 addons/project/static/src/js/tour.js
  112. +2 −0 addons/purchase_requisition/data/purchase_requisition_data.xml
  113. +3 −2 addons/resource/models/resource.py
  114. +13 −13 addons/resource/models/resource_mixin.py
  115. +24 −24 addons/resource/tests/test_resource.py
  116. +1 −1 addons/sale/models/account_reconciliation_widget.py
  117. +7 −1 addons/sale/models/sale.py
  118. +55 −0 addons/sale/tests/test_sale_order.py
  119. +1 −1 addons/sale_margin/models/sale_order.py
  120. +6 −0 addons/sale_quotation_builder/views/sale_portal_templates.xml
  121. +1 −1 addons/sale_stock/views/sale_stock_portal_template.xml
  122. +3 −1 addons/stock/models/product.py
  123. +2 −2 addons/stock/models/stock_warehouse.py
  124. +4 −8 addons/stock/report/report_deliveryslip.xml
  125. +3 −6 addons/stock/views/stock_picking_views.xml
  126. +1 −1 addons/test_mail/tests/test_performance.py
  127. +4 −0 addons/test_website/__init__.py
  128. +24 −0 addons/test_website/__manifest__.py
  129. +4 −0 addons/test_website/controllers/__init__.py
  130. +13 −0 addons/test_website/controllers/main.py
  131. +54 −0 addons/test_website/data/test_website_data.xml
  132. +103 −0 addons/test_website/static/src/js/reset_views.test.js
  133. +4 −0 addons/test_website/tests/__init__.py
  134. +102 −0 addons/test_website/tests/test_reset_views.py
  135. +8 −0 addons/test_website/views/templates.xml
  136. +15 −5 addons/web/static/lib/moment/locale/es.js
  137. +1 −8 addons/web/static/lib/py.js/lib/py.js
  138. +11 −0 addons/web/static/src/js/core/abstract_storage_service.js
  139. +9 −1 addons/web/static/src/js/core/py_utils.js
  140. +11 −1 addons/web/static/src/js/core/utils.js
  141. +1 −0 addons/web/static/src/js/fields/basic_fields.js
  142. +14 −3 addons/web/static/src/js/views/control_panel/control_panel_model.js
  143. +0 −2 addons/web/static/src/js/views/control_panel/search/filter_menu.js
  144. +1 −10 addons/web/static/src/js/views/control_panel/search/search_filters.js
  145. +6 −1 addons/web/static/src/js/views/graph/graph_renderer.js
  146. +5 −3 addons/web/static/src/js/views/pivot/pivot_model.js
  147. +2 −1 addons/web/static/src/js/views/pivot/pivot_renderer.js
  148. +4 −0 addons/web/static/src/scss/form_view.scss
  149. +29 −0 addons/web/static/src/scss/graph_view.scss
  150. +1 −1 addons/web/static/src/xml/base.xml
  151. +1 −1 addons/web/static/tests/chrome/action_manager_tests.js
  152. +1 −0 addons/web/static/tests/chrome/user_menu_tests.js
  153. +14 −21 addons/web/static/tests/core/py_utils_tests.js
  154. +20 −0 addons/web/static/tests/core/util_tests.js
  155. +21 −3 addons/web/static/tests/core/widget_tests.js
  156. +5 −0 addons/web/static/tests/helpers/test_utils_mock.js
  157. +2 −0 addons/web/static/tests/views/abstract_controller_tests.js
  158. +81 −0 addons/web/static/tests/views/control_panel_tests.js
  159. +96 −1 addons/web/static/tests/views/pivot_tests.js
  160. +46 −8 addons/web/static/tests/views/search_filter_menu_tests.js
  161. +5 −5 addons/web/static/tests/views/search_view_tests.js
  162. +1 −1 addons/web/static/tests/views/view_dialogs_tests.js
  163. +9 −6 addons/web_editor/models/ir_ui_view.py
  164. +21 −17 addons/web_editor/static/src/scss/web_editor.variables.scss
  165. +4 −4 addons/web_editor/static/src/xml/editor.xml
  166. +24 −12 addons/website/controllers/main.py
  167. +51 −19 addons/website/models/ir_http.py
  168. +19 −0 addons/website/models/ir_ui_view.py
  169. +7 −0 addons/website/models/res_partner.py
  170. +72 −3 addons/website/models/website.py
  171. +181 −0 addons/website/static/src/js/tours/website_tour_reset_password.js
  172. +2 −2 addons/website/static/src/scss/website.editor.ui.scss
  173. +6 −2 addons/website/static/src/scss/website.ui.scss
  174. +2 −2 addons/website/static/src/xml/website.pageProperties.xml
  175. +2 −0 addons/website/tests/__init__.py
  176. +114 −0 addons/website/tests/test_get_current_website.py
  177. +76 −0 addons/website/tests/test_views.py
  178. +34 −0 addons/website/tests/test_website_reset_password.py
  179. +73 −56 addons/website/views/website_templates.xml
  180. +1 −1 addons/website_crm_partner_assign/controllers/main.py
  181. +3 −3 addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
  182. +10 −10 addons/website_event_track/models/event.py
  183. +10 −7 addons/website_forum/views/website_forum.xml
  184. +1 −1 addons/website_sale/data/mail_template_data.xml
  185. +8 −1 addons/website_sale/models/account_invoice.py
  186. +18 −4 addons/website_sale/models/sale_order.py
  187. +93 −0 addons/website_sale/static/src/js/website_sale_tour_shop_cart_recovery.js
  188. +94 −0 addons/website_sale/static/src/js/website_sale_tour_shop_mail.js
  189. +1 −1 addons/website_sale/static/src/scss/website_sale.scss
  190. +2 −0 addons/website_sale/tests/__init__.py
  191. +13 −0 addons/website_sale/tests/test_website_sale_cart_recovery.py
  192. +24 −0 addons/website_sale/tests/test_website_sale_mail.py
  193. +3 −1 addons/website_sale/views/templates.xml
  194. +4 −2 addons/website_sale_delivery/static/src/js/website_sale_delivery.js
  195. +1 −1 addons/website_sale_stock/views/website_sale_stock_templates.xml
  196. +2 −1 doc/cla/corporate/invitu.md
  197. +1 −0 doc/cla/corporate/vauxoo.md
  198. +11 −0 doc/cla/individual/naglis.md
  199. +32 −0 doc/reference/reports.rst
  200. +4 −1 odoo/addons/base/data/res.lang.csv
  201. +3 −2 odoo/addons/base/i18n/mn.po
  202. +8 −201 odoo/addons/base/i18n/nl.po
  203. +4 −0 odoo/addons/base/i18n/uk.po
  204. +4 −1 odoo/addons/base/models/ir_actions_report.py
  205. +10 −8 odoo/addons/base/models/ir_ui_view.py
  206. +1 −1 odoo/addons/base/models/res_country.py
  207. +6 −0 odoo/addons/base/models/res_partner.py
  208. +60 −0 odoo/addons/base/tests/test_views.py
  209. +50 −0 odoo/addons/test_new_api/tests/test_new_fields.py
  210. +12 −1 odoo/addons/test_testing_utilities/menu.xml
  211. +3 −4 odoo/addons/test_testing_utilities/models.py
  212. +14 −12 odoo/addons/test_testing_utilities/tests/test_form_impl.py
  213. +7 −2 odoo/api.py
  214. +18 −4 odoo/fields.py
  215. +42 −20 odoo/models.py
  216. +46 −15 odoo/tests/common.py
@@ -11,14 +11,15 @@
# Marc Tormo i Bochaca <mtbochaca@gmail.com>, 2019
# RGB Consulting <odoo@rgbconsulting.com>, 2019
# Quim - eccit <quim@eccit.com>, 2019
# Sabina Batlle <sbb@odoo.com>, 2019
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~12.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-16 07:59+0000\n"
"PO-Revision-Date: 2016-08-05 12:55+0000\n"
"Last-Translator: Quim - eccit <quim@eccit.com>, 2019\n"
"Last-Translator: Sabina Batlle <sbb@odoo.com>, 2019\n"
"Language-Team: Catalan (https://www.transifex.com/odoo/teams/41243/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -216,7 +217,7 @@ msgstr ""
#. module: account
#: model_terms:ir.ui.view,arch_db:account.portal_my_home_menu_invoice
msgid "<em>Draft Invoice</em>"
msgstr ""
msgstr "Factura esborrany"

#. module: account
#: model_terms:ir.ui.view,arch_db:account.account_move_line_view_kanban
@@ -12070,13 +12071,6 @@ msgstr ""
msgid "have been reconciled automatically."
msgstr ""

#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_reconciliation.xml:44
#, python-format
msgid "o_manual_statement"
msgstr ""

#. module: account
#: selection:account.payment.term.line,option:0
msgid "of the current month"
@@ -70,17 +70,17 @@
# Miquel Torner <miq@odoo.com>, 2019
# Nicolás Broggi <rnbroggi@gmail.com>, 2019
# Luis González <lgonzalez@vauxoo.com>, 2019
# Gabriel Umaña <gabriel.umana@delfixcr.com>, 2019
# Luis Marin <marin.guadarrama@gmail.com>, 2019
# Edilianny Sánchez <esanchez@vauxoo.com>, 2019
# Gabriel Umana <gabriel.umana@delfixcr.com>, 2019
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~12.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-16 07:59+0000\n"
"PO-Revision-Date: 2016-08-05 12:55+0000\n"
"Last-Translator: Edilianny Sánchez <esanchez@vauxoo.com>, 2019\n"
"Last-Translator: Gabriel Umana <gabriel.umana@delfixcr.com>, 2019\n"
"Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -5107,7 +5107,7 @@ msgstr "Agrupar líneas de factura"
#. module: account
#: model:ir.model.fields,field_description:account.field_account_register_payments__group_invoices
msgid "Group Invoices"
msgstr ""
msgstr "Grupo de facturas"

#. module: account
#: selection:account.tax,amount_type:0
@@ -12358,13 +12358,6 @@ msgstr ""
msgid "have been reconciled automatically."
msgstr ""

#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_reconciliation.xml:44
#, python-format
msgid "o_manual_statement"
msgstr "o_manual_statement"

#. module: account
#: selection:account.payment.term.line,option:0
msgid "of the current month"
@@ -41,7 +41,6 @@
# Fabri Yohann <psn@fabri.pw>, 2017
# FR R4 <e2ffr1111@hotmail.com>, 2017
# Matillon Samantha <smatillon@gmail.com>, 2017
# Moka Tourisme <hello@mokatourisme.fr>, 2018
# Olivier Dony <odo@odoo.com>, 2018
# Hubert TETARD <htetard@apik-conseils.com>, 2018
# Nancy Bolognesi <nb@microcom.ca>, 2018
@@ -79,14 +78,16 @@
# Alain van de Werve <avw@openerp.com>, 2019
# Khalyomede Khalyomede <khalyomede@gmail.com>, 2019
# Fabien Bourgeois <fabien@yaltik.com>, 2019
# Phil Anth <thep3r3x@gmail.com>, 2019
# Moka Tourisme <hello@mokatourisme.fr>, 2019
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~12.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-16 07:59+0000\n"
"PO-Revision-Date: 2016-08-05 12:55+0000\n"
"Last-Translator: Fabien Bourgeois <fabien@yaltik.com>, 2019\n"
"Last-Translator: Moka Tourisme <hello@mokatourisme.fr>, 2019\n"
"Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -681,7 +682,7 @@ msgstr ""
#. module: account
#: model_terms:ir.ui.view,arch_db:account.portal_invoice_page
msgid "<strong class=\"text-muted\">Your Contact</strong>"
msgstr ""
msgstr "<strong class=\"text-muted\">Votre contact</strong>"

#. module: account
#: model_terms:ir.ui.view,arch_db:account.report_invoice_document_with_payments
@@ -4909,6 +4910,8 @@ msgstr "Pour être en pourcentage, saisir une valeur entre 0 et 100."
msgid ""
"Forbidden unit price, account and quantity on non-accountable invoice line"
msgstr ""
"Prix ​​unitaire, compte et quantité interdits sur la ligne de facture non "
"comptable"

#. module: account
#: model:ir.model.fields,help:account.field_account_reconcile_model__force_second_tax_included
@@ -12422,13 +12425,6 @@ msgstr ""
msgid "have been reconciled automatically."
msgstr ""

#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_reconciliation.xml:44
#, python-format
msgid "o_manual_statement"
msgstr "o_manual_statement"

#. module: account
#: selection:account.payment.term.line,option:0
msgid "of the current month"
@@ -6,9 +6,9 @@
# picibucor <picibucor@gmail.com>, 2017
# Tibor Kőnig <konig.tibor@evitalit.hu>, 2019
# krnkris, 2019
# gezza <geza.nagy@oregional.hu>, 2019
# Kovács Tibor <kovika@gmail.com>, 2019
# Martin Trigaux, 2019
# gezza <geza.nagy@oregional.hu>, 2019
# Ákos Nagy <akos.nagy@oregional.hu>, 2019
#
msgid ""
@@ -4044,7 +4044,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_digest_digest
msgid "Digest"
msgstr ""
msgstr "Kivonat"

#. module: account
#: model:ir.model.fields,help:account.field_res_config_settings__group_products_in_bills
@@ -4152,7 +4152,7 @@ msgstr "Feltüntetve a számlákon"
#: code:addons/account/models/digest.py:16
#, python-format
msgid "Do not have access, skip this data for user's digest email"
msgstr ""
msgstr "Nincs hozzáférés, adat kihagyása a felhasználó kivonat e-mailjéből"

#. module: account
#: model:ir.model.fields,help:account.field_account_invoice_send__auto_delete_message
@@ -6332,7 +6332,7 @@ msgstr ""
#: model_terms:ir.ui.view,arch_db:account.view_account_invoice_filter
#: model_terms:ir.ui.view,arch_db:account.view_account_payment_search
msgid "Late Activities"
msgstr ""
msgstr "Késő tevékenységek"

#. module: account
#: model:ir.model.fields,field_description:account.field_account_account__last_time_entries_checked
@@ -6344,7 +6344,7 @@ msgstr "Legutóbbi Számlák & Fizetések könyvelői párosításának dátuma"
#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_send__layout
msgid "Layout"
msgstr ""
msgstr "Elrendezés"

#. module: account
#: model_terms:ir.ui.view,arch_db:account.view_account_position_form
@@ -9344,6 +9344,10 @@ msgid ""
"Today: Activity date is today\n"
"Planned: Future activities."
msgstr ""
"Tevékenységeken alapuló állapot\n"
"Lejárt: Az esedékesség dátuma már elmúlt\n"
"Ma: A tevékenység dátuma ma van\n"
"Tervezett: Jövőbeli tevékenységek."

#. module: account
#: model_terms:ir.ui.view,arch_db:account.onboarding_bank_account_step
Oops, something went wrong.

0 comments on commit 0e76758

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.