mirror of
https://github.com/NaN-tic/trytond-patches.git
synced 2023-12-14 06:03:03 +01:00
Delete issue11499, https://hg.tryton.org/sao/rev/5ec0f9872885
Delete issue11359, https://hg.tryton.org/modules/product_price_list_dates/rev/675972ad3681
This commit is contained in:
parent
afaf8c4ed6
commit
e11d2e7171
|
@ -1,30 +0,0 @@
|
|||
diff --git a/trytond/trytond/modules/product_price_list_dates/product.py b/trytond/trytond/modules/product_price_list_dates/product.py
|
||||
index 003742f..e66b4bf 100644
|
||||
--- a/trytond/trytond/modules/product_price_list_dates/product.py
|
||||
+++ b/trytond/trytond/modules/product_price_list_dates/product.py
|
||||
@@ -3,6 +3,7 @@
|
||||
from trytond.model import ModelView, fields
|
||||
from trytond.pool import PoolMeta, Pool
|
||||
from trytond.pyson import Eval, If
|
||||
+from trytond.transaction import Transaction
|
||||
|
||||
|
||||
class PriceList(metaclass=PoolMeta):
|
||||
@@ -21,6 +22,17 @@ class PriceList(metaclass=PoolMeta):
|
||||
def open_lines(cls, price_lists):
|
||||
pass
|
||||
|
||||
+ def compute(self, party, product, unit_price, quantity, uom,
|
||||
+ pattern=None):
|
||||
+ context = Transaction().context
|
||||
+ if pattern is None:
|
||||
+ pattern = {}
|
||||
+ pattern = pattern.copy()
|
||||
+ if not pattern.get('date') and context.get('date'):
|
||||
+ pattern['date'] = context['date']
|
||||
+ return super(PriceList, self).compute(party, product, unit_price,
|
||||
+ quantity, uom, pattern)
|
||||
+
|
||||
|
||||
class PriceListLine(metaclass=PoolMeta):
|
||||
__name__ = 'product.price_list.line'
|
|
@ -1,16 +0,0 @@
|
|||
diff --git a/sao/src/window.js b/sao/src/window.js
|
||||
index b98495c5..cec02400 100644
|
||||
--- a/sao/src/window.js
|
||||
+++ b/sao/src/window.js
|
||||
@@ -2055,7 +2055,10 @@
|
||||
val, {'s': 1, 'm': 60, 'h': 60 * 60});
|
||||
} else if (!isNaN(Number(val))) {
|
||||
val = val.toLocaleString(
|
||||
- Sao.i18n.BC47(Sao.i18n.getlang()));
|
||||
+ Sao.i18n.BC47(Sao.i18n.getlang()), {
|
||||
+ 'minimumFractionDigits': 0,
|
||||
+ 'maximumFractionDigits': 20,
|
||||
+ });
|
||||
}
|
||||
} else if (val.isTimeDelta) {
|
||||
val = val.asSeconds();
|
3
series
3
series
|
@ -55,9 +55,6 @@ issue10363.diff # [production] Remove unique product constraint on BOM
|
|||
statement_of_account.diff # [account] Cumulate balance of previous fiscal years
|
||||
|
||||
issue11306.diff # [analytic_invocie] Add compatibility between the analytic_invocie module and the account_invoice_defer module (only 6.0)
|
||||
issue11359.diff # [product_price_list_dates] add date in pattern to match price list
|
||||
# issue11198.diff # [bank] Fill or create bank from IBAN and enforce uniqueness
|
||||
|
||||
issue4440.diff # [party_relationship] Add start and end dates to relation
|
||||
|
||||
issue11499.diff # [sao] Set FractionDigits options to format CSV to locale
|
||||
|
|
Loading…
Reference in a new issue