mirror of
https://github.com/NaN-tic/trytond-patches.git
synced 2023-12-14 06:03:03 +01:00
Upgrade patches last main branch
This commit is contained in:
parent
497e2eed1d
commit
d967352d4f
2 changed files with 17 additions and 17 deletions
|
@ -1,8 +1,8 @@
|
||||||
diff --git a/tryton/sao/src/sao.js b/sao/src/sao.js
|
diff --git a/tryton/sao/src/sao.js b/tryton/sao/src/sao.js
|
||||||
index 05d86252..fcedb792 100644
|
index 9e5807824e..21bb43ccfa 100644
|
||||||
--- a/tryton/sao/src/sao.js
|
--- a/tryton/sao/src/sao.js
|
||||||
+++ b/tryton/sao/src/sao.js
|
+++ b/tryton/sao/src/sao.js
|
||||||
@@ -1081,10 +1081,6 @@ var Sao = {};
|
@@ -1120,10 +1120,6 @@ var Sao = {
|
||||||
shortcut: 'ctrl+p',
|
shortcut: 'ctrl+p',
|
||||||
label: Sao.i18n.gettext('Print'),
|
label: Sao.i18n.gettext('Print'),
|
||||||
id: 'print',
|
id: 'print',
|
||||||
|
@ -13,8 +13,8 @@ index 05d86252..fcedb792 100644
|
||||||
}, {
|
}, {
|
||||||
shortcut: 'alt+shift+tab',
|
shortcut: 'alt+shift+tab',
|
||||||
label: Sao.i18n.gettext('Previous tab'),
|
label: Sao.i18n.gettext('Previous tab'),
|
||||||
diff --git a/src/tab.js b/src/tab.js
|
diff --git a/tryton/sao/src/tab.js b/tryton/sao/src/tab.js
|
||||||
index f9186bc9..47987500 100644
|
index 411b61a9b6..a47e21f586 100644
|
||||||
--- a/tryton/sao/src/tab.js
|
--- a/tryton/sao/src/tab.js
|
||||||
+++ b/tryton/sao/src/tab.js
|
+++ b/tryton/sao/src/tab.js
|
||||||
@@ -91,11 +91,6 @@
|
@@ -91,11 +91,6 @@
|
||||||
|
@ -47,10 +47,10 @@ index f9186bc9..47987500 100644
|
||||||
var button = dropdown.find('button');
|
var button = dropdown.find('button');
|
||||||
this.buttons[menu_action[0]] = button;
|
this.buttons[menu_action[0]] = button;
|
||||||
dropdown
|
dropdown
|
||||||
@@ -1433,7 +1428,7 @@
|
@@ -1442,7 +1437,7 @@
|
||||||
name += '#' + selected;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
const view_type = this.screen.current_view.view_type;
|
||||||
|
const has_views = this.screen.number_of_views > 1;
|
||||||
- var buttons = ['print', 'relate', 'email', 'attach'];
|
- var buttons = ['print', 'relate', 'email', 'attach'];
|
||||||
+ var buttons = ['print', 'relate', 'attach'];
|
+ var buttons = ['print', 'relate', 'attach'];
|
||||||
for (const button_id of buttons) {
|
for (const button_id of buttons) {
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
diff --git a/account.py b/account.py
|
diff --git a/tryton/modules/account/account.py b/tryton/modules/account/account.py
|
||||||
index 974a027..60b320f 100644
|
index 11225ae174..b5f981085f 100644
|
||||||
--- a/tryton/modules/account/account.py
|
--- a/tryton/modules/account/account.py
|
||||||
+++ a/tryton/modules/account/account.py
|
+++ b/tryton/modules/account/account.py
|
||||||
@@ -2035,7 +2035,7 @@ class GeneralLedgerAccountContext(ModelView):
|
@@ -2123,7 +2123,7 @@ class GeneralLedgerAccountContext(ModelView):
|
||||||
'General Ledger Account Context'
|
'General Ledger Account Context'
|
||||||
__name__ = 'account.general_ledger.account.context'
|
__name__ = 'account.general_ledger.account.context'
|
||||||
fiscalyear = fields.Many2One('account.fiscalyear', 'Fiscal Year',
|
fiscalyear = fields.Many2One('account.fiscalyear', 'Fiscal Year',
|
||||||
|
@ -11,7 +11,7 @@ index 974a027..60b320f 100644
|
||||||
domain=[
|
domain=[
|
||||||
('company', '=', Eval('company')),
|
('company', '=', Eval('company')),
|
||||||
],
|
],
|
||||||
@@ -2046,7 +2046,8 @@ class GeneralLedgerAccountContext(ModelView):
|
@@ -2134,7 +2134,8 @@ class GeneralLedgerAccountContext(ModelView):
|
||||||
('start_date', '<=', (Eval('end_period'), 'start_date')),
|
('start_date', '<=', (Eval('end_period'), 'start_date')),
|
||||||
],
|
],
|
||||||
states={
|
states={
|
||||||
|
@ -21,7 +21,7 @@ index 974a027..60b320f 100644
|
||||||
})
|
})
|
||||||
end_period = fields.Many2One('account.period', 'End Period',
|
end_period = fields.Many2One('account.period', 'End Period',
|
||||||
domain=[
|
domain=[
|
||||||
@@ -2054,7 +2055,8 @@ class GeneralLedgerAccountContext(ModelView):
|
@@ -2142,7 +2143,8 @@ class GeneralLedgerAccountContext(ModelView):
|
||||||
('start_date', '>=', (Eval('start_period'), 'start_date'))
|
('start_date', '>=', (Eval('start_period'), 'start_date'))
|
||||||
],
|
],
|
||||||
states={
|
states={
|
||||||
|
@ -31,12 +31,12 @@ index 974a027..60b320f 100644
|
||||||
})
|
})
|
||||||
from_date = fields.Date("From Date",
|
from_date = fields.Date("From Date",
|
||||||
domain=[
|
domain=[
|
||||||
@@ -2262,7 +2264,7 @@ class GeneralLedgerLine(ModelSQL, ModelView):
|
@@ -2378,7 +2380,7 @@ class GeneralLedgerLine(DescriptionOriginMixin, ModelSQL, ModelView):
|
||||||
def __setup__(cls):
|
def __setup__(cls):
|
||||||
super(GeneralLedgerLine, cls).__setup__()
|
super(GeneralLedgerLine, cls).__setup__()
|
||||||
cls.__access__.add('account')
|
cls.__access__.add('account')
|
||||||
- cls._order.insert(0, ('date', 'ASC'))
|
- cls._order.insert(0, ('date', 'ASC'))
|
||||||
+ cls._order = [('date', 'DESC'), ('id', 'DESC')]
|
+ cls._order = [('date', 'DESC'), ('id', 'DESC')]
|
||||||
|
cls.description_used.setter = None
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def table_query(cls):
|
|
||||||
|
|
Loading…
Reference in a new issue