Fix
This commit is contained in:
parent
8f34a4e5c2
commit
122afbce65
|
@ -154,7 +154,6 @@ class Booking(Workflow, ModelSQL, ModelView):
|
||||||
@classmethod
|
@classmethod
|
||||||
def __setup__(cls):
|
def __setup__(cls):
|
||||||
super(Booking, cls).__setup__()
|
super(Booking, cls).__setup__()
|
||||||
# ALTER TABLE hotel_booking RENAME COLUMN party_seller TO channel
|
|
||||||
cls._order.insert(0, ('create_date', 'DESC'))
|
cls._order.insert(0, ('create_date', 'DESC'))
|
||||||
cls._transitions |= set((
|
cls._transitions |= set((
|
||||||
('offer', 'confirmed'),
|
('offer', 'confirmed'),
|
||||||
|
@ -815,7 +814,7 @@ class Booking(Workflow, ModelSQL, ModelView):
|
||||||
def get_untaxed_amount(self, name):
|
def get_untaxed_amount(self, name):
|
||||||
res = _ZERO
|
res = _ZERO
|
||||||
for line in self.lines:
|
for line in self.lines:
|
||||||
res += line.total_balance
|
res += line.total_amount
|
||||||
return res
|
return res
|
||||||
|
|
||||||
# def get_occupancies(self, name):
|
# def get_occupancies(self, name):
|
||||||
|
|
|
@ -55,12 +55,6 @@ class SaleChannel(ModelSQL, ModelView):
|
||||||
('after_sale', 'After-Sale'),
|
('after_sale', 'After-Sale'),
|
||||||
], 'Collection Mode', required=False, help="Commission collection mode")
|
], 'Collection Mode', required=False, help="Commission collection mode")
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def __setup__(cls):
|
|
||||||
# alter table hotel_channel drop column commission;
|
|
||||||
# alter table hotel_channel drop column payment_method;
|
|
||||||
super(SaleChannel, cls).__setup__()
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def default_company():
|
def default_company():
|
||||||
return Transaction().context.get('company')
|
return Transaction().context.get('company')
|
||||||
|
|
Loading…
Reference in New Issue