diff --git a/__init__.py b/__init__.py index 23e0943..1e547b0 100644 --- a/__init__.py +++ b/__init__.py @@ -26,7 +26,6 @@ from . import commission from . import account from . import analytic from . import price_list -# from . import opportunity def register(): diff --git a/booking.py b/booking.py index c16b25d..94415af 100644 --- a/booking.py +++ b/booking.py @@ -97,6 +97,7 @@ class Booking(Workflow, ModelSQL, ModelView): media = fields.Selection(MEDIA, 'Media', states=STATES_BLOCKED, help="Way through which the booking arrives.") media_string = media.translated('media') + lead_origin = fields.Many2One('crm.lead_origin', 'Lead Origin') plan = fields.Selection(PLAN, 'Commercial Plan', states=STATES_BLOCKED, help="Plans offered by hotel and selected by guest for booking.") plan_string = plan.translated('plan') diff --git a/booking.xml b/booking.xml index 867ed88..d0690bb 100644 --- a/booking.xml +++ b/booking.xml @@ -95,17 +95,6 @@ this repository contains the full copyright notices and license terms. --> booking_folio_form - - cancel diff --git a/opportunity.py b/opportunity.py deleted file mode 100644 index 6591e69..0000000 --- a/opportunity.py +++ /dev/null @@ -1,17 +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.pool import PoolMeta -from trytond.model import fields - - -class Opportunity(metaclass=PoolMeta): - __name__ = 'sale.opportunity' - agent = fields.Many2One('commission.agent', "Agent") - agency = fields.Many2One('commission.agent', "Agency") - source = fields.Selection([ - ('databases', 'Databases'), - ('social_network', 'Social Network'), - ('direct', 'Direct'), - ('referred', 'Referred'), - ('other', 'Other'), - ], 'Source', required=True) diff --git a/opportunity.xml b/opportunity.xml deleted file mode 100644 index 5d42ed2..0000000 --- a/opportunity.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - sale.opportunity - - opportunity_form - - - - sale.opportunity - - opportunity_tree - - - - diff --git a/tryton.cfg b/tryton.cfg index e973833..821eef5 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=6.0.88 +version=6.0.89 depends: party company @@ -18,6 +18,7 @@ depends: party_personal account_statement_co goal + crm xml: hotel.xml guest.xml diff --git a/view/booking_form.xml b/view/booking_form.xml index d6a707a..856e275 100644 --- a/view/booking_form.xml +++ b/view/booking_form.xml @@ -9,7 +9,9 @@ this repository contains the full copyright notices and license terms. -->