parent
b1efff52ac
commit
07dafa288c
|
@ -30,7 +30,6 @@ class InvoiceLine(metaclass=PoolMeta):
|
||||||
query = fromitem.select(
|
query = fromitem.select(
|
||||||
line.id,
|
line.id,
|
||||||
Case(*conditions, _else=Null),
|
Case(*conditions, _else=Null),
|
||||||
where=(line.invoice_type == 'out'),
|
|
||||||
order_by=Case(*conditions, _else=Null)
|
order_by=Case(*conditions, _else=Null)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -66,7 +65,6 @@ class InvoiceLine(metaclass=PoolMeta):
|
||||||
query = fromitem.select(
|
query = fromitem.select(
|
||||||
line.id,
|
line.id,
|
||||||
Case(*conditions, _else=Literal('')),
|
Case(*conditions, _else=Literal('')),
|
||||||
where=(line.invoice_type == 'out'),
|
|
||||||
order_by=Case(*conditions, _else=Literal('')),
|
order_by=Case(*conditions, _else=Literal('')),
|
||||||
group_by=(line.id, Case(*conditions, _else=Literal('')))
|
group_by=(line.id, Case(*conditions, _else=Literal('')))
|
||||||
)
|
)
|
||||||
|
@ -111,7 +109,8 @@ class InvoiceLine(metaclass=PoolMeta):
|
||||||
def get_shipment_out_numbers(self, name=None):
|
def get_shipment_out_numbers(self, name=None):
|
||||||
if self.stock_moves:
|
if self.stock_moves:
|
||||||
shipments = set([move.shipment.rec_name
|
shipments = set([move.shipment.rec_name
|
||||||
for move in self.stock_moves if move.shipment])
|
for move in self.stock_moves if move.shipment and
|
||||||
|
move.shipment.__name__ == 'stock.shipment.out'])
|
||||||
return ','.join(sorted(shipments))
|
return ','.join(sorted(shipments))
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|
Loading…
Reference in New Issue