Merge branch '6.8' into 159227

This commit is contained in:
Juanjo Garcia Pagan 2023-12-13 15:19:10 +01:00 committed by GitHub
commit 5ae836dbf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 82 additions and 0 deletions

25
issue12547.diff Normal file
View File

@ -0,0 +1,25 @@
diff --git a/tryton/modules/stock_lot/stock.py b/tryton/modules/stock_lot/stock.py
index 734018dbe8..1367b57e5f 100644
--- a/tryton/modules/stock_lot/stock.py
+++ b/tryton/modules/stock_lot/stock.py
@@ -420,8 +420,7 @@ class Move(metaclass=PoolMeta):
def check_lot(self):
"Check if lot is required"
- if (self.state == 'done'
- and self.internal_quantity
+ if (self.internal_quantity
and not self.lot
and self.product.lot_is_required(
self.from_location, self.to_location)):
@@ -430,8 +429,9 @@ class Move(metaclass=PoolMeta):
product=self.product.rec_name))
@classmethod
- def validate(cls, moves):
- super(Move, cls).validate(moves)
+ @ModelView.button
+ def do(cls, moves):
+ super().do(moves)
for move in moves:
move.check_lot()

15
issue12799.diff Normal file
View File

@ -0,0 +1,15 @@
diff --git a/tryton/sao/src/model.js b/tryton/sao/src/model.js
index 81e8639d9e..8b55441294 100644
--- a/tryton/sao/src/model.js
+++ b/tryton/sao/src/model.js
@@ -2071,6 +2071,10 @@
rec_name = '';
}
}
+ if (value < 0) {
+ value = null;
+ rec_name = '';
+ }
Sao.setdefault(
record._values, this.name + '.', {}).rec_name = rec_name;
Sao.field.Many2One._super.set_client.call(this, record, value,

36
issue12823.diff Normal file
View File

@ -0,0 +1,36 @@
diff --git a/tryton/modules/account/move.py b/tryton/modules/account/move.py
index b827237af4..ddbca0ae19 100644
--- a/tryton/modules/account/move.py
+++ b/tryton/modules/account/move.py
@@ -1098,7 +1098,7 @@ class Line(MoveLineMixin, ModelSQL, ModelView):
def on_change_move(self):
if self.move:
if not self.debit and not self.credit:
- total = sum(l.debit - l.credit
+ total = sum((l.debit or 0) - (l.credit or 0)
for l in getattr(self.move, 'lines', []))
self.debit = -total if total < 0 else Decimal(0)
self.credit = total if total > 0 else Decimal(0)
@@ -1169,7 +1169,8 @@ class Line(MoveLineMixin, ModelSQL, ModelView):
'Set correct sign to amount_second_currency'
if self.amount_second_currency:
self.amount_second_currency = \
- self.amount_second_currency.copy_sign(self.debit - self.credit)
+ self.amount_second_currency.copy_sign(
+ (self.debit or 0) - (self.credit or 0))
@fields.depends('account')
def on_change_account(self):
@@ -2402,9 +2403,11 @@ class ReconcileShow(ModelView):
if self.currency:
for line in self.lines:
if line.second_currency == self.currency:
- amount += line.amount_second_currency
+ amount += (
+ line.amount_second_currency or 0)
elif line.currency == self.currency:
- amount += line.debit - line.credit
+ amount += (
+ (line.debit or 0) - (line.credit or 0))
amount = self.currency.round(amount)
self.write_off_amount = amount

6
series
View File

@ -62,6 +62,12 @@ update_trees_chart_accounts.diff # [account_account] Update trees of chart of ac
sao_document_field.diff # [sao] fix issue with loading of 'document' fields in sao
issue12799.diff # [sao] Convert negative id value as None when set by the client
issue12547.diff # [stock_lot] Check lot required only when changing move to done
issue12823.diff # [account] Use 0 as fallback for missing debit or credit in on_change functions
product_cost_price_migration.diff # [product] Add missing column in product_cost_price
sequence_exist.diff # [trytond] Search sequences using pg_sequences instead of information_schema.sequences