diff --git a/__init__.py b/__init__.py
index 05d2cde..eb8d7e8 100644
--- a/__init__.py
+++ b/__init__.py
@@ -2,13 +2,11 @@
# copyright notices and license terms.
from trytond.pool import Pool
import sale
-import configuration
def register():
Pool.register(
sale.Sale,
+ sale.DashAppDelivery,
+ sale.DashAppSaleOrder,
module='dash_sale', type_='model')
- # Pool.register(
- # configuration.ConfigurationDashSale,
- # module='dash_sale', type_='model')
diff --git a/configuration.py b/configuration.py
deleted file mode 100644
index c9e51a8..0000000
--- a/configuration.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file is part of Tryton. The COPYRIGHT file at the top level of
-# this repository contains the full copyright notices and license terms.
-from trytond.model import ModelView, ModelSQL, fields
-from trytond.pyson import Eval, If, In, Get
-from trytond.transaction import Transaction
-
-__all__ = ['ConfigurationDashSale']
-
-
-class ConfigurationDashSale(ModelSQL, ModelView):
- 'Configuration Dash Sale'
- __name__ = 'dash.configuration.sale'
- company = fields.Many2One('company.company', 'Company', required=True,
- domain=[
- ('id', If(In('company',
- Eval('context', {})), '=', '!='), Get(Eval('context', {}),
- 'company', 0))
- ])
- app = fields.Selection([
- ('order', 'On Order Processed'),
- ('delivery', 'On Shipment Sent')
- ], 'Sale Invoice Method')
-
- @classmethod
- def __setup__(cls):
- super(ConfigurationDashSale, cls).__setup__()
-
- @staticmethod
- def default_company():
- return Transaction().context.get('company') or None
diff --git a/configuration.xml b/configuration.xml
deleted file mode 100644
index 41ecbab..0000000
--- a/configuration.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
- dash.configuration
- form
- configuration_form
-
-
- Dash Configuration
- dash.configuration
-
-
-
-
-
-
-
-
-
-
diff --git a/dash.py b/dash.py
new file mode 100644
index 0000000..ee7f633
--- /dev/null
+++ b/dash.py
@@ -0,0 +1,15 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+from trytond.pool import PoolMeta
+
+__all__ = ['DashApp']
+
+
+class DashApp(metaclass=PoolMeta):
+ __name__ = 'dash.app'
+
+ @classmethod
+ def _get_origin(cls):
+ origins = super(DashApp, cls)._get_origin()
+ origins.extend(['dash.app.delivery', 'dash.app.sale_order'])
+ return origins
diff --git a/sale.py b/sale.py
index 4e18cba..cfac546 100644
--- a/sale.py
+++ b/sale.py
@@ -8,8 +8,9 @@ from sql.aggregate import Sum
from datetime import date
from trytond.pool import Pool, PoolMeta
from trytond.transaction import Transaction
+from trytond.model import ModelView, ModelSQL, fields
-__all__ = ['Sale']
+__all__ = ['Sale', 'DashAppDelivery', 'DashAppSaleOrder']
class Sale(metaclass=PoolMeta):
@@ -230,3 +231,31 @@ class Sale(metaclass=PoolMeta):
}
return res
+
+
+class DashAppDelivery(ModelSQL, ModelView):
+ 'Dash App Delivery'
+ __name__ = 'dash.app.delivery'
+ company = fields.Many2One('company.company', 'Company', required=True)
+
+ @classmethod
+ def __setup__(cls):
+ super(DashAppDelivery, cls).__setup__()
+
+ @staticmethod
+ def default_company():
+ return Transaction().context.get('company') or None
+
+
+class DashAppSaleOrder(ModelSQL, ModelView):
+ 'Dash App Sale Order'
+ __name__ = 'dash.app.sale_order'
+ company = fields.Many2One('company.company', 'Company', required=True)
+
+ @classmethod
+ def __setup__(cls):
+ super(DashAppSaleOrder, cls).__setup__()
+
+ @staticmethod
+ def default_company():
+ return Transaction().context.get('company') or None
diff --git a/sale.xml b/sale.xml
new file mode 100644
index 0000000..589e7f6
--- /dev/null
+++ b/sale.xml
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+ dash.app.delivery
+ form
+ app_delivery_form
+
+
+ dash.app.delivery
+ tree
+ app_delivery_tree
+
+
+ App Delivery
+ dash.app.delivery
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ dash.app.sale_order
+ form
+ app_sale_order_form
+
+
+ dash.app.sale_order
+ tree
+ app_sale_order_tree
+
+
+ App Sale Order
+ dash.app.sale_order
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tryton.cfg b/tryton.cfg
index 1593518..3f5a0a6 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,9 +1,13 @@
[tryton]
-version=5.0.2
+version=5.0.3
depends:
party
product
account
+ stock
sale
+ sale_salesman
+ commission
dash
xml:
+ sale.xml
diff --git a/view/app_delivery_form.xml b/view/app_delivery_form.xml
new file mode 100644
index 0000000..2cd5f09
--- /dev/null
+++ b/view/app_delivery_form.xml
@@ -0,0 +1,7 @@
+
+
+
diff --git a/view/app_delivery_tree.xml b/view/app_delivery_tree.xml
new file mode 100644
index 0000000..fefe79d
--- /dev/null
+++ b/view/app_delivery_tree.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
diff --git a/view/app_sale_order_form.xml b/view/app_sale_order_form.xml
new file mode 100644
index 0000000..2cd5f09
--- /dev/null
+++ b/view/app_sale_order_form.xml
@@ -0,0 +1,7 @@
+
+
+
diff --git a/view/app_sale_order_tree.xml b/view/app_sale_order_tree.xml
new file mode 100644
index 0000000..fefe79d
--- /dev/null
+++ b/view/app_sale_order_tree.xml
@@ -0,0 +1,6 @@
+
+
+
+
+