mirror of
https://github.com/NaN-tic/trytond-patches.git
synced 2023-12-14 06:03:03 +01:00
Merge branch '6.8' of github.com:nan-tic/trytond-patches into 6.8
This commit is contained in:
commit
227e368922
13
issue12553.diff
Normal file
13
issue12553.diff
Normal file
|
@ -0,0 +1,13 @@
|
|||
diff --git a/tryton/sao/src/view/form.js b/tryton/sao/src/view/form.js
|
||||
index 7c291d6c5a..50167d704a 100644
|
||||
--- a/tryton/sao/src/view/form.js
|
||||
+++ b/tryton/sao/src/view/form.js
|
||||
@@ -872,7 +872,7 @@ function eval_pyson(value){
|
||||
hide: function() {
|
||||
Sao.View.Form.Page._super.hide.call(this);
|
||||
if (this.el.hasClass('active')) {
|
||||
- this.el.next(':visible').find('a').tab('show');
|
||||
+ this.el.siblings(':visible').first().find('a').tab('show');
|
||||
}
|
||||
}
|
||||
});
|
26
locales.diff
26
locales.diff
|
@ -11,3 +11,29 @@ index 312c014d4e..4cfdd9b2c9 100644
|
|||
|
||||
msgctxt "model:ir.message,text:msg_erase_party_pending_invoice"
|
||||
msgid ""
|
||||
diff --git a/tryton/modules/project_invoice/locale/es.po b/tryton/modules/project_invoice/locale/es.po
|
||||
index 2f3580e1cb..b60b878324 100644
|
||||
--- a/tryton/modules/project_invoice/locale/es.po
|
||||
+++ b/tryton/modules/project_invoice/locale/es.po
|
||||
@@ -76,7 +76,7 @@ msgstr "No puede eliminar una línea facturada."
|
||||
msgctxt "model:ir.message,text:msg_missing_account_revenue"
|
||||
msgid "To invoice work \"%(work)s\" you must configure a default account revenue."
|
||||
msgstr ""
|
||||
-"Para facturar el trabajo \"%(works)\" debéis configurar una cuenta de "
|
||||
+"Para facturar el trabajo \"%(work)s\" debéis configurar una cuenta de "
|
||||
"ingressos por defecto."
|
||||
|
||||
msgctxt "model:ir.message,text:msg_missing_list_price"
|
||||
diff --git a/tryton/modules/purchase/locale/ca.po b/tryton/modules/purchase/locale/ca.po
|
||||
index d02f1a8a2f..129a59e3a7 100644
|
||||
--- a/tryton/modules/purchase/locale/ca.po
|
||||
+++ b/tryton/modules/purchase/locale/ca.po
|
||||
@@ -716,7 +716,7 @@ msgid ""
|
||||
"To invoice purchase \"%(purchase)s\" you must configure a default account "
|
||||
"expense."
|
||||
msgstr ""
|
||||
-"Per facturar la compra \"%(purchase)\" heu de configurar un compte de "
|
||||
+"Per facturar la compra \"%(purchase)s\" heu de configurar un compte de "
|
||||
"despeses per defecte."
|
||||
|
||||
msgctxt "model:ir.message,text:msg_purchase_modify_header_draft"
|
||||
|
|
2
series
2
series
|
@ -58,4 +58,6 @@ issue12678.diff # [account_statement] Not delete statement lines when statament
|
|||
|
||||
account_statement_second_currency.diff # [account_statement] Support second currency on statement line
|
||||
|
||||
issue12553.diff # [sao] Select first visible siblings when page is hidden
|
||||
|
||||
update_trees_chart_accounts.diff # [account_account] Update trees of chart of accounts with 2 passes
|
||||
|
|
Loading…
Reference in a new issue