diff --git a/__init__.py b/__init__.py
index 4391367..ff6974a 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,10 +13,8 @@ def register():
Pool.register(
restaurant.SaleShopTable,
restaurant.Reservation,
- restaurant.SaleDeliveryMen,
restaurant.PartyConsumer,
sale.Shop,
- sale.SaleShopDeliveryMen,
sale.Sale,
sale.SaleForceDraft,
sale.SaleLine,
diff --git a/restaurant.py b/restaurant.py
index 15be6c1..aaf8ea2 100644
--- a/restaurant.py
+++ b/restaurant.py
@@ -7,10 +7,10 @@ from trytond.pool import Pool
__all__ = ['SaleShopTable', 'Reservation']
TYPE_VEHICLE = [
- ('', ''),
- ('motorcycle', 'Motorcycle'),
- ('bicycle', 'Bicycle'),
- ('Car', 'Car'),
+ ('', ''),
+ ('motorcycle', 'Motorcycle'),
+ ('bicycle', 'Bicycle'),
+ ('Car', 'Car'),
]
@@ -42,14 +42,6 @@ class Reservation(ModelSQL, ModelView):
__name__ = 'sale.reservation'
-class SaleDeliveryMen(ModelSQL, ModelView):
- 'Sale Delivery Men'
- __name__ = 'sale.delivery_men'
- party = fields.Many2One('party.party', 'Party', required=True)
- number_plate = fields.Char('Number Plate')
- type_vehicle = fields.Selection(TYPE_VEHICLE, 'Type Vehicle')
-
-
class PartyConsumer(ModelSQL, ModelView):
'Party Consumer'
__name__ = 'party.consumer'
diff --git a/restaurant.xml b/restaurant.xml
index 8b0d293..67ad15a 100644
--- a/restaurant.xml
+++ b/restaurant.xml
@@ -25,25 +25,6 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
sale_delivery_men_view_tree
-
- Delivery Men
- sale.delivery_men
-
-
-
-
-
-
-
-
-
-
-
-
-
-
party.consumer
form
diff --git a/sale.py b/sale.py
index eaf8c87..0d8c1f9 100644
--- a/sale.py
+++ b/sale.py
@@ -26,7 +26,6 @@ class Sale(metaclass=PoolMeta):
('shop', '=', Eval('shop'))
])
productions = fields.Function(fields.One2Many('production', None, 'Productions'), 'get_productions')
- delivery_men = fields.Many2One('sale.delivery_men', 'Delivery Men')
delivery_time = fields.Numeric('Delivery Time (Min)', help="In Minutes")
delivery_way = fields.Selection(DELIVERY_WAY, 'Delivery Way')
shipping_time = fields.Time('Shipping Time')
@@ -321,15 +320,3 @@ class SaleLine(metaclass=PoolMeta):
class Shop(metaclass=PoolMeta):
__name__ = 'sale.shop'
tables = fields.One2Many('sale.shop.table', 'shop','Tables')
- delivery_man = fields.Many2Many('sale.shop.delivery_men', 'shop',
- 'delivery_men', 'Delivery Man')
-
-
-class SaleShopDeliveryMen(ModelSQL):
- 'Sale Shop - Delivery Men'
- __name__ = 'sale.shop.delivery_men'
- _table = 'sale_shop_delivery_men'
-
- shop = fields.Many2One('sale.shop', 'Shop', ondelete='CASCADE',
- select=True, required=True)
- delivery_men = fields.Many2One('sale.delivery_men', 'Delivery Men', ondelete='RESTRICT', required=True)
diff --git a/view/sale_pos_form.xml b/view/sale_pos_form.xml
index fac3bf6..29fca99 100644
--- a/view/sale_pos_form.xml
+++ b/view/sale_pos_form.xml
@@ -5,10 +5,10 @@ copyright notices and license terms. -->
+
+
-
-
@@ -16,9 +16,7 @@ copyright notices and license terms. -->
-
-
-
-
+ -->
diff --git a/view/sale_shop_form.xml b/view/sale_shop_form.xml
index 6067cf8..c19e5cf 100644
--- a/view/sale_shop_form.xml
+++ b/view/sale_shop_form.xml
@@ -7,8 +7,5 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
-
-
-