diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index f9f7ef6c416..c491dd06138 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -54,7 +54,6 @@ Note that: 'demo_xml': ['event_demo.xml'], 'test': ['test/process/event_draft2done.yml'], 'js': ['static/src/js/google_map.js'], - 'qweb': ['static/src/xml/event_address.xml'], 'css': ['static/src/css/event.css'], 'installable': True, 'application': True, diff --git a/addons/event/event.py b/addons/event/event.py index 5f72b3d40b6..a15d1d92557 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -218,14 +218,11 @@ class event_event(osv.osv): 'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}), 'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}), 'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'), - 'available_qty': fields.integer('Availabel Quantity'), - 'sale_end_date': fields.datetime('SalesEnd'), - - 'city': fields.related('address_id', 'city', type='char', string='City'), - 'street': fields.related('address_id', 'street', type='char', string='Street'), - 'country_id': fields.related('address_id', 'country_id', relation='res.country', type='many2one', string='Country'), - 'state_id': fields.related('address_id', 'state_id', relation="res.country.state", type="many2one", string='Fed. State'), - 'zip': fields.related('address_id','zip', type="char", string="Zip"), + 'city': fields.related('address_id', 'city', type='char', string='City'), + 'street': fields.related('address_id', 'street', type='char', string='Street'), + 'country_id': fields.related('address_id', 'country_id', relation='res.country', type='many2one', string='Country'), + 'state_id': fields.related('address_id', 'state_id', relation="res.country.state", type="many2one", string='Fed. State'), + 'zip': fields.related('address_id','zip', type="char", string="Zip"), } _defaults = { diff --git a/addons/event/static/src/xml/event_address.xml b/addons/event/static/src/xml/event_address.xml deleted file mode 100644 index 14c7051cf7d..00000000000 --- a/addons/event/static/src/xml/event_address.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py index a7e9495af60..d06e964c483 100644 --- a/addons/event_sale/__openerp__.py +++ b/addons/event_sale/__openerp__.py @@ -35,14 +35,10 @@ It defines a new kind of service products that offers you the possibility to cho 'author': 'OpenERP SA', 'depends': ['event','sale','sale_crm'], 'update_xml': [ - 'security/ir.model.access.csv', 'event_sale_view.xml', ], 'demo_xml': ['event_demo.xml'], 'test':['test/confirm.yml'], - 'css': ['static/src/css/event_page.css'], - 'js': ['static/src/js/google_map.js'], - 'qweb': ['static/src/xml/event_address.xml'], 'installable': True, 'active': False, } diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py index 0abbfc2cfb3..44b3aaf5409 100644 --- a/addons/event_sale/event_sale.py +++ b/addons/event_sale/event_sale.py @@ -93,108 +93,3 @@ class sale_order_line(osv.osv): message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name) registration_obj.log(cr, uid, registration_id, message) return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context) - -class event_event(osv.osv): - _inherit = 'event.event' - _columns = { - 'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'), - } - - def order_now(self, cr, uid, ids, context=None): - res = {} - register_pool = self.pool.get('event.registration') - sale_order_line_pool = self.pool.get('sale.order.line') - sale_order = self.pool.get('sale.order') - partner_pool = self.pool.get("res.partner") - data_obj = self.pool.get("ir.model.data") - prod_pricelist_obj = self.pool.get('product.pricelist') - user = self.pool.get("res.users").browse(cr, uid, uid, context=context) - partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)]) - if not partner_ids: - # partner not found create new partner..... - new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email}) - partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice'] - partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery'] - else: - new_partner_id = partner_ids[0] - partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice'] - partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery'] - for event_id in self.browse(cr, uid, ids, context=context): - price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0] - new_sale_id = sale_order.create(cr, uid, { - 'date_order': event_id.date_begin, - 'pricelist_id': price_list, - 'partner_id': new_partner_id, - 'partner_invoice_id': partner_invoice_id, - 'partner_shipping_id': partner_shipping_id - }) - if event_id.event_item_ids: - for items in event_id.event_item_ids: - product = items.product_id.id - sale_order_line = sale_order_line_pool.create(cr, uid, { - 'order_id': new_sale_id, - 'name': items.product_id.name, - 'product_uom_qty': items.qty, - 'product_id': items.product_id.id, - 'price_unit': items.price, - 'date_planned': items.sales_end_date, - }, context=context) - view_id = data_obj._get_id(cr, uid, 'sale', 'view_order_form') - if view_id: - res_id = data_obj.browse(cr, uid, view_id, context=context).res_id - res = { - 'name': _('Quotation'), - 'view_type': 'form', - 'view_mode': 'form', - 'res_model': 'sale.order', - 'res_id': new_sale_id, - 'views':[(res_id,'form'), (False, 'tree')], - 'type': 'ir.actions.act_window', - 'nodestroy': True, - 'target': 'current', - } - return res - - def subscribe_to_event(self, cr, uid, ids, context=None): - res = {} - data_obj = self.pool.get("ir.model.data") - view_id = data_obj._get_id(cr, uid, 'event_sale', 'view_event_page') - if view_id: - res_id = data_obj.browse(cr, uid, view_id, context=context).res_id - res = { - 'name': _('Event Page'), - 'view_type': 'form', - 'view_mode': 'form', - 'views':[(res_id,'form'), (False, 'tree')], - 'res_model': 'event.event', - 'res_id': ids[0], - 'type': 'ir.actions.act_window', - 'nodestroy': True, - 'target': 'current', - } - return res - -class event_items(osv.osv): - _name = "event.items" - _columns = { - 'product_id': fields.many2one('product.product', 'Product', required=True), - 'price': fields.integer('Price'), - #Need to convert this integer field in to dynamic selection.. TODO - # 'max_qty': fields.integer('Max.Quantity available'), - 'qty': fields.integer('Quantity'), - 'uom_id': fields.many2one('product.uom', 'UoM'), - 'discount': fields.integer('Discount'), - 'event_id': fields.many2one('event.event', 'Event'), - 'sales_end_date': fields.date('Sales End') - } - - def onchange_product_id(self, cr, uid, ids, product, context=None): - product_obj = self.pool.get('product.product') - data = {} - if not product: - return {'value': data} - price = product_obj.browse(cr, uid, product).list_price - uom = product_obj.browse(cr, uid, product).uom_id.id - data['price'] = price - data['uom_id'] = uom - return {'value': data} diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml index d0e00c9a8bf..5746f1de554 100644 --- a/addons/event_sale/event_sale_view.xml +++ b/addons/event_sale/event_sale_view.xml @@ -29,120 +29,6 @@ - - - - - - Events - event.event - form - -
-
-
- - - -
- -
- - -
Venue :
- - - - - - - - - - - - -
-
- - -
- - - - - - - -
- Where - - - - - - - - - - -
Start:
End
-
- - - - -
- - - - - - - - Events Inherit - event.event - form - - - - - - - - - - - - - - - - - - - - - event.inherit.kanban - event.event - kanban - - - - - - - diff --git a/addons/event_sale/security/ir.model.access.csv b/addons/event_sale/security/ir.model.access.csv deleted file mode 100644 index 8078ec3ff78..00000000000 --- a/addons/event_sale/security/ir.model.access.csv +++ /dev/null @@ -1,2 +0,0 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_event_items,event.items,event_sale.model_event_items,event.group_event_user,1,1,0,0 diff --git a/addons/event_sale/static/src/css/event_page.css b/addons/event_sale/static/src/css/event_page.css deleted file mode 100644 index 0f7b2a81e32..00000000000 --- a/addons/event_sale/static/src/css/event_page.css +++ /dev/null @@ -1,31 +0,0 @@ -.oe_event_title{ - font-size: 25px; -} -.oe_sub1 -{ - float:left; - height:50px; - border-right: 1px solid black; - border-color: #DCDCDC; -} -.oe_mapbox -{ - width:auto; - height:200px; - margin-left:auto; - margin-right:auto; - text-align: right; -} -.oe_td_border -{ - width: 5em; - padding: 2px; - border-right: 1px solid black; - text-align: center; - border-color: #DCDCDC; -} -.oe_td_date_border -{ - border-right:1px solid black; - border-color: #DCDCDC; -} diff --git a/addons/event_sale/static/src/js/google_map.js b/addons/event_sale/static/src/js/google_map.js deleted file mode 100644 index 2cf67df78a4..00000000000 --- a/addons/event_sale/static/src/js/google_map.js +++ /dev/null @@ -1,64 +0,0 @@ -openerp.event = function(instance){ - instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress'); - instance.event.GeoAddress = instance.web.form.AbstractField.extend(_.extend({}, { - init : function(){ - this._super.apply(this,arguments); - this.googleMapsLoaded = $.Deferred(); - }, - start:function(){ - }, - - set_input_id:function(id){ - }, - Map_Load: function() { - var self = this; - if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();} - googleMapsCallback = function () { - self.googleMapsLoaded.resolve(); - }; - $.ajax({ - url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false", - dataType: "script" - }).fail(self.googleMapsLoaded.reject); - return this.googleMapsLoaded.promise(); - }, - set_value:function(value){ - var self = this; - this.get_address(value).done(function(value){ - if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value})); - var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value); - var defer = self.Map_Load(); - defer.done(function(){ - return self.render_map(address); - }); - }); - }, - get_address:function(value){ - if (!value || value.length == 0){ - return $.Deferred().reject(); - } - return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]); - }, - - render_map: function(address){ - var geocoder = new google.maps.Geocoder(); - geocoder.geocode( { 'address': address}, function(results, status){ - if (status == google.maps.GeocoderStatus.OK){ - var lat = results[0].geometry.location.lat(),lng =results[0].geometry.location.lng(); - var myOptions = { - zoom: 17, - center: new google.maps.LatLng(lat,lng), - mapTypeId: google.maps.MapTypeId.ROADMAP - } - return new google.maps.Marker({ - map : new google.maps.Map(document.getElementById("oe_mapbox"),myOptions), - position: new google.maps.LatLng(lat,lng) - }); - } - }); - }, - get_value:function(){ - } - - })); -}; \ No newline at end of file diff --git a/addons/event_sale/static/src/xml/event_address.xml b/addons/event_sale/static/src/xml/event_address.xml deleted file mode 100644 index 14c7051cf7d..00000000000 --- a/addons/event_sale/static/src/xml/event_address.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/addons/portal_event/__init__.py b/addons/portal_event/__init__.py deleted file mode 100644 index 70c078b769d..00000000000 --- a/addons/portal_event/__init__.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2011 OpenERP S.A (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## -import portal_event -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/portal_event/__openerp__.py b/addons/portal_event/__openerp__.py deleted file mode 100644 index 88ca9815323..00000000000 --- a/addons/portal_event/__openerp__.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2011 OpenERP S.A (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -{ - 'name' : "Portal Event", - 'version' : "1.0", - 'depends' : ["portal", "event_sale"], - 'author' : "OpenERP SA", - 'category': 'Portal', - 'description': """ -This module defines 'portals' to customize the access to your OpenERP database -for external users. - """, - 'update_xml': [ - 'security/portal_event_security.xml', - 'security/ir.model.access.csv', - ], - 'website': 'http://www.openerp.com', - 'installable': True, -} - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/portal_event/portal_event.py b/addons/portal_event/portal_event.py deleted file mode 100644 index 570bd3131b6..00000000000 --- a/addons/portal_event/portal_event.py +++ /dev/null @@ -1,47 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -import time -from osv import fields, osv -from tools.translate import _ - -class event_event(osv.osv): - _inherit = 'event.event' - - def make_quotation(self, cr, uid, ids, context=None): - event_pool = self.pool.get('event.event') - register_pool = self.pool.get('event.registration') - sale_order_line_pool = self.pool.get('sale.order.line') - sale_order = self.pool.get('sale.order') - partner_pool = self.pool.get('res.partner') - prod_pricelist_obj = self.pool.get('product.pricelist') - res_users_obj = self.pool.get('res.users') - user = res_users_obj.browse(cr, uid, uid, context=context) - partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)]) - if partner_ids: - res_users_obj.write(cr, uid, user.id, {'partner_id': partner_ids[0]}) - if not partner_ids: - raise osv.except_osv(_('Error !'), - _('There is no Partner defined ' \ - 'for this event:')) - res = super(event_event,self).make_quotation(cr, uid, ids, context) - - return res diff --git a/addons/portal_event/security/ir.model.access.csv b/addons/portal_event/security/ir.model.access.csv deleted file mode 100644 index 0b3dfe5f3b2..00000000000 --- a/addons/portal_event/security/ir.model.access.csv +++ /dev/null @@ -1,6 +0,0 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_event,event,event.model_event_event,portal_event.group_event_portal,1,0,0,0 -access_registration,registration,event.model_event_registration,portal_event.group_event_portal,1,0,0,0 -access_event_items,event.items,event.model_event_event,portal_event.group_event_portal,1,1,1,0 -access_product_product,product.product,product.model_product_product,portal_event.group_event_portal,1,0,0,0 -access_product_uom,product.uom,product.model_product_uom,portal_event.group_event_portal,1,0,0,0 \ No newline at end of file diff --git a/addons/portal_event/security/portal_event_security.xml b/addons/portal_event/security/portal_event_security.xml deleted file mode 100644 index 1202fcce3f5..00000000000 --- a/addons/portal_event/security/portal_event_security.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - Event Portal Groups - - - - - Portal User - - - - - - Personal Events - - [] - - - - - Personal Registrations - - [('partner_id.email','=',user.login)] - - - - - \ No newline at end of file