-  |
+  |
@@ -1327,7 +1327,7 @@
- 
+ 
|
diff --git a/addons/base/static/test/class.js b/addons/web/static/test/class.js
similarity index 89%
rename from addons/base/static/test/class.js
rename to addons/web/static/test/class.js
index 9ee6cedbcf1..ed977635a5f 100644
--- a/addons/base/static/test/class.js
+++ b/addons/web/static/test/class.js
@@ -1,13 +1,13 @@
$(document).ready(function () {
var openerp;
- module('base-class', {
+ module('web-class', {
setup: function () {
openerp = window.openerp.init();
- window.openerp.base.core(openerp);
+ window.openerp.web.core(openerp);
}
});
test('Basic class creation', function () {
- var C = openerp.base.Class.extend({
+ var C = openerp.web.Class.extend({
foo: function () {
return this.somevar;
}
@@ -19,12 +19,12 @@ $(document).ready(function () {
strictEqual(instance.foo(), 3);
});
test('Class initialization', function () {
- var C1 = openerp.base.Class.extend({
+ var C1 = openerp.web.Class.extend({
init: function () {
this.foo = 3;
}
});
- var C2 = openerp.base.Class.extend({
+ var C2 = openerp.web.Class.extend({
init: function (arg) {
this.foo = arg;
}
@@ -37,7 +37,7 @@ $(document).ready(function () {
strictEqual(i2.foo, 42);
});
test('Inheritance', function () {
- var C0 = openerp.base.Class.extend({
+ var C0 = openerp.web.Class.extend({
foo: function () {
return 1;
}
@@ -58,7 +58,7 @@ $(document).ready(function () {
strictEqual(new C2().foo(), 3);
});
test('In-place extension', function () {
- var C0 = openerp.base.Class.extend({
+ var C0 = openerp.web.Class.extend({
foo: function () {
return 3;
},
@@ -84,7 +84,7 @@ $(document).ready(function () {
strictEqual(new C0().qux(), 5);
});
test('In-place extension and inheritance', function () {
- var C0 = openerp.base.Class.extend({
+ var C0 = openerp.web.Class.extend({
foo: function () { return 1; },
bar: function () { return 1; }
});
@@ -102,7 +102,7 @@ $(document).ready(function () {
strictEqual(new C1().bar(), 2);
});
test('In-place extensions alter existing instances', function () {
- var C0 = openerp.base.Class.extend({
+ var C0 = openerp.web.Class.extend({
foo: function () { return 1; },
bar: function () { return 1; }
});
@@ -118,7 +118,7 @@ $(document).ready(function () {
strictEqual(instance.bar(), 3);
});
test('In-place extension of subclassed types', function () {
- var C0 = openerp.base.Class.extend({
+ var C0 = openerp.web.Class.extend({
foo: function () { return 1; },
bar: function () { return 1; }
});
diff --git a/addons/base/static/test/form.js b/addons/web/static/test/form.js
similarity index 58%
rename from addons/base/static/test/form.js
rename to addons/web/static/test/form.js
index 34930918ae0..8317c7bfcd2 100644
--- a/addons/base/static/test/form.js
+++ b/addons/web/static/test/form.js
@@ -3,13 +3,13 @@ $(document).ready(function () {
module("form.widget", {
setup: function () {
openerp = window.openerp.init(true);
- window.openerp.base.core(openerp);
- window.openerp.base.chrome(openerp);
+ window.openerp.web.core(openerp);
+ window.openerp.web.chrome(openerp);
// views loader stuff
- window.openerp.base.data(openerp);
- window.openerp.base.views(openerp);
- window.openerp.base.list(openerp);
- window.openerp.base.form(openerp);
+ window.openerp.web.data(openerp);
+ window.openerp.web.views(openerp);
+ window.openerp.web.list(openerp);
+ window.openerp.web.form(openerp);
}
});
test("compute_domain", function () {
@@ -19,15 +19,15 @@ $(document).ready(function () {
'select1': {value: 'day'},
'rrule_type': {value: 'monthly'}
};
- ok(openerp.base.form.compute_domain(
+ ok(openerp.web.form.compute_domain(
[['a', '=', 3]], fields));
- ok(openerp.base.form.compute_domain(
+ ok(openerp.web.form.compute_domain(
[['group_method','!=','count']], fields));
- ok(openerp.base.form.compute_domain(
+ ok(openerp.web.form.compute_domain(
[['select1','=','day'], ['rrule_type','=','monthly']], fields));
});
test("compute_domain or", function () {
- var base = {
+ var web = {
'section_id': {value: null},
'user_id': {value: null},
'member_ids': {value: null}
@@ -37,22 +37,22 @@ $(document).ready(function () {
'|', ['user_id','=',3],
['member_ids', 'in', [3]]];
- ok(openerp.base.form.compute_domain(domain, _.extend(
- {}, base, {'section_id': {value: 42}})));
- ok(openerp.base.form.compute_domain(domain, _.extend(
- {}, base, {'user_id': {value: 3}})));
+ ok(openerp.web.form.compute_domain(domain, _.extend(
+ {}, web, {'section_id': {value: 42}})));
+ ok(openerp.web.form.compute_domain(domain, _.extend(
+ {}, web, {'user_id': {value: 3}})));
- ok(openerp.base.form.compute_domain(domain, _.extend(
- {}, base, {'member_ids': {value: 3}})));
+ ok(openerp.web.form.compute_domain(domain, _.extend(
+ {}, web, {'member_ids': {value: 3}})));
});
test("compute_domain not", function () {
var fields = {
'a': {value: 5},
'group_method': {value: 'line'}
};
- ok(openerp.base.form.compute_domain(
+ ok(openerp.web.form.compute_domain(
['!', ['a', '=', 3]], fields));
- ok(openerp.base.form.compute_domain(
+ ok(openerp.web.form.compute_domain(
['!', ['group_method','=','count']], fields));
});
});
diff --git a/addons/web/static/test/formats.js b/addons/web/static/test/formats.js
new file mode 100644
index 00000000000..331725dd9a5
--- /dev/null
+++ b/addons/web/static/test/formats.js
@@ -0,0 +1,54 @@
+$(document).ready(function () {
+ var openerp;
+ module('web-formats', {
+ setup: function () {
+ openerp = window.openerp.init();
+ window.openerp.web.core(openerp);
+ window.openerp.web.dates(openerp);
+ window.openerp.web.formats(openerp);
+ }
+ });
+ test("format_datetime", function () {
+ var date = openerp.web.str_to_datetime("2009-05-04 12:34:23");
+ var str = openerp.web.format_value(date, {type:"datetime"});
+ equal(str, date.toString("M/d/yyyy h:mm:ss tt"));
+ });
+ test("format_date", function () {
+ var date = openerp.web.str_to_datetime("2009-05-04 12:34:23");
+ var str = openerp.web.format_value(date, {type:"date"});
+ equal(str, date.toString("M/d/yyyy"));
+ });
+ test("format_time", function () {
+ var date = openerp.web.str_to_datetime("2009-05-04 12:34:23");
+ var str = openerp.web.format_value(date, {type:"time"});
+ equal(str, date.toString("h:mm:ss tt"));
+ });
+ test("format_float", function () {
+ var fl = 12.1234;
+ var str = openerp.web.format_value(fl, {type:"float"});
+ equal(str, "12.12");
+ });
+ test("parse_datetime", function () {
+ var val = openerp.web.str_to_datetime("2009-05-04 12:34:23");
+ var res = openerp.web.parse_value(val.toString("M/d/yyyy h:mm:ss tt"), {type:"datetime"});
+ equal(val.toString("M/d/yyyy h:mm:ss tt"), res.toString("M/d/yyyy h:mm:ss tt"));
+ });
+ test("parse_date", function () {
+ var val = openerp.web.str_to_date("2009-05-04");
+ var res = openerp.web.parse_value(val.toString("M/d/yyyy"), {type:"date"});
+ equal(val.toString("M/d/yyyy"), res.toString("M/d/yyyy"));
+ });
+ test("parse_time", function () {
+ var val = openerp.web.str_to_time("12:34:23");
+ var res = openerp.web.parse_value(val.toString("h:mm:ss tt"), {type:"time"});
+ equal(val.toString("h:mm:ss tt"), res.toString("h:mm:ss tt"));
+ });
+ test("parse_float", function () {
+ var str = "134,112.1234";
+ var val = openerp.web.parse_value(str, {type:"float"});
+ equal(val, 134112.1234);
+ var str = "-134,112.1234";
+ var val = openerp.web.parse_value(str, {type:"float"});
+ equal(val, -134112.1234);
+ });
+});
\ No newline at end of file
diff --git a/addons/base/static/test/list-utils.js b/addons/web/static/test/list-utils.js
similarity index 84%
rename from addons/base/static/test/list-utils.js
rename to addons/web/static/test/list-utils.js
index 0b15b81f544..f71da82a560 100644
--- a/addons/base/static/test/list-utils.js
+++ b/addons/web/static/test/list-utils.js
@@ -11,29 +11,29 @@ $(document).ready(function () {
module('list-events', {
setup: function () {
openerp = window.openerp.init();
- window.openerp.base.list(openerp);
+ window.openerp.web.list(openerp);
}
});
test('Simple event triggering', function () {
- var e = create(openerp.base.list.Events), passed = false;
+ var e = create(openerp.web.list.Events), passed = false;
e.bind('foo', function () { passed = true; });
e.trigger('foo');
ok(passed);
});
test('Bind all', function () {
- var e = create(openerp.base.list.Events), event = null;
+ var e = create(openerp.web.list.Events), event = null;
e.bind(null, function (ev) { event = ev; });
e.trigger('foo');
strictEqual(event, 'foo');
});
test('Propagate trigger params', function () {
- var e = create(openerp.base.list.Events), p = false;
+ var e = create(openerp.web.list.Events), p = false;
e.bind(null, function (_, param) { p = param });
e.trigger('foo', true);
strictEqual(p, true)
});
test('Bind multiple callbacks', function () {
- var e = create(openerp.base.list.Events), count;
+ var e = create(openerp.web.list.Events), count;
e.bind('foo', function () { count++; })
.bind('bar', function () { count++; })
.bind(null, function () { count++; })
@@ -54,10 +54,10 @@ $(document).ready(function () {
strictEqual(count, 3);
});
test('Mixin events', function () {
- var cls = openerp.base.Class.extend({
+ var cls = openerp.web.Class.extend({
method: function () { this.trigger('e'); }
});
- cls.include(openerp.base.list.Events);
+ cls.include(openerp.web.list.Events);
var instance = new cls, triggered = false;
instance.bind('e', function () { triggered = true; });
@@ -66,7 +66,7 @@ $(document).ready(function () {
ok(triggered);
});
test('Unbind all handlers', function () {
- var e = create(openerp.base.list.Events), passed = 0;
+ var e = create(openerp.web.list.Events), passed = 0;
e.bind('foo', function () { passed++; });
e.trigger('foo');
strictEqual(passed, 1);
@@ -75,7 +75,7 @@ $(document).ready(function () {
strictEqual(passed, 1);
});
test('Unbind one handler', function () {
- var e = create(openerp.base.list.Events), p1 = 0, p2 = 0,
+ var e = create(openerp.web.list.Events), p1 = 0, p2 = 0,
h1 = function () { p1++; }, h2 = function () { p2++; };
e.bind('foo', h1);
e.bind('foo', h2);
@@ -91,11 +91,11 @@ $(document).ready(function () {
module('list-records', {
setup: function () {
openerp = window.openerp.init();
- window.openerp.base.list(openerp);
+ window.openerp.web.list(openerp);
}
});
test('Basic record initialization', function () {
- var r = new openerp.base.list.Record({qux: 3});
+ var r = new openerp.web.list.Record({qux: 3});
r.set('foo', 1);
r.set('bar', 2);
strictEqual(r.get('foo'), 1);
@@ -103,7 +103,7 @@ $(document).ready(function () {
strictEqual(r.get('qux'), 3);
});
test('Change all the things', function () {
- var r = new openerp.base.list.Record(), changed = false, field;
+ var r = new openerp.web.list.Record(), changed = false, field;
r.bind('change', function () { changed = true; });
r.bind(null, function (e) { field = field || e.split(':')[1]});
r.set('foo', 1);
@@ -112,7 +112,7 @@ $(document).ready(function () {
strictEqual(field, 'foo');
});
test('Change single field', function () {
- var r = new openerp.base.list.Record(), changed = 0;
+ var r = new openerp.web.list.Record(), changed = 0;
r.bind('change:foo', function () { changed++; });
r.set('foo', 1);
r.set('bar', 1);
@@ -124,11 +124,11 @@ $(document).ready(function () {
module('list-collections-degenerate', {
setup: function () {
openerp = window.openerp.init();
- window.openerp.base.list(openerp);
+ window.openerp.web.list(openerp);
}
});
test('Fetch from collection', function () {
- var c = new openerp.base.list.Collection();
+ var c = new openerp.web.list.Collection();
strictEqual(c.length, 0);
c.add({id: 1, value: 2});
c.add({id: 2, value: 3});
@@ -137,16 +137,16 @@ $(document).ready(function () {
strictEqual(c.length, 4);
var r = c.at(2), r2 = c.get(1);
- ok(r instanceof openerp.base.list.Record);
+ ok(r instanceof openerp.web.list.Record);
strictEqual(r.get('id'), 3);
strictEqual(r.get('value'), 5);
- ok(r2 instanceof openerp.base.list.Record);
+ ok(r2 instanceof openerp.web.list.Record);
strictEqual(r2.get('id'), 1);
strictEqual(r2.get('value'), 2);
});
test('Add at index', function () {
- var c = new openerp.base.list.Collection([
+ var c = new openerp.web.list.Collection([
{id: 1, value: 5},
{id: 2, value: 10},
{id: 3, value: 20}
@@ -158,7 +158,7 @@ $(document).ready(function () {
strictEqual(c.at(3).get('value'), 20);
});
test('Remove record', function () {
- var c = new openerp.base.list.Collection([
+ var c = new openerp.web.list.Collection([
{id: 1, value: 5},
{id: 2, value: 10},
{id: 3, value: 20}
@@ -171,7 +171,7 @@ $(document).ready(function () {
strictEqual(c.at(1).get('value'), 20);
});
test('Reset', function () {
- var event, obj, c = new openerp.base.list.Collection([
+ var event, obj, c = new openerp.web.list.Collection([
{id: 1, value: 5},
{id: 2, value: 10},
{id: 3, value: 20}
@@ -193,7 +193,7 @@ $(document).ready(function () {
test('Events propagation', function () {
var values = [];
- var c = new openerp.base.list.Collection([
+ var c = new openerp.web.list.Collection([
{id: 1, value: 5},
{id: 2, value: 10},
{id: 3, value: 20}
@@ -207,7 +207,7 @@ $(document).ready(function () {
deepEqual(values, [6, 11, 21]);
});
test('BTree', function () {
- var root = new openerp.base.list.Collection(),
+ var root = new openerp.web.list.Collection(),
c = root.proxy('admin'),
total = 0;
c.add({id: 1, name: "Administrator", login: 'admin'});
@@ -226,11 +226,11 @@ $(document).ready(function () {
module('list-hofs', {
setup: function () {
openerp = window.openerp.init();
- window.openerp.base.list(openerp);
+ window.openerp.web.list(openerp);
}
});
test('each, degenerate', function () {
- var c = new openerp.base.list.Collection([
+ var c = new openerp.web.list.Collection([
{id: 1, value: 5},
{id: 2, value: 10},
{id: 3, value: 20}
@@ -243,7 +243,7 @@ $(document).ready(function () {
'degenerate collections should be iterated in record order');
});
test('each, deep', function () {
- var root = new openerp.base.list.Collection(),
+ var root = new openerp.web.list.Collection(),
ids = [];
root.proxy('foo').add([
{id: 1, value: 5},
@@ -263,7 +263,7 @@ $(document).ready(function () {
'tree collections should be deeply iterated');
});
test('map, degenerate', function () {
- var c = new openerp.base.list.Collection([
+ var c = new openerp.web.list.Collection([
{id: 1, value: 5},
{id: 2, value: 10},
{id: 3, value: 20}
@@ -276,7 +276,7 @@ $(document).ready(function () {
'degenerate collections should be iterated in record order');
});
test('map, deep', function () {
- var root = new openerp.base.list.Collection();
+ var root = new openerp.web.list.Collection();
root.proxy('foo').add([
{id: 1, value: 5},
{id: 2, value: 10},
diff --git a/addons/base/static/test/qunit-doc.js b/addons/web/static/test/qunit-doc.js
similarity index 100%
rename from addons/base/static/test/qunit-doc.js
rename to addons/web/static/test/qunit-doc.js
diff --git a/addons/web/static/test/registry.js b/addons/web/static/test/registry.js
new file mode 100644
index 00000000000..0a3e65e9b1c
--- /dev/null
+++ b/addons/web/static/test/registry.js
@@ -0,0 +1,33 @@
+$(document).ready(function () {
+ var openerp;
+ module('Registry', {
+ setup: function () {
+ openerp = window.openerp.init(true);
+ window.openerp.web.core(openerp);
+ openerp.web.Foo = {};
+ openerp.web.Bar = {};
+ }
+ });
+ test('key fetch', function () {
+ var reg = new openerp.web.Registry({
+ foo: 'openerp.web.Foo',
+ bar: 'openerp.web.Bar',
+ quux: 'openerp.web.Quux'
+ });
+
+ strictEqual(reg.get_object('foo'), openerp.web.Foo);
+ raises(function () { reg.get_object('qux'); },
+ openerp.web.KeyNotFound,
+ "Unknown keys should raise KeyNotFound");
+ raises(function () { reg.get_object('quux'); },
+ openerp.web.ObjectNotFound,
+ "Incorrect file paths should raise ObjectNotFound");
+ });
+ test('key set', function () {
+ var reg = new openerp.web.Registry();
+
+ reg.add('foo', 'openerp.web.Foo')
+ .add('bar', 'openerp.web.Bar');
+ strictEqual(reg.get_object('bar'), openerp.web.Bar);
+ });
+});
diff --git a/addons/web/static/test/test.html b/addons/web/static/test/test.html
new file mode 100644
index 00000000000..38237a0600a
--- /dev/null
+++ b/addons/web/static/test/test.html
@@ -0,0 +1,53 @@
+
+
+
+
+ OpenERP
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/base/test/__init__.py b/addons/web/test/__init__.py
similarity index 100%
rename from addons/base/test/__init__.py
rename to addons/web/test/__init__.py
diff --git a/addons/base/test/test_dataset.py b/addons/web/test/test_dataset.py
similarity index 96%
rename from addons/base/test/test_dataset.py
rename to addons/web/test/test_dataset.py
index 702c63b0899..898ca5a582c 100644
--- a/addons/base/test/test_dataset.py
+++ b/addons/web/test/test_dataset.py
@@ -1,11 +1,11 @@
# -*- coding: utf-8 -*-
import mock
import unittest2
-import base.controllers.main
+import web.controllers.main
class TestDataSetController(unittest2.TestCase):
def setUp(self):
- self.dataset = base.controllers.main.DataSet()
+ self.dataset = web.controllers.main.DataSet()
self.request = mock.Mock()
self.read = self.request.session.model().read
self.search = self.request.session.model().search
diff --git a/addons/base/test/test_menu.py b/addons/web/test/test_menu.py
similarity index 94%
rename from addons/base/test/test_menu.py
rename to addons/web/test/test_menu.py
index 5b4fddd05e1..d763fd7dcb1 100644
--- a/addons/base/test/test_menu.py
+++ b/addons/web/test/test_menu.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import mock
import unittest2
-import base.controllers.main
+import web.controllers.main
import openerpweb.openerpweb
class Placeholder(object):
@@ -11,7 +11,7 @@ class Placeholder(object):
class LoadTest(unittest2.TestCase):
def setUp(self):
- self.menu = base.controllers.main.Menu()
+ self.menu = web.controllers.main.Menu()
self.menus_mock = mock.Mock()
self.request = Placeholder(
session=openerpweb.openerpweb.OpenERPSession(
@@ -100,7 +100,7 @@ class LoadTest(unittest2.TestCase):
class ActionMungerTest(unittest2.TestCase):
def setUp(self):
- self.menu = base.controllers.main.Menu()
+ self.menu = web.controllers.main.Menu()
def test_actual_treeview(self):
action = {
"views": [[False, "tree"], [False, "form"],
@@ -111,7 +111,7 @@ class ActionMungerTest(unittest2.TestCase):
}
changed = action.copy()
del action['view_type']
- base.controllers.main.fix_view_modes(changed)
+ web.controllers.main.fix_view_modes(changed)
self.assertEqual(changed, action)
@@ -123,7 +123,7 @@ class ActionMungerTest(unittest2.TestCase):
"view_id": False,
"view_mode": "tree,form,calendar"
}
- base.controllers.main.fix_view_modes(action)
+ web.controllers.main.fix_view_modes(action)
self.assertEqual(action, {
"views": [[False, "list"], [False, "form"],
@@ -141,7 +141,7 @@ class ActionMungerTest(unittest2.TestCase):
"view_id": False,
"view_mode": "tree,form,calendar"
}
- base.controllers.main.fix_view_modes(action)
+ web.controllers.main.fix_view_modes(action)
self.assertEqual(action, {
"views": [[False, "list"], [False, "form"],
diff --git a/addons/base/test/test_view.py b/addons/web/test/test_view.py
similarity index 95%
rename from addons/base/test/test_view.py
rename to addons/web/test/test_view.py
index 0070ea11cf4..677ed42eb2b 100644
--- a/addons/base/test/test_view.py
+++ b/addons/web/test/test_view.py
@@ -5,7 +5,7 @@ import mock
import unittest2
import simplejson
-import base.controllers.main
+import web.controllers.main
import openerpweb.nonliterals
import openerpweb.openerpweb
@@ -17,7 +17,7 @@ def field_attrs(fields_view_get, fieldname):
#noinspection PyCompatibility
class DomainsAndContextsTest(unittest2.TestCase):
def setUp(self):
- self.view = base.controllers.main.View()
+ self.view = web.controllers.main.View()
def test_convert_literal_domain(self):
e = xml.etree.ElementTree.Element(
@@ -107,10 +107,10 @@ class DomainsAndContextsTest(unittest2.TestCase):
class AttrsNormalizationTest(unittest2.TestCase):
def setUp(self):
- self.view = base.controllers.main.View()
+ self.view = web.controllers.main.View()
def test_identity(self):
- base_view = """
+ web_view = """
"""
- pristine = xml.etree.ElementTree.fromstring(base_view)
- transformed = self.view.transform_view(base_view, None)
+ pristine = xml.etree.ElementTree.fromstring(web_view)
+ transformed = self.view.transform_view(web_view, None)
self.assertEqual(
xml.etree.ElementTree.tostring(transformed),
@@ -166,7 +166,7 @@ class AttrsNormalizationTest(unittest2.TestCase):
'''}
- parsed_view = base.controllers.main.View().fields_view_get(
+ parsed_view = web.controllers.main.View().fields_view_get(
req, 'project.task', 42, 'tree')
self.assertTrue(field_attrs(parsed_view, 'sequence')['invisible'])
@@ -180,7 +180,7 @@ class AttrsNormalizationTest(unittest2.TestCase):
class ListViewTest(unittest2.TestCase):
def setUp(self):
- self.view = base.controllers.main.ListView()
+ self.view = web.controllers.main.ListView()
self.request = mock.Mock()
self.request.context = {'set_editable': True}
def test_no_editable_editable_context(self):
diff --git a/addons/base_calendar/__init__.py b/addons/web_calendar/__init__.py
similarity index 100%
rename from addons/base_calendar/__init__.py
rename to addons/web_calendar/__init__.py
diff --git a/addons/base_calendar/__openerp__.py b/addons/web_calendar/__openerp__.py
similarity index 88%
rename from addons/base_calendar/__openerp__.py
rename to addons/web_calendar/__openerp__.py
index b8f6a954082..ba18ef0490e 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/web_calendar/__openerp__.py
@@ -1,7 +1,7 @@
{
- "name": "Base calendar",
+ "name": "web calendar",
"version": "2.0",
- "depends": ['base'],
+ "depends": ['web'],
"js": [
'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_debug.js',
'static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_minical.js',
diff --git a/addons/base_calendar/controllers/__init__.py b/addons/web_calendar/controllers/__init__.py
similarity index 100%
rename from addons/base_calendar/controllers/__init__.py
rename to addons/web_calendar/controllers/__init__.py
diff --git a/addons/base_calendar/controllers/main.py b/addons/web_calendar/controllers/main.py
similarity index 68%
rename from addons/base_calendar/controllers/main.py
rename to addons/web_calendar/controllers/main.py
index 0211b3e4632..4cf65bae77f 100644
--- a/addons/base_calendar/controllers/main.py
+++ b/addons/web_calendar/controllers/main.py
@@ -1,9 +1,9 @@
-import base.common as openerpweb
+import web.common as openerpweb
-from base.controllers.main import View
+from web.controllers.main import View
class CalendarView(View):
- _cp_path = "/base_calendar/calendarview"
+ _cp_path = "/web_calendar/calendarview"
@openerpweb.jsonrequest
def load(self, req, model, view_id, toolbar=False):
diff --git a/addons/base_calendar/po/base_calendar.pot b/addons/web_calendar/po/base_calendar.pot
similarity index 100%
rename from addons/base_calendar/po/base_calendar.pot
rename to addons/web_calendar/po/base_calendar.pot
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/base_connector.php b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/base_connector.php
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/base_connector.php
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/base_connector.php
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/combo_connector.php b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/combo_connector.php
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/combo_connector.php
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/combo_connector.php
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/connector.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/connector.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/connector.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/connector.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/crosslink_connector.php b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/crosslink_connector.php
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/crosslink_connector.php
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/crosslink_connector.php
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/dataprocessor.php b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/dataprocessor.php
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/dataprocessor.php
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/dataprocessor.php
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_common.php b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_common.php
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_common.php
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_common.php
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_mssql.php b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_mssql.php
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_mssql.php
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_mssql.php
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_mysqli.php b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_mysqli.php
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_mysqli.php
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_mysqli.php
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_oracle.php b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_oracle.php
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_oracle.php
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_oracle.php
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_pdo.php b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_pdo.php
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_pdo.php
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_pdo.php
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_postgre.php b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_postgre.php
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_postgre.php
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/db_postgre.php
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/grid_connector.php b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/grid_connector.php
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/grid_connector.php
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/grid_connector.php
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/scheduler_connector.php b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/scheduler_connector.php
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/scheduler_connector.php
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/scheduler_connector.php
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/tools.php b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/tools.php
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/tools.php
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/tools.php
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/tree_connector.php b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/tree_connector.php
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/tree_connector.php
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/tree_connector.php
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/treegrid_connector.php b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/treegrid_connector.php
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/treegrid_connector.php
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/treegrid_connector.php
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/update.php b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/update.php
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/connector/update.php
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/connector/update.php
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.css b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.css
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.css
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.css
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_debug.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_debug.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_debug.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_debug.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_glossy.css b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_glossy.css
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_glossy.css
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_glossy.css
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_mobile.css b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_mobile.css
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_mobile.css
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_mobile.css
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_mobile.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_mobile.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_mobile.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_mobile.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_active_links.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_active_links.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_active_links.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_active_links.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_agenda_view.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_agenda_view.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_agenda_view.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_agenda_view.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_collision.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_collision.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_collision.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_collision.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_cookie.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_cookie.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_cookie.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_cookie.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_editors.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_editors.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_editors.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_editors.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_expand.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_expand.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_expand.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_expand.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_html_templates.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_html_templates.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_html_templates.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_html_templates.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_key_nav.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_key_nav.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_key_nav.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_key_nav.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_limit.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_limit.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_limit.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_limit.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_map_view.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_map_view.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_map_view.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_map_view.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_minical.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_minical.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_minical.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_minical.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_multiselect.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_multiselect.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_multiselect.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_multiselect.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_multisource.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_multisource.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_multisource.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_multisource.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_offline.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_offline.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_offline.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_offline.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_outerdrag.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_outerdrag.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_outerdrag.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_outerdrag.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_pdf.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_pdf.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_pdf.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_pdf.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_readonly.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_readonly.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_readonly.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_readonly.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_recurring.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_recurring.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_recurring.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_recurring.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_serialize.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_serialize.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_serialize.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_serialize.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_timeline.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_timeline.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_timeline.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_timeline.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_tooltip.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_tooltip.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_tooltip.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_tooltip.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_touch.css b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_touch.css
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_touch.css
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_touch.css
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_touch.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_touch.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_touch.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_touch.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_treetimeline.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_treetimeline.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_treetimeline.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_treetimeline.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_units.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_units.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_units.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_units.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_url.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_url.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_url.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_url.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_week_agenda.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_week_agenda.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_week_agenda.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_week_agenda.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_year_view.js b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_year_view.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_year_view.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_year_view.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/but_repeat.gif b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/but_repeat.gif
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/but_repeat.gif
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/but_repeat.gif
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/buttons.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/buttons.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/buttons.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/buttons.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/calendar.gif b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/calendar.gif
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/calendar.gif
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/calendar.gif
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/clock_big.gif b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/clock_big.gif
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/clock_big.gif
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/clock_big.gif
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/clock_small.gif b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/clock_small.gif
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/clock_small.gif
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/clock_small.gif
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/colapce-expand-icon.gif b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/colapce-expand-icon.gif
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/colapce-expand-icon.gif
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/colapce-expand-icon.gif
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/controls.gif b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/controls.gif
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/controls.gif
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/controls.gif
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/databg.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/databg.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/databg.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/databg.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/databg_now.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/databg_now.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/databg_now.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/databg_now.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/icon.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/icon.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/icon.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/icon.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/loading.gif b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/loading.gif
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/loading.gif
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/loading.gif
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/blue_tab.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/blue_tab.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/blue_tab.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/blue_tab.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/blue_tab_wide.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/blue_tab_wide.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/blue_tab_wide.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/blue_tab_wide.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/but_repeat.gif b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/but_repeat.gif
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/but_repeat.gif
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/but_repeat.gif
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/buttons.gif b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/buttons.gif
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/buttons.gif
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/buttons.gif
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/calendar.gif b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/calendar.gif
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/calendar.gif
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/calendar.gif
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/clock_big.gif b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/clock_big.gif
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/clock_big.gif
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/clock_big.gif
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/clock_small.gif b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/clock_small.gif
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/clock_small.gif
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/clock_small.gif
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/colapce-expand-icon.gif b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/colapce-expand-icon.gif
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/colapce-expand-icon.gif
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/colapce-expand-icon.gif
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/controlls5.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/controlls5.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/controlls5.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/controlls5.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/databg.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/databg.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/databg.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/databg.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/databg_now.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/databg_now.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/databg_now.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/databg_now.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/event-bg.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/event-bg.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/event-bg.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/event-bg.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/icon.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/icon.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/icon.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/icon.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/left-separator.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/left-separator.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/left-separator.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/left-separator.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/left-time-bg.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/left-time-bg.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/left-time-bg.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/left-time-bg.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/lightbox.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/lightbox.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/lightbox.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/lightbox.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/loading.gif b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/loading.gif
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/loading.gif
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/loading.gif
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/move.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/move.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/move.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/move.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/multi-days-bg.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/multi-days-bg.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/multi-days-bg.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/multi-days-bg.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/second-top-days-bg.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/second-top-days-bg.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/second-top-days-bg.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/second-top-days-bg.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/top-days-bg.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/top-days-bg.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/top-days-bg.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/top-days-bg.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/top-separator.gif b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/top-separator.gif
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/top-separator.gif
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/top-separator.gif
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/white_tab.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/white_tab.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/white_tab.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/white_tab.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/white_tab_wide.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/white_tab_wide.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/white_tab_wide.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/white_tab_wide.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/add.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/add.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/add.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/add.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/arrow_left.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/arrow_left.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/arrow_left.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/arrow_left.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/arrow_right.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/arrow_right.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/arrow_right.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/arrow_right.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/event.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/event.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/event.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/event.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/event_focus.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/event_focus.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/event_focus.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/event_focus.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/noevents.png b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/noevents.png
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/noevents.png
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_mobile/noevents.png
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/readme.txt b/addons/web_calendar/static/lib/dhtmlxScheduler/codebase/readme.txt
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/codebase/readme.txt
rename to addons/web_calendar/static/lib/dhtmlxScheduler/codebase/readme.txt
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/license.txt b/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/license.txt
rename to addons/web_calendar/static/lib/dhtmlxScheduler/license.txt
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/readme.txt b/addons/web_calendar/static/lib/dhtmlxScheduler/readme.txt
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/readme.txt
rename to addons/web_calendar/static/lib/dhtmlxScheduler/readme.txt
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/base.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/base.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/base.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/base.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/clear.css b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/clear.css
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/clear.css
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/clear.css
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/config.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/config.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/config.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/config.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/connector.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/connector.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/connector.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/connector.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/dataprocessor_hook.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/dataprocessor_hook.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/dataprocessor_hook.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/dataprocessor_hook.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/dayevents.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/dayevents.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/dayevents.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/dayevents.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxcommon.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxcommon.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxcommon.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxcommon.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxdataprocessor.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxdataprocessor.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxdataprocessor.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxdataprocessor.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxdataprocessor_debug.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxdataprocessor_debug.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxdataprocessor_debug.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxdataprocessor_debug.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxdataprocessor_jsonp.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxdataprocessor_jsonp.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxdataprocessor_jsonp.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxdataprocessor_jsonp.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/event.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/event.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/event.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/event.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext.css b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext.css
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext.css
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext.css
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_active_links.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_active_links.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_active_links.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_active_links.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_agenda_view.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_agenda_view.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_agenda_view.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_agenda_view.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_collision.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_collision.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_collision.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_collision.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_cookie.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_cookie.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_cookie.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_cookie.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_editors.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_editors.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_editors.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_editors.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_expand.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_expand.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_expand.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_expand.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_html_templates.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_html_templates.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_html_templates.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_html_templates.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_key_nav.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_key_nav.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_key_nav.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_key_nav.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_layer.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_layer.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_layer.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_layer.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_limit.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_limit.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_limit.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_limit.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_map_view.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_map_view.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_map_view.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_map_view.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_matrix.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_matrix.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_matrix.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_matrix.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_minical.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_minical.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_minical.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_minical.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_monthheight.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_monthheight.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_monthheight.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_monthheight.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_multiselect.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_multiselect.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_multiselect.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_multiselect.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_multisource.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_multisource.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_multisource.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_multisource.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_offline.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_offline.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_offline.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_offline.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_outerdrag.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_outerdrag.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_outerdrag.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_outerdrag.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_pdf.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_pdf.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_pdf.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_pdf.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_readonly.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_readonly.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_readonly.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_readonly.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_serialize.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_serialize.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_serialize.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_serialize.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_tooltip.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_tooltip.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_tooltip.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_tooltip.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_treetimeline.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_treetimeline.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_treetimeline.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_treetimeline.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_url.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_url.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_url.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_url.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_week_agenda.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_week_agenda.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_week_agenda.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_week_agenda.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_wp.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_wp.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_wp.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_wp.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_year_view.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_year_view.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_year_view.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_year_view.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/glossy.css b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/glossy.css
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/glossy.css
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/glossy.css
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ical.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ical.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/ical.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/ical.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/layout.css b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/layout.css
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/layout.css
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/layout.css
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/lightbox.css b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/lightbox.css
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/lightbox.css
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/lightbox.css
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/lightbox.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/lightbox.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/lightbox.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/lightbox.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/load.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/load.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/load.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/load.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ar.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_ar.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ar.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_ar.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ca.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_ca.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ca.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_ca.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_cn.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_cn.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_cn.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_cn.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_cs.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_cs.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_cs.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_cs.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_da.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_da.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_da.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_da.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_de.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_de.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_de.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_de.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_el.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_el.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_el.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_el.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_es.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_es.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_es.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_es.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_fi.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_fi.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_fi.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_fi.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_fr.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_fr.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_fr.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_fr.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_he.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_he.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_he.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_he.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_hu.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_hu.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_hu.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_hu.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_id.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_id.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_id.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_id.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_it.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_it.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_it.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_it.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_jp.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_jp.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_jp.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_jp.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_nb.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_nb.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_nb.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_nb.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_nl.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_nl.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_nl.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_nl.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_no.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_no.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_no.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_no.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_pl.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_pl.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_pl.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_pl.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_pt.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_pt.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_pt.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_pt.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_cn.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_cn.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_cn.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_cn.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_cs.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_cs.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_cs.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_cs.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_da.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_da.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_da.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_da.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_de.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_de.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_de.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_de.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_el.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_el.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_el.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_el.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_es.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_es.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_es.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_es.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_fi.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_fi.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_fi.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_fi.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_fr.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_fr.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_fr.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_fr.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_it.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_it.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_it.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_it.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_nb.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_nb.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_nb.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_nb.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_nl.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_nl.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_nl.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_nl.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_pl.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_pl.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_pl.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_pl.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_pt.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_pt.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_pt.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_pt.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_ru.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_ru.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_ru.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_ru.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_sv.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_sv.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_sv.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_sv.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_ua.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_ua.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_ua.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_ua.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ru.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_ru.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ru.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_ru.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_si.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_si.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_si.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_si.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_sv.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_sv.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_sv.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_sv.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_tr.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_tr.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_tr.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_tr.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ua.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_ua.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ua.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/locale_ua.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/mobile.css b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/mobile.css
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/mobile.css
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/mobile.css
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/mobile.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/mobile.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/mobile.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/mobile.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/note.css b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/note.css
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/note.css
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/note.css
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/property.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/property.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/property.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/property.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/recurring.css b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/recurring.css
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/recurring.css
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/recurring.css
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/recurring.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/recurring.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/recurring.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/recurring.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template.html b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/repeat_template.html
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template.html
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/repeat_template.html
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_cn.html b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_cn.html
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_cn.html
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_cn.html
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_de.html b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_de.html
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_de.html
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_de.html
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_el.html b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_el.html
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_el.html
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_el.html
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_es.html b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_es.html
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_es.html
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_es.html
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_fr.html b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_fr.html
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_fr.html
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_fr.html
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_it.html b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_it.html
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_it.html
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_it.html
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_nl.html b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_nl.html
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_nl.html
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_nl.html
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_ru.html b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_ru.html
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_ru.html
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_ru.html
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/scheduler.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/scheduler.js
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/sources/scheduler.js
rename to addons/web_calendar/static/lib/dhtmlxScheduler/sources/scheduler.js
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/whatsnew.txt b/addons/web_calendar/static/lib/dhtmlxScheduler/whatsnew.txt
similarity index 100%
rename from addons/base_calendar/static/lib/dhtmlxScheduler/whatsnew.txt
rename to addons/web_calendar/static/lib/dhtmlxScheduler/whatsnew.txt
diff --git a/addons/base_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
similarity index 88%
rename from addons/base_calendar/static/src/js/calendar.js
rename to addons/web_calendar/static/src/js/calendar.js
index 808c1ba31ab..b9673b082b2 100644
--- a/addons/base_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -1,11 +1,11 @@
/*---------------------------------------------------------
- * OpenERP base_calendar
+ * OpenERP web_calendar
*---------------------------------------------------------*/
-openerp.base_calendar = function(openerp) {
-QWeb.add_template('/base_calendar/static/src/xml/base_calendar.xml');
-openerp.base.views.add('calendar', 'openerp.base_calendar.CalendarView');
-openerp.base_calendar.CalendarView = openerp.base.View.extend({
+openerp.web_calendar = function(openerp) {
+QWeb.add_template('/web_calendar/static/src/xml/web_calendar.xml');
+openerp.web.views.add('calendar', 'openerp.web_calendar.CalendarView');
+openerp.web_calendar.CalendarView = openerp.web.View.extend({
// Dhtmlx scheduler ?
init: function(parent, element_id, dataset, view_id, options) {
this._super(parent, element_id);
@@ -19,7 +19,7 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
this.creating_event_id = null;
this.dataset_events = [];
if (this.options.action_views_ids.form) {
- this.form_dialog = new openerp.base_calendar.CalendarFormDialog(this, {}, this.options.action_views_ids.form, dataset);
+ this.form_dialog = new openerp.web_calendar.CalendarFormDialog(this, {}, this.options.action_views_ids.form, dataset);
this.form_dialog.start();
}
this.COLOR_PALETTE = ['#f57900', '#cc0000', '#d400a8', '#75507b', '#3465a4', '#73d216', '#c17d11', '#edd400',
@@ -29,7 +29,7 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
this.color_map = {};
},
start: function() {
- this.rpc("/base_calendar/calendarview/load", {"model": this.model, "view_id": this.view_id, 'toolbar': true}, this.on_loaded);
+ this.rpc("/web_calendar/calendarview/load", {"model": this.model, "view_id": this.view_id, 'toolbar': true}, this.on_loaded);
},
stop: function() {
scheduler.clearAll();
@@ -75,10 +75,10 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
this.$element.html(QWeb.render("CalendarView", {"fields_view": this.fields_view}));
if (this.options.sidebar && this.options.sidebar_id) {
- this.sidebar = new openerp.base.Sidebar(this, this.options.sidebar_id);
+ this.sidebar = new openerp.web.Sidebar(this, this.options.sidebar_id);
this.sidebar.start();
- this.sidebar.navigator = new openerp.base_calendar.SidebarNavigator(this.sidebar, this.sidebar.add_section('navigator', "Navigator"), this);
- this.sidebar.responsible = new openerp.base_calendar.SidebarResponsible(this.sidebar, this.sidebar.add_section('responsible', "Responsible"), this);
+ this.sidebar.navigator = new openerp.web_calendar.SidebarNavigator(this.sidebar, this.sidebar.add_section('navigator', "Navigator"), this);
+ this.sidebar.responsible = new openerp.web_calendar.SidebarResponsible(this.sidebar, this.sidebar.add_section('responsible', "Responsible"), this);
this.sidebar.add_toolbar(data.fields_view.toolbar);
this.set_common_sidebar_sections(this.sidebar);
this.sidebar.do_unfold();
@@ -180,10 +180,10 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
}
if (this.fields[this.date_start]['type'] == 'date') {
- evt[this.date_start] = openerp.base.str_to_date(evt[this.date_start]).set({hour: 9}).toString('yyyy-MM-dd HH:mm:ss');
+ evt[this.date_start] = openerp.web.str_to_date(evt[this.date_start]).set({hour: 9}).toString('yyyy-MM-dd HH:mm:ss');
}
if (this.date_stop && evt[this.date_stop] && this.fields[this.date_stop]['type'] == 'date') {
- evt[this.date_stop] = openerp.base.str_to_date(evt[this.date_stop]).set({hour: 17}).toString('yyyy-MM-dd HH:mm:ss');
+ evt[this.date_stop] = openerp.web.str_to_date(evt[this.date_stop]).set({hour: 17}).toString('yyyy-MM-dd HH:mm:ss');
}
res_events.push(this.convert_event(evt));
}
@@ -195,8 +195,8 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
}
},
convert_event: function(evt) {
- var date_start = openerp.base.str_to_datetime(evt[this.date_start]),
- date_stop = this.date_stop ? openerp.base.str_to_datetime(evt[this.date_stop]) : null,
+ var date_start = openerp.web.str_to_datetime(evt[this.date_start]),
+ date_stop = this.date_stop ? openerp.web.str_to_datetime(evt[this.date_stop]) : null,
date_delay = evt[this.date_delay] || null,
res_text = '',
res_description = [];
@@ -280,9 +280,9 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
var data = {
name: event_obj.text
};
- data[this.date_start] = openerp.base.datetime_to_str(event_obj.start_date);
+ data[this.date_start] = openerp.web.datetime_to_str(event_obj.start_date);
if (this.date_stop) {
- data[this.date_stop] = openerp.base.datetime_to_str(event_obj.end_date);
+ data[this.date_stop] = openerp.web.datetime_to_str(event_obj.end_date);
}
if (this.date_delay) {
var diff_seconds = Math.round((event_obj.end_date.getTime() - event_obj.start_date.getTime()) / 1000);
@@ -294,7 +294,7 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
var self = this;
scheduler.clearAll();
$.when(this.has_been_loaded).then(function() {
- self.rpc('/base/session/eval_domain_and_context', {
+ self.rpc('/web/session/eval_domain_and_context', {
domains: domains,
contexts: contexts,
group_by_seq: groupbys
@@ -334,7 +334,7 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
}
});
-openerp.base_calendar.CalendarFormDialog = openerp.base.Dialog.extend({
+openerp.web_calendar.CalendarFormDialog = openerp.web.Dialog.extend({
init: function(view, options, view_id, dataset) {
this._super(view, options);
this.dataset = dataset;
@@ -343,7 +343,7 @@ openerp.base_calendar.CalendarFormDialog = openerp.base.Dialog.extend({
},
start: function() {
this._super();
- this.form = new openerp.base.FormView(this, this.element_id, this.dataset, this.view_id, {
+ this.form = new openerp.web.FormView(this, this.element_id, this.dataset, this.view_id, {
sidebar: false,
pager: false
});
@@ -368,7 +368,7 @@ openerp.base_calendar.CalendarFormDialog = openerp.base.Dialog.extend({
}
});
-openerp.base_calendar.SidebarResponsible = openerp.base.Widget.extend({
+openerp.web_calendar.SidebarResponsible = openerp.web.Widget.extend({
init: function(parent, element_id, view) {
this._super(parent, element_id);
this.view = view;
@@ -394,7 +394,7 @@ openerp.base_calendar.SidebarResponsible = openerp.base.Widget.extend({
}
});
-openerp.base_calendar.SidebarNavigator = openerp.base.Widget.extend({
+openerp.web_calendar.SidebarNavigator = openerp.web.Widget.extend({
init: function(parent, element_id, view) {
this._super(parent, element_id);
this.view = view;
diff --git a/addons/base_calendar/static/src/xml/base_calendar.xml b/addons/web_calendar/static/src/xml/web_calendar.xml
similarity index 100%
rename from addons/base_calendar/static/src/xml/base_calendar.xml
rename to addons/web_calendar/static/src/xml/web_calendar.xml
diff --git a/addons/web_chat/__openerp__.py b/addons/web_chat/__openerp__.py
index 6bd08f81e6a..c5e2fa7fc13 100644
--- a/addons/web_chat/__openerp__.py
+++ b/addons/web_chat/__openerp__.py
@@ -1,7 +1,7 @@
{
"name": "Web Chat",
"version": "2.0",
- "depends": ['base'],
+ "depends": ['web'],
"js": [
'static/lib/AjaxIM/js/jquery.jsonp-1.1.0.js',
'static/lib/AjaxIM/js/jquery.jstore-all-min.js',
diff --git a/addons/web_chat/controllers/main.py b/addons/web_chat/controllers/main.py
index e445eb4be6d..1e0710163f8 100644
--- a/addons/web_chat/controllers/main.py
+++ b/addons/web_chat/controllers/main.py
@@ -2,7 +2,7 @@
import time
import simplejson
-import base.common as openerpweb
+import web.common as openerpweb
#----------------------------------------------------------
# OpenERP Web ajaxim Controllers
diff --git a/addons/base_dashboard/__init__.py b/addons/web_dashboard/__init__.py
similarity index 100%
rename from addons/base_dashboard/__init__.py
rename to addons/web_dashboard/__init__.py
diff --git a/addons/base_dashboard/__openerp__.py b/addons/web_dashboard/__openerp__.py
similarity index 72%
rename from addons/base_dashboard/__openerp__.py
rename to addons/web_dashboard/__openerp__.py
index e6248c2c515..e4bad9c1eaf 100644
--- a/addons/base_dashboard/__openerp__.py
+++ b/addons/web_dashboard/__openerp__.py
@@ -1,7 +1,7 @@
{
- "name": "Base Dashboard",
+ "name": "web Dashboard",
"version": "2.0",
- "depends": ['base'],
+ "depends": ['web'],
"js": [
'static/src/js/dashboard.js'
],
diff --git a/addons/base_dashboard/controllers.py b/addons/web_dashboard/controllers.py
similarity index 91%
rename from addons/base_dashboard/controllers.py
rename to addons/web_dashboard/controllers.py
index 2ebfefab1e8..80235492c0f 100644
--- a/addons/base_dashboard/controllers.py
+++ b/addons/web_dashboard/controllers.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-import base.common as openerpweb
+import web.common as openerpweb
WIDGET_CONTENT_PATTERN = """
@@ -19,7 +19,7 @@ WIDGET_CONTENT_PATTERN = """
"""
class Widgets(openerpweb.Controller):
- _cp_path = '/base_dashboard/widgets'
+ _cp_path = '/web_dashboard/widgets'
@openerpweb.httprequest
def content(self, request, widget_id):
diff --git a/addons/base_dashboard/po/base_dashboard.pot b/addons/web_dashboard/po/base_dashboard.pot
similarity index 100%
rename from addons/base_dashboard/po/base_dashboard.pot
rename to addons/web_dashboard/po/base_dashboard.pot
diff --git a/addons/base_dashboard/static/src/css/dashboard.css b/addons/web_dashboard/static/src/css/dashboard.css
similarity index 100%
rename from addons/base_dashboard/static/src/css/dashboard.css
rename to addons/web_dashboard/static/src/css/dashboard.css
diff --git a/addons/base_dashboard/static/src/img/layout_1-1-1.png b/addons/web_dashboard/static/src/img/layout_1-1-1.png
similarity index 100%
rename from addons/base_dashboard/static/src/img/layout_1-1-1.png
rename to addons/web_dashboard/static/src/img/layout_1-1-1.png
diff --git a/addons/base_dashboard/static/src/img/layout_1-1.png b/addons/web_dashboard/static/src/img/layout_1-1.png
similarity index 100%
rename from addons/base_dashboard/static/src/img/layout_1-1.png
rename to addons/web_dashboard/static/src/img/layout_1-1.png
diff --git a/addons/base_dashboard/static/src/img/layout_1-2.png b/addons/web_dashboard/static/src/img/layout_1-2.png
similarity index 100%
rename from addons/base_dashboard/static/src/img/layout_1-2.png
rename to addons/web_dashboard/static/src/img/layout_1-2.png
diff --git a/addons/base_dashboard/static/src/img/layout_1.png b/addons/web_dashboard/static/src/img/layout_1.png
similarity index 100%
rename from addons/base_dashboard/static/src/img/layout_1.png
rename to addons/web_dashboard/static/src/img/layout_1.png
diff --git a/addons/base_dashboard/static/src/img/layout_2-1.png b/addons/web_dashboard/static/src/img/layout_2-1.png
similarity index 100%
rename from addons/base_dashboard/static/src/img/layout_2-1.png
rename to addons/web_dashboard/static/src/img/layout_2-1.png
diff --git a/addons/base_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
similarity index 89%
rename from addons/base_dashboard/static/src/js/dashboard.js
rename to addons/web_dashboard/static/src/js/dashboard.js
index f83d841d19a..8b44f05c789 100644
--- a/addons/base_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -1,8 +1,8 @@
-openerp.base_dashboard = function(openerp) {
+openerp.web_dashboard = function(openerp) {
-QWeb.add_template('/base_dashboard/static/src/xml/base_dashboard.xml');
+QWeb.add_template('/web_dashboard/static/src/xml/web_dashboard.xml');
-openerp.base.form.DashBoard = openerp.base.form.Widget.extend({
+openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
init: function(view, node) {
this._super(view, node);
this.template = 'DashBoard';
@@ -36,7 +36,7 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({
delete(action.attrs.height);
delete(action.attrs.colspan);
self.actions_attrs[action.attrs.name] = action.attrs;
- self.rpc('/base/action/load', {
+ self.rpc('/web/action/load', {
action_id: parseInt(action.attrs.name, 10)
}, self.on_load_action);
});
@@ -48,20 +48,20 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({
});
},
on_undo: function() {
- this.rpc('/base/view/undo_custom', {
+ this.rpc('/web/view/undo_custom', {
view_id: this.view.fields_view.view_id
}, this.do_reload);
},
on_reset: function() {
- this.rpc('/base/view/undo_custom', {
+ this.rpc('/web/view/undo_custom', {
view_id: this.view.fields_view.view_id,
reset: true
}, this.do_reload);
},
on_add_widget: function() {
var self = this;
- var action_manager = new openerp.base.ActionManager(this);
- var dialog = new openerp.base.Dialog(this, {
+ var action_manager = new openerp.web.ActionManager(this);
+ var dialog = new openerp.web.Dialog(this, {
title : 'Actions',
width: 800,
height: 600,
@@ -97,7 +97,7 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({
qdict = { view : this.view };
// TODO: should load multiple actions at once
_.each(actions, function(aid) {
- self.rpc('/base/action/load', {
+ self.rpc('/web/action/load', {
action_id: aid
}, function(result) {
self.actions_attrs[aid] = {
@@ -209,7 +209,7 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({
board.columns.push(actions);
});
var arch = QWeb.render('DashBoard.xml', board);
- this.rpc('/base/view/add_custom', {
+ this.rpc('/web/view/add_custom', {
view_id: this.view.fields_view.view_id,
arch: arch
}, function() {
@@ -225,7 +225,7 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({
action_buttons : false,
pager: false
};
- var am = new openerp.base.ActionManager(this);
+ var am = new openerp.web.ActionManager(this);
this.action_managers.push(am);
am.appendTo($("#"+this.view.element_id + '_action_' + action.id));
am.do_action(action);
@@ -250,7 +250,7 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({
this.view.start();
}
});
-openerp.base.form.DashBoardLegacy = openerp.base.form.DashBoard.extend({
+openerp.web.form.DashBoardLegacy = openerp.web.form.DashBoard.extend({
render: function() {
if (this.node.tag == 'hpaned') {
this.node.attrs.style = '1-1';
@@ -274,21 +274,21 @@ openerp.base.form.DashBoardLegacy = openerp.base.form.DashBoard.extend({
}
});
-openerp.base.form.widgets.add('hpaned', 'openerp.base.form.DashBoardLegacy');
-openerp.base.form.widgets.add('vpaned', 'openerp.base.form.DashBoardLegacy');
-openerp.base.form.widgets.add('board', 'openerp.base.form.DashBoard');
+openerp.web.form.widgets.add('hpaned', 'openerp.web.form.DashBoardLegacy');
+openerp.web.form.widgets.add('vpaned', 'openerp.web.form.DashBoardLegacy');
+openerp.web.form.widgets.add('board', 'openerp.web.form.DashBoard');
-openerp.base.client_actions.add(
- 'board.config.overview', 'openerp.base_dashboard.ConfigOverview'
+openerp.web.client_actions.add(
+ 'board.config.overview', 'openerp.web_dashboard.ConfigOverview'
);
-if (!openerp.base_dashboard) {
- openerp.base_dashboard = {};
+if (!openerp.web_dashboard) {
+ openerp.web_dashboard = {};
}
-openerp.base_dashboard.ConfigOverview = openerp.base.View.extend({
+openerp.web_dashboard.ConfigOverview = openerp.web.View.extend({
template: 'ConfigOverview',
init: function (parent, element_id) {
this._super(parent, element_id);
- this.dataset = new openerp.base.DataSetSearch(
+ this.dataset = new openerp.web.DataSetSearch(
this, 'ir.actions.todo');
this.dataset.domain = [['type', '=', 'manual']];
},
@@ -345,13 +345,13 @@ openerp.base_dashboard.ConfigOverview = openerp.base.View.extend({
}
});
-openerp.base.client_actions.add(
- 'board.home.applications', 'openerp.base_dashboard.ApplicationTiles');
-openerp.base_dashboard.ApplicationTiles = openerp.base.View.extend({
+openerp.web.client_actions.add(
+ 'board.home.applications', 'openerp.web_dashboard.ApplicationTiles');
+openerp.web_dashboard.ApplicationTiles = openerp.web.View.extend({
template: 'ApplicationTiles',
start: function () {
var self = this;
- return new openerp.base.DataSetSearch(
+ return new openerp.web.DataSetSearch(
this, 'ir.ui.menu', null, [['parent_id', '=', false]])
.read_slice( ['name', 'web_icon_data', 'web_icon_hover_data'], {}, function (applications) {
// Create a matrix of 3*x applications
@@ -371,16 +371,16 @@ openerp.base_dashboard.ApplicationTiles = openerp.base.View.extend({
});
}
});
-openerp.base.client_actions.add(
- 'board.home.widgets', 'openerp.base_dashboard.Widget');
-openerp.base_dashboard.Widget = openerp.base.View.extend(/** @lends openerp.base_dashboard.Widgets# */{
+openerp.web.client_actions.add(
+ 'board.home.widgets', 'openerp.web_dashboard.Widget');
+openerp.web_dashboard.Widget = openerp.web.View.extend(/** @lends openerp.web_dashboard.Widgets# */{
template: 'HomeWidget',
/**
* Initializes a "HomeWidget" client widget: handles the display of a given
* res.widget objects in an OpenERP view (mainly a dashboard).
*
* @constructs
- * @extends openerp.base.View
+ * @extends openerp.web.View
* @param {Object} parent
* @param {Object} options
* @param {Number} options.widget_id
@@ -390,13 +390,13 @@ openerp.base_dashboard.Widget = openerp.base.View.extend(/** @lends openerp.base
this.widget_id = options.widget_id;
},
start: function () {
- return new openerp.base.DataSet(this, 'res.widget').read_ids(
+ return new openerp.web.DataSet(this, 'res.widget').read_ids(
[this.widget_id], ['title'], this.on_widget_loaded);
},
on_widget_loaded: function (widgets) {
var widget = widgets[0];
var url = _.sprintf(
- '/base_dashboard/widgets/content?session_id=%s&widget_id=%d',
+ '/web_dashboard/widgets/content?session_id=%s&widget_id=%d',
this.session.session_id, widget.id);
this.$element.html(QWeb.render('HomeWidget.content', {
widget: widget,
diff --git a/addons/base_dashboard/static/src/xml/base_dashboard.xml b/addons/web_dashboard/static/src/xml/web_dashboard.xml
similarity index 88%
rename from addons/base_dashboard/static/src/xml/base_dashboard.xml
rename to addons/web_dashboard/static/src/xml/web_dashboard.xml
index b60e466964b..e03e21b6487 100644
--- a/addons/base_dashboard/static/src/xml/base_dashboard.xml
+++ b/addons/web_dashboard/static/src/xml/web_dashboard.xml
@@ -2,19 +2,19 @@
@@ -32,7 +32,7 @@
diff --git a/addons/base/controllers/__init__.py b/addons/web_default_home/__init__.py
similarity index 100%
rename from addons/base/controllers/__init__.py
rename to addons/web_default_home/__init__.py
diff --git a/addons/base_default_home/__openerp__.py b/addons/web_default_home/__openerp__.py
similarity index 86%
rename from addons/base_default_home/__openerp__.py
rename to addons/web_default_home/__openerp__.py
index 097ff0e19c0..2093e6236f0 100644
--- a/addons/base_default_home/__openerp__.py
+++ b/addons/web_default_home/__openerp__.py
@@ -1,7 +1,7 @@
{
"name" : "OpenERP Web installer home",
"version" : "2.0",
- "depends" : ['base'],
+ "depends" : ['web'],
'active': True,
'js': ['static/src/js/home.js'],
'css': ['static/src/css/home.css']
diff --git a/addons/base_default_home/po/base_default_home.pot b/addons/web_default_home/po/base_default_home.pot
similarity index 100%
rename from addons/base_default_home/po/base_default_home.pot
rename to addons/web_default_home/po/base_default_home.pot
diff --git a/addons/base_default_home/static/src/css/home.css b/addons/web_default_home/static/src/css/home.css
similarity index 100%
rename from addons/base_default_home/static/src/css/home.css
rename to addons/web_default_home/static/src/css/home.css
diff --git a/addons/base_default_home/static/src/img/account_voucher.png b/addons/web_default_home/static/src/img/account_voucher.png
similarity index 100%
rename from addons/base_default_home/static/src/img/account_voucher.png
rename to addons/web_default_home/static/src/img/account_voucher.png
diff --git a/addons/base_default_home/static/src/img/crm.png b/addons/web_default_home/static/src/img/crm.png
similarity index 100%
rename from addons/base_default_home/static/src/img/crm.png
rename to addons/web_default_home/static/src/img/crm.png
diff --git a/addons/base_default_home/static/src/img/hr.png b/addons/web_default_home/static/src/img/hr.png
similarity index 100%
rename from addons/base_default_home/static/src/img/hr.png
rename to addons/web_default_home/static/src/img/hr.png
diff --git a/addons/base_default_home/static/src/img/knowledge.png b/addons/web_default_home/static/src/img/knowledge.png
similarity index 100%
rename from addons/base_default_home/static/src/img/knowledge.png
rename to addons/web_default_home/static/src/img/knowledge.png
diff --git a/addons/base_default_home/static/src/img/marketing.png b/addons/web_default_home/static/src/img/marketing.png
similarity index 100%
rename from addons/base_default_home/static/src/img/marketing.png
rename to addons/web_default_home/static/src/img/marketing.png
diff --git a/addons/base_default_home/static/src/img/mrp.png b/addons/web_default_home/static/src/img/mrp.png
similarity index 100%
rename from addons/base_default_home/static/src/img/mrp.png
rename to addons/web_default_home/static/src/img/mrp.png
diff --git a/addons/base_default_home/static/src/img/point_of_sale.png b/addons/web_default_home/static/src/img/point_of_sale.png
similarity index 100%
rename from addons/base_default_home/static/src/img/point_of_sale.png
rename to addons/web_default_home/static/src/img/point_of_sale.png
diff --git a/addons/base_default_home/static/src/img/profile_tools.png b/addons/web_default_home/static/src/img/profile_tools.png
similarity index 100%
rename from addons/base_default_home/static/src/img/profile_tools.png
rename to addons/web_default_home/static/src/img/profile_tools.png
diff --git a/addons/base_default_home/static/src/img/project.png b/addons/web_default_home/static/src/img/project.png
similarity index 100%
rename from addons/base_default_home/static/src/img/project.png
rename to addons/web_default_home/static/src/img/project.png
diff --git a/addons/base_default_home/static/src/img/purchase.png b/addons/web_default_home/static/src/img/purchase.png
similarity index 100%
rename from addons/base_default_home/static/src/img/purchase.png
rename to addons/web_default_home/static/src/img/purchase.png
diff --git a/addons/base_default_home/static/src/img/sale.png b/addons/web_default_home/static/src/img/sale.png
similarity index 100%
rename from addons/base_default_home/static/src/img/sale.png
rename to addons/web_default_home/static/src/img/sale.png
diff --git a/addons/base_default_home/static/src/img/stock.png b/addons/web_default_home/static/src/img/stock.png
similarity index 100%
rename from addons/base_default_home/static/src/img/stock.png
rename to addons/web_default_home/static/src/img/stock.png
diff --git a/addons/base_default_home/static/src/js/home.js b/addons/web_default_home/static/src/js/home.js
similarity index 86%
rename from addons/base_default_home/static/src/js/home.js
rename to addons/web_default_home/static/src/js/home.js
index 57b5fab71f3..0d7386f14d6 100644
--- a/addons/base_default_home/static/src/js/home.js
+++ b/addons/web_default_home/static/src/js/home.js
@@ -1,7 +1,7 @@
-openerp.base_default_home = function (openerp) {
- QWeb.add_template('/base_default_home/static/src/xml/base_default_home.xml');
+openerp.web_default_home = function (openerp) {
+ QWeb.add_template('/web_default_home/static/src/xml/web_default_home.xml');
- openerp.base_default_home = {
+ openerp.web_default_home = {
applications: [
[
{
@@ -49,7 +49,7 @@ openerp.base_default_home = function (openerp) {
]
};
- openerp.base.WebClient.include({
+ openerp.web.WebClient.include({
default_home: function () {
var self = this,
// resig class can't handle _super in async contexts, by the
@@ -57,7 +57,7 @@ openerp.base_default_home = function (openerp) {
// reset to a baseline value of this.prototype (or something
// like that)
old_home = this._super;
- var Installer = new openerp.base.DataSet(
+ var Installer = new openerp.web.DataSet(
this, 'base.setup.installer');
Installer.call('already_installed', [], function (installed_modules) {
if (!_(installed_modules).isEmpty()) {
@@ -74,9 +74,9 @@ openerp.base_default_home = function (openerp) {
}
});
- openerp.base.client_actions.add(
- 'home.default', 'openerp.base_default_home.DefaultHome');
- openerp.base_default_home.DefaultHome = openerp.base.View.extend({
+ openerp.web.client_actions.add(
+ 'home.default', 'openerp.web_default_home.DefaultHome');
+ openerp.web_default_home.DefaultHome = openerp.web.View.extend({
template: 'StaticHome',
start: function () {
var r = this._super(), self = this;
@@ -89,15 +89,15 @@ openerp.base_default_home = function (openerp) {
return this._super({
url: window.location.protocol + '//' + window.location.host + window.location.pathname,
session: this.session,
- rows: openerp.base_default_home.applications
+ rows: openerp.web_default_home.applications
})
},
install_module: function (module_name) {
- var Modules = new openerp.base.DataSetSearch(
+ var Modules = new openerp.web.DataSetSearch(
this, 'ir.module.module', null, [['name', '=', module_name], ['state', '=', 'uninstalled']]);
- var Upgrade = new openerp.base.DataSet(this, 'base.module.upgrade');
+ var Upgrade = new openerp.web.DataSet(this, 'base.module.upgrade');
- $.blockUI({message:' '});
+ $.blockUI({message:' '});
Modules.read_slice(['id'], {}, function (records) {
if (!(records.length === 1)) { return; }
Modules.call('state_update',
diff --git a/addons/base_default_home/static/src/xml/base_default_home.xml b/addons/web_default_home/static/src/xml/web_default_home.xml
similarity index 92%
rename from addons/base_default_home/static/src/xml/base_default_home.xml
rename to addons/web_default_home/static/src/xml/web_default_home.xml
index 9ed7415afb6..5ee11387db9 100644
--- a/addons/base_default_home/static/src/xml/base_default_home.xml
+++ b/addons/web_default_home/static/src/xml/web_default_home.xml
@@ -14,7 +14,7 @@
- ![]()
+ ![]()
|
diff --git a/addons/base_diagram/__init__.py b/addons/web_diagram/__init__.py
similarity index 100%
rename from addons/base_diagram/__init__.py
rename to addons/web_diagram/__init__.py
diff --git a/addons/base_diagram/__openerp__.py b/addons/web_diagram/__openerp__.py
similarity index 62%
rename from addons/base_diagram/__openerp__.py
rename to addons/web_diagram/__openerp__.py
index 92b768896f9..50b159982ac 100644
--- a/addons/base_diagram/__openerp__.py
+++ b/addons/web_diagram/__openerp__.py
@@ -1,5 +1,5 @@
{
- "name" : "OpenERP Web base Diagram",
+ "name" : "OpenERP Web Diagram",
"version" : "2.0",
"depends" : [],
'active': False,
diff --git a/addons/base_diagram/controllers/__init__.py b/addons/web_diagram/controllers/__init__.py
similarity index 100%
rename from addons/base_diagram/controllers/__init__.py
rename to addons/web_diagram/controllers/__init__.py
diff --git a/addons/base_diagram/controllers/main.py b/addons/web_diagram/controllers/main.py
similarity index 97%
rename from addons/base_diagram/controllers/main.py
rename to addons/web_diagram/controllers/main.py
index 8e258810eca..4824a7c530f 100644
--- a/addons/base_diagram/controllers/main.py
+++ b/addons/web_diagram/controllers/main.py
@@ -1,8 +1,8 @@
-import base.common as openerpweb
-from base.controllers.main import View
+import web.common as openerpweb
+from web.controllers.main import View
class DiagramView(View):
- _cp_path = "/base_diagram/diagram"
+ _cp_path = "/web_diagram/diagram"
@openerpweb.jsonrequest
def load(self, req, model, view_id):
diff --git a/addons/base_diagram/po/base_diagram.pot b/addons/web_diagram/po/base_diagram.pot
similarity index 100%
rename from addons/base_diagram/po/base_diagram.pot
rename to addons/web_diagram/po/base_diagram.pot
diff --git a/addons/base_diagram/static/lib/js/Curry-1.0.1.js b/addons/web_diagram/static/lib/js/Curry-1.0.1.js
similarity index 100%
rename from addons/base_diagram/static/lib/js/Curry-1.0.1.js
rename to addons/web_diagram/static/lib/js/Curry-1.0.1.js
diff --git a/addons/base_diagram/static/lib/js/dracula_algorithms.js b/addons/web_diagram/static/lib/js/dracula_algorithms.js
similarity index 100%
rename from addons/base_diagram/static/lib/js/dracula_algorithms.js
rename to addons/web_diagram/static/lib/js/dracula_algorithms.js
diff --git a/addons/base_diagram/static/lib/js/dracula_graffle.js b/addons/web_diagram/static/lib/js/dracula_graffle.js
similarity index 100%
rename from addons/base_diagram/static/lib/js/dracula_graffle.js
rename to addons/web_diagram/static/lib/js/dracula_graffle.js
diff --git a/addons/base_diagram/static/lib/js/dracula_graph.coffee b/addons/web_diagram/static/lib/js/dracula_graph.coffee
similarity index 100%
rename from addons/base_diagram/static/lib/js/dracula_graph.coffee
rename to addons/web_diagram/static/lib/js/dracula_graph.coffee
diff --git a/addons/base_diagram/static/lib/js/dracula_graph.js b/addons/web_diagram/static/lib/js/dracula_graph.js
similarity index 100%
rename from addons/base_diagram/static/lib/js/dracula_graph.js
rename to addons/web_diagram/static/lib/js/dracula_graph.js
diff --git a/addons/base_diagram/static/lib/js/raphael-min.js b/addons/web_diagram/static/lib/js/raphael-min.js
similarity index 100%
rename from addons/base_diagram/static/lib/js/raphael-min.js
rename to addons/web_diagram/static/lib/js/raphael-min.js
diff --git a/addons/base_diagram/static/lib/js/seedrandom.js b/addons/web_diagram/static/lib/js/seedrandom.js
similarity index 100%
rename from addons/base_diagram/static/lib/js/seedrandom.js
rename to addons/web_diagram/static/lib/js/seedrandom.js
diff --git a/addons/base_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
similarity index 94%
rename from addons/base_diagram/static/src/js/diagram.js
rename to addons/web_diagram/static/src/js/diagram.js
index b992b5cbf42..22149be11a0 100644
--- a/addons/base_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -1,11 +1,11 @@
/*---------------------------------------------------------
- * OpenERP base library
+ * OpenERP web library
*---------------------------------------------------------*/
-openerp.base.diagram = function (openerp) {
+openerp.web.diagram = function (openerp) {
-openerp.base.views.add('diagram', 'openerp.base.DiagramView');
-openerp.base.DiagramView = openerp.base.Widget.extend({
+openerp.web.views.add('diagram', 'openerp.web.DiagramView');
+openerp.web.DiagramView = openerp.web.Widget.extend({
init: function(view_manager, session, element_id, dataset, view_id){
this._super(session, element_id);
this.view_manager = view_manager;
@@ -20,7 +20,7 @@ openerp.base.DiagramView = openerp.base.Widget.extend({
console.log('data set>>',this.dataset)
},
start: function() {
- this.rpc("/base_diagram/diagram/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded);
+ this.rpc("/web_diagram/diagram/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded);
},
toTitleCase: function(str) {
@@ -99,7 +99,7 @@ openerp.base.DiagramView = openerp.base.Widget.extend({
if(this.id) {
this.rpc(
- '/base_diagram/diagram/get_diagram_info',
+ '/web_diagram/diagram/get_diagram_info',
{
'id': this.id,
'model': this.model,
diff --git a/addons/base_gantt/__init__.py b/addons/web_gantt/__init__.py
similarity index 100%
rename from addons/base_gantt/__init__.py
rename to addons/web_gantt/__init__.py
diff --git a/addons/base_gantt/__openerp__.py b/addons/web_gantt/__openerp__.py
similarity index 84%
rename from addons/base_gantt/__openerp__.py
rename to addons/web_gantt/__openerp__.py
index c23f352a4f7..6d857e5dc48 100644
--- a/addons/base_gantt/__openerp__.py
+++ b/addons/web_gantt/__openerp__.py
@@ -1,7 +1,7 @@
{
- "name": "Base Gantt",
+ "name": "web Gantt",
"version": "2.0",
- "depends": ['base'],
+ "depends": ['web'],
"js": [
'static/lib/dhtmlxGantt/sources/dhtmlxcommon.js',
'static/lib/dhtmlxGantt/sources/dhtmlxgantt.js',
diff --git a/addons/base_gantt/controllers/__init__.py b/addons/web_gantt/controllers/__init__.py
similarity index 100%
rename from addons/base_gantt/controllers/__init__.py
rename to addons/web_gantt/controllers/__init__.py
diff --git a/addons/base_gantt/controllers/main.py b/addons/web_gantt/controllers/main.py
similarity index 65%
rename from addons/base_gantt/controllers/main.py
rename to addons/web_gantt/controllers/main.py
index 56fb2b7e79f..4f7e9201b38 100644
--- a/addons/base_gantt/controllers/main.py
+++ b/addons/web_gantt/controllers/main.py
@@ -1,8 +1,8 @@
-import base.common as openerpweb
-from base.controllers.main import View
+import web.common as openerpweb
+from web.controllers.main import View
class GanttView(View):
- _cp_path = "/base_gantt/ganttview"
+ _cp_path = "/web_gantt/ganttview"
@openerpweb.jsonrequest
def load(self, req, model, view_id):
diff --git a/addons/base_gantt/po/base_gantt.pot b/addons/web_gantt/po/base_gantt.pot
similarity index 100%
rename from addons/base_gantt/po/base_gantt.pot
rename to addons/web_gantt/po/base_gantt.pot
diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/License_GPL.html b/addons/web_gantt/static/lib/dhtmlxGantt/License_GPL.html
similarity index 100%
rename from addons/base_gantt/static/lib/dhtmlxGantt/License_GPL.html
rename to addons/web_gantt/static/lib/dhtmlxGantt/License_GPL.html
diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxcommon.js b/addons/web_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxcommon.js
similarity index 100%
rename from addons/base_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxcommon.js
rename to addons/web_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxcommon.js
diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxgantt.css b/addons/web_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxgantt.css
similarity index 100%
rename from addons/base_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxgantt.css
rename to addons/web_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxgantt.css
diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxgantt.js b/addons/web_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxgantt.js
similarity index 100%
rename from addons/base_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxgantt.js
rename to addons/web_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxgantt.js
diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/arr.gif b/addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/arr.gif
similarity index 100%
rename from addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/arr.gif
rename to addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/arr.gif
diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/bg.png b/addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/bg.png
similarity index 100%
rename from addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/bg.png
rename to addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/bg.png
diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/bg_week.png b/addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/bg_week.png
similarity index 100%
rename from addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/bg_week.png
rename to addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/bg_week.png
diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/menu/menu_bg.png b/addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/menu/menu_bg.png
similarity index 100%
rename from addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/menu/menu_bg.png
rename to addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/menu/menu_bg.png
diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/menu/menu_selection.png b/addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/menu/menu_selection.png
similarity index 100%
rename from addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/menu/menu_selection.png
rename to addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/menu/menu_selection.png
diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/menu/window_tr.png b/addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/menu/window_tr.png
similarity index 100%
rename from addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/menu/window_tr.png
rename to addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/menu/window_tr.png
diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/minus.gif b/addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/minus.gif
similarity index 100%
rename from addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/minus.gif
rename to addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/minus.gif
diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/parentnode_filled.png b/addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/parentnode_filled.png
similarity index 100%
rename from addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/parentnode_filled.png
rename to addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/parentnode_filled.png
diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/plus.gif b/addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/plus.gif
similarity index 100%
rename from addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/plus.gif
rename to addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/plus.gif
diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/progress_bg.png b/addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/progress_bg.png
similarity index 100%
rename from addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/progress_bg.png
rename to addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/progress_bg.png
diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/progress_filled.png b/addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/progress_filled.png
similarity index 100%
rename from addons/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/progress_filled.png
rename to addons/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/progress_filled.png
diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/index.html b/addons/web_gantt/static/lib/dhtmlxGantt/index.html
similarity index 100%
rename from addons/base_gantt/static/lib/dhtmlxGantt/index.html
rename to addons/web_gantt/static/lib/dhtmlxGantt/index.html
diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/readme.txt b/addons/web_gantt/static/lib/dhtmlxGantt/readme.txt
similarity index 100%
rename from addons/base_gantt/static/lib/dhtmlxGantt/readme.txt
rename to addons/web_gantt/static/lib/dhtmlxGantt/readme.txt
diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/sources/dhtmlxcommon.js b/addons/web_gantt/static/lib/dhtmlxGantt/sources/dhtmlxcommon.js
similarity index 100%
rename from addons/base_gantt/static/lib/dhtmlxGantt/sources/dhtmlxcommon.js
rename to addons/web_gantt/static/lib/dhtmlxGantt/sources/dhtmlxcommon.js
diff --git a/addons/base_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js b/addons/web_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js
similarity index 100%
rename from addons/base_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js
rename to addons/web_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js
diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js
similarity index 95%
rename from addons/base_gantt/static/src/js/gantt.js
rename to addons/web_gantt/static/src/js/gantt.js
index ad44382397b..a6d000737b4 100644
--- a/addons/base_gantt/static/src/js/gantt.js
+++ b/addons/web_gantt/static/src/js/gantt.js
@@ -1,14 +1,14 @@
/*---------------------------------------------------------
- * OpenERP base_gantt
+ * OpenERP web_gantt
*---------------------------------------------------------*/
-openerp.base_gantt = function (openerp) {
-QWeb.add_template('/base_gantt/static/src/xml/base_gantt.xml');
-openerp.base.views.add('gantt', 'openerp.base_gantt.GanttView');
-openerp.base_gantt.GanttView = openerp.base.View.extend({
+openerp.web_gantt = function (openerp) {
+QWeb.add_template('/web_gantt/static/src/xml/web_gantt.xml');
+openerp.web.views.add('gantt', 'openerp.web_gantt.GanttView');
+openerp.web_gantt.GanttView = openerp.web.View.extend({
init: function(parent, element_id, dataset, view_id) {
this._super(parent, element_id);
- this.view_manager = parent || new openerp.base.NullViewManager();
+ this.view_manager = parent || new openerp.web.NullViewManager();
this.dataset = dataset;
this.model = dataset.model;
this.view_id = view_id;
@@ -31,7 +31,7 @@ init: function(parent, element_id, dataset, view_id) {
},
start: function() {
- this.rpc("/base_gantt/ganttview/load",
+ this.rpc("/web_gantt/ganttview/load",
{"model": this.model, "view_id": this.view_id}, this.on_loaded);
},
@@ -67,7 +67,7 @@ init: function(parent, element_id, dataset, view_id) {
create_gantt: function() {
ganttChartControl = new GanttChart(this.day_length);
- ganttChartControl.setImagePath("/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/");
+ ganttChartControl.setImagePath("/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/");
ganttChartControl.setEditable(true);
ganttChartControl.showTreePanel(true);
ganttChartControl.showContextMenu(true);
@@ -425,7 +425,7 @@ init: function(parent, element_id, dataset, view_id) {
}
}
});
- var action_manager = new openerp.base.ActionManager(this, element_id);
+ var action_manager = new openerp.web.ActionManager(this, element_id);
action_manager.start();
action_manager.do_action(action);
@@ -474,24 +474,24 @@ init: function(parent, element_id, dataset, view_id) {
convert_str_date: function (str){
if (str.length == 19){
this.format = "yyyy-MM-dd HH:mm:ss";
- return openerp.base.str_to_datetime(str);
+ return openerp.web.str_to_datetime(str);
} else if (str.length == 10){
this.format = "yyyy-MM-dd";
- return openerp.base.str_to_date(str);
+ return openerp.web.str_to_date(str);
} else if (str.length == 8){
this.format = "HH:mm:ss";
- return openerp.base.str_to_time(str);
+ return openerp.web.str_to_time(str);
}
throw "Unrecognized date/time format";
},
convert_date_str: function(full_date) {
if (this.format == "yyyy-MM-dd HH:mm:ss"){
- return openerp.base.datetime_to_str(full_date);
+ return openerp.web.datetime_to_str(full_date);
} else if (this.format == "yyyy-MM-dd"){
- return openerp.base.date_to_str(full_date);
+ return openerp.web.date_to_str(full_date);
} else if (this.format == "HH:mm:ss"){
- return openerp.base.time_to_str(full_date);
+ return openerp.web.time_to_str(full_date);
}
throw "Unrecognized date/time format";
},
@@ -508,7 +508,7 @@ init: function(parent, element_id, dataset, view_id) {
do_search: function (domains, contexts, groupbys) {
var self = this;
this.grp = groupbys;
- return this.rpc('/base/session/eval_domain_and_context', {
+ return this.rpc('/web/session/eval_domain_and_context', {
domains: domains,
contexts: contexts,
group_by_seq: groupbys
diff --git a/addons/base_gantt/static/src/xml/base_gantt.xml b/addons/web_gantt/static/src/xml/web_gantt.xml
similarity index 100%
rename from addons/base_gantt/static/src/xml/base_gantt.xml
rename to addons/web_gantt/static/src/xml/web_gantt.xml
diff --git a/addons/base_graph/__init__.py b/addons/web_graph/__init__.py
similarity index 100%
rename from addons/base_graph/__init__.py
rename to addons/web_graph/__init__.py
diff --git a/addons/base_graph/__openerp__.py b/addons/web_graph/__openerp__.py
similarity index 80%
rename from addons/base_graph/__openerp__.py
rename to addons/web_graph/__openerp__.py
index c393953b9fd..4a1c4a6576f 100644
--- a/addons/base_graph/__openerp__.py
+++ b/addons/web_graph/__openerp__.py
@@ -1,7 +1,7 @@
{
- "name": "Base Graph",
+ "name": "web Graph",
"version": "2.0",
- "depends": ['base'],
+ "depends": ['web'],
"js": [
"static/lib/dhtmlxGraph/codebase/dhtmlxchart.js",
"static/src/js/graph.js"],
diff --git a/addons/base_graph/controllers/__init__.py b/addons/web_graph/controllers/__init__.py
similarity index 100%
rename from addons/base_graph/controllers/__init__.py
rename to addons/web_graph/controllers/__init__.py
diff --git a/addons/base_graph/controllers/main.py b/addons/web_graph/controllers/main.py
similarity index 72%
rename from addons/base_graph/controllers/main.py
rename to addons/web_graph/controllers/main.py
index f326faf3854..cda868c0809 100644
--- a/addons/base_graph/controllers/main.py
+++ b/addons/web_graph/controllers/main.py
@@ -1,8 +1,8 @@
-from base.controllers.main import View
-import base.common as openerpweb
+from web.controllers.main import View
+import web.common as openerpweb
class GraphView(View):
- _cp_path = "/base_graph/graphview"
+ _cp_path = "/web_graph/graphview"
@openerpweb.jsonrequest
def load(self, req, model, view_id):
diff --git a/addons/base_graph/po/base_graph.pot b/addons/web_graph/po/base_graph.pot
similarity index 100%
rename from addons/base_graph/po/base_graph.pot
rename to addons/web_graph/po/base_graph.pot
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/License_GPL.html b/addons/web_graph/static/lib/dhtmlxGraph/License_GPL.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/License_GPL.html
rename to addons/web_graph/static/lib/dhtmlxGraph/License_GPL.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart.css b/addons/web_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart.css
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart.css
rename to addons/web_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart.css
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart.js b/addons/web_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart.js
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart.js
rename to addons/web_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart.js
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart_debug.css b/addons/web_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart_debug.css
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart_debug.css
rename to addons/web_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart_debug.css
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart_debug.js b/addons/web_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart_debug.js
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart_debug.js
rename to addons/web_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart_debug.js
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/AUTHORS b/addons/web_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/AUTHORS
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/AUTHORS
rename to addons/web_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/AUTHORS
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/COPYING b/addons/web_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/COPYING
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/COPYING
rename to addons/web_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/COPYING
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/README b/addons/web_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/README
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/README
rename to addons/web_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/README
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/excanvas.js b/addons/web_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/excanvas.js
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/excanvas.js
rename to addons/web_graph/static/lib/dhtmlxGraph/codebase/thirdparty/excanvas/excanvas.js
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/dhtmlxchart_full.zip b/addons/web_graph/static/lib/dhtmlxGraph/dhtmlxchart_full.zip
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/dhtmlxchart_full.zip
rename to addons/web_graph/static/lib/dhtmlxGraph/dhtmlxchart_full.zip
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/readme.txt b/addons/web_graph/static/lib/dhtmlxGraph/readme.txt
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/readme.txt
rename to addons/web_graph/static/lib/dhtmlxGraph/readme.txt
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/01_initialization/01_load_xml.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/01_initialization/01_load_xml.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/01_initialization/01_load_xml.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/01_initialization/01_load_xml.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/01_initialization/02_load_json.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/01_initialization/02_load_json.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/01_initialization/02_load_json.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/01_initialization/02_load_json.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/01_initialization/03_load_csv.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/01_initialization/03_load_csv.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/01_initialization/03_load_csv.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/01_initialization/03_load_csv.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/01_initialization/04_load_jsarray.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/01_initialization/04_load_jsarray.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/01_initialization/04_load_jsarray.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/01_initialization/04_load_jsarray.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/01_initialization/05_series.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/01_initialization/05_series.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/01_initialization/05_series.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/01_initialization/05_series.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/02_color/01_default.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/02_color/01_default.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/02_color/01_default.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/02_color/01_default.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/02_color/02_custom.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/02_color/02_custom.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/02_color/02_custom.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/02_color/02_custom.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/02_color/03_custom_logic.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/02_color/03_custom_logic.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/02_color/03_custom_logic.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/02_color/03_custom_logic.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/02_color/04_gradient.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/02_color/04_gradient.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/02_color/04_gradient.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/02_color/04_gradient.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/03_group/01_basic.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/03_group/01_basic.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/03_group/01_basic.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/03_group/01_basic.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/03_group/02_scales.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/03_group/02_scales.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/03_group/02_scales.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/03_group/02_scales.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/04_pie_chart/01_init.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/04_pie_chart/01_init.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/04_pie_chart/01_init.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/04_pie_chart/01_init.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/04_pie_chart/02_text.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/04_pie_chart/02_text.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/04_pie_chart/02_text.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/04_pie_chart/02_text.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/04_pie_chart/03_3d_chart.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/04_pie_chart/03_3d_chart.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/04_pie_chart/03_3d_chart.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/04_pie_chart/03_3d_chart.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/04_pie_chart/04_legend.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/04_pie_chart/04_legend.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/04_pie_chart/04_legend.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/04_pie_chart/04_legend.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/05_line_chart/01_init.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/05_line_chart/01_init.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/05_line_chart/01_init.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/05_line_chart/01_init.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/05_line_chart/02_style.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/05_line_chart/02_style.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/05_line_chart/02_style.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/05_line_chart/02_style.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/05_line_chart/03_scale.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/05_line_chart/03_scale.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/05_line_chart/03_scale.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/05_line_chart/03_scale.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/05_line_chart/04_spline.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/05_line_chart/04_spline.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/05_line_chart/04_spline.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/05_line_chart/04_spline.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/05_line_chart/05_series.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/05_line_chart/05_series.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/05_line_chart/05_series.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/05_line_chart/05_series.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/01_init.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/01_init.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/01_init.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/01_init.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/02_text.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/02_text.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/02_text.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/02_text.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/03_scales.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/03_scales.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/03_scales.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/03_scales.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/04_styles.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/04_styles.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/04_styles.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/04_styles.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/05_stacked_chart.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/05_stacked_chart.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/05_stacked_chart.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/05_stacked_chart.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/06_series.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/06_series.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/06_series.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/06_series.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/07_horizonal_bars.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/07_horizonal_bars.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/07_horizonal_bars.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/07_horizonal_bars.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/08_horizonal_stacked_bars.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/08_horizonal_stacked_bars.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/08_horizonal_stacked_bars.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/06_bar_chart/08_horizonal_stacked_bars.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/07_area_chart/01_init.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/07_area_chart/01_init.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/07_area_chart/01_init.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/07_area_chart/01_init.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/07_area_chart/02_scale.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/07_area_chart/02_scale.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/07_area_chart/02_scale.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/07_area_chart/02_scale.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/07_area_chart/03_series.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/07_area_chart/03_series.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/07_area_chart/03_series.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/07_area_chart/03_series.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/07_area_chart/03_stacked_area.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/07_area_chart/03_stacked_area.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/07_area_chart/03_stacked_area.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/07_area_chart/03_stacked_area.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/08_dynamic/01_add.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/08_dynamic/01_add.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/08_dynamic/01_add.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/08_dynamic/01_add.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/08_dynamic/02_events.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/08_dynamic/02_events.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/08_dynamic/02_events.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/08_dynamic/02_events.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/08_dynamic/03_sorting.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/08_dynamic/03_sorting.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/08_dynamic/03_sorting.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/08_dynamic/03_sorting.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/08_dynamic/04_filtering.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/08_dynamic/04_filtering.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/08_dynamic/04_filtering.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/08_dynamic/04_filtering.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/09_integration/01_dhtmlxgrid.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/09_integration/01_dhtmlxgrid.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/09_integration/01_dhtmlxgrid.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/09_integration/01_dhtmlxgrid.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/09_integration/02_dhtmlxgrid_group.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/09_integration/02_dhtmlxgrid_group.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/09_integration/02_dhtmlxgrid_group.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/09_integration/02_dhtmlxgrid_group.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/09_integration/03_windows.html b/addons/web_graph/static/lib/dhtmlxGraph/samples/09_integration/03_windows.html
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/09_integration/03_windows.html
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/09_integration/03_windows.html
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/common/config.php b/addons/web_graph/static/lib/dhtmlxGraph/samples/common/config.php
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/common/config.php
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/common/config.php
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/common/data.php b/addons/web_graph/static/lib/dhtmlxGraph/samples/common/data.php
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/common/data.php
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/common/data.php
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/common/sales.xml b/addons/web_graph/static/lib/dhtmlxGraph/samples/common/sales.xml
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/common/sales.xml
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/common/sales.xml
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/common/stat.xml b/addons/web_graph/static/lib/dhtmlxGraph/samples/common/stat.xml
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/common/stat.xml
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/common/stat.xml
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/readme.txt b/addons/web_graph/static/lib/dhtmlxGraph/samples/readme.txt
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/samples/readme.txt
rename to addons/web_graph/static/lib/dhtmlxGraph/samples/readme.txt
diff --git a/addons/base_graph/static/lib/dhtmlxGraph/sources/dhtmlxchart.js b/addons/web_graph/static/lib/dhtmlxGraph/sources/dhtmlxchart.js
similarity index 100%
rename from addons/base_graph/static/lib/dhtmlxGraph/sources/dhtmlxchart.js
rename to addons/web_graph/static/lib/dhtmlxGraph/sources/dhtmlxchart.js
diff --git a/addons/base_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
similarity index 97%
rename from addons/base_graph/static/src/js/graph.js
rename to addons/web_graph/static/src/js/graph.js
index e76d38b33bc..f5fd7c1953d 100644
--- a/addons/base_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -1,8 +1,8 @@
/*---------------------------------------------------------
- * OpenERP base_graph
+ * OpenERP web_graph
*---------------------------------------------------------*/
-openerp.base_graph = function (openerp) {
+openerp.web_graph = function (openerp) {
var COLOR_PALETTE = [
'#cc99ff', '#ccccff', '#48D1CC', '#CFD784', '#8B7B8B', '#75507b',
'#b0008c', '#ff0000', '#ff8e00', '#9000ff', '#0078ff', '#00ff00',
@@ -12,9 +12,9 @@ var COLOR_PALETTE = [
'#ad7fa8', '#729fcf', '#8ae234', '#e9b96e', '#fce94f', '#f57900',
'#cc0000', '#d400a8'];
-QWeb.add_template('/base_graph/static/src/xml/base_graph.xml');
-openerp.base.views.add('graph', 'openerp.base_graph.GraphView');
-openerp.base_graph.GraphView = openerp.base.View.extend({
+QWeb.add_template('/web_graph/static/src/xml/web_graph.xml');
+openerp.web.views.add('graph', 'openerp.web_graph.GraphView');
+openerp.web_graph.GraphView = openerp.web.View.extend({
init: function(parent, element_id, dataset, view_id) {
this._super(parent, element_id);
@@ -32,7 +32,7 @@ openerp.base_graph.GraphView = openerp.base.View.extend({
this.$element.hide();
},
start: function() {
- return this.rpc("/base_graph/graphview/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded);
+ return this.rpc("/web_graph/graphview/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded);
},
on_loaded: function(data) {
this.all_fields = data.all_fields;
@@ -455,7 +455,7 @@ openerp.base_graph.GraphView = openerp.base.View.extend({
do_search: function(domains, contexts, groupbys) {
var self = this;
- this.rpc('/base/session/eval_domain_and_context', {
+ this.rpc('/web/session/eval_domain_and_context', {
domains: domains,
contexts: contexts,
group_by_seq: groupbys
diff --git a/addons/base_graph/static/src/xml/base_graph.xml b/addons/web_graph/static/src/xml/web_graph.xml
similarity index 100%
rename from addons/base_graph/static/src/xml/base_graph.xml
rename to addons/web_graph/static/src/xml/web_graph.xml
diff --git a/addons/base_hello/__init__.py b/addons/web_hello/__init__.py
similarity index 100%
rename from addons/base_hello/__init__.py
rename to addons/web_hello/__init__.py
diff --git a/addons/base_hello/__openerp__.py b/addons/web_hello/__openerp__.py
similarity index 100%
rename from addons/base_hello/__openerp__.py
rename to addons/web_hello/__openerp__.py
diff --git a/addons/base_hello/po/base_hello.pot b/addons/web_hello/po/base_hello.pot
similarity index 100%
rename from addons/base_hello/po/base_hello.pot
rename to addons/web_hello/po/base_hello.pot
diff --git a/addons/base_hello/static/openerp/base_hello.js b/addons/web_hello/static/openerp/base_hello.js
similarity index 80%
rename from addons/base_hello/static/openerp/base_hello.js
rename to addons/web_hello/static/openerp/base_hello.js
index 5d6a02d355b..99c97006eac 100644
--- a/addons/base_hello/static/openerp/base_hello.js
+++ b/addons/web_hello/static/openerp/base_hello.js
@@ -2,9 +2,9 @@
* OpenERP base_hello (Example module)
*---------------------------------------------------------*/
-openerp.base_hello = function(openerp) {
+openerp.web_hello = function(openerp) {
-openerp.base.SearchView = openerp.base.SearchView.extend({
+openerp.web.SearchView = openerp.web.SearchView.extend({
init:function() {
this._super.apply(this,arguments);
this.on_search.add(function(){console.log('hello');});
diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index 551856e01fb..6c99ffe3740 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -5,21 +5,21 @@
openerp.web_mobile.chrome_mobile = function(openerp) {
openerp.web_mobile.mobilewebclient = function(element_id) {
- // TODO Helper to start mobile webclient rename it openerp.base.webclient
+ // TODO Helper to start mobile webclient rename it openerp.web.webclient
var client = new openerp.web_mobile.MobileWebClient(element_id);
client.start();
return client;
};
-openerp.web_mobile.MobileWebClient = openerp.base.Widget.extend({
+openerp.web_mobile.MobileWebClient = openerp.web.Widget.extend({
init: function(element_id) {
var self = this;
this._super(null, element_id);
QWeb.add_template("xml/web_mobile.xml");
var params = {};
this.$element.html(QWeb.render("WebClient", {}));
- this.session = new openerp.base.Session("oe_errors");
- this.crashmanager = new openerp.base.CrashManager(this);
+ this.session = new openerp.web.Session("oe_errors");
+ this.crashmanager = new openerp.web.CrashManager(this);
this.login = new openerp.web_mobile.Login(this, "oe_app");
// this.session.on_session_invalid.add(this.login.do_ask_login);
},
@@ -29,14 +29,14 @@ openerp.web_mobile.MobileWebClient = openerp.base.Widget.extend({
}
});
-openerp.web_mobile.Login = openerp.base.Widget.extend({
+openerp.web_mobile.Login = openerp.web.Widget.extend({
init: function(session, element_id) {
this._super(session, element_id);
},
start: function() {
var self = this;
jQuery("#oe_header").children().remove();
- this.rpc("/base/database/get_list", {}, function(result) {
+ this.rpc("/web/database/get_list", {}, function(result) {
var selection = new openerp.web_mobile.Selection();
self.db_list = result.db_list;
self.$element.html(QWeb.render("Login", self));
@@ -87,7 +87,7 @@ openerp.web_mobile.Login = openerp.base.Widget.extend({
}
});
-openerp.web_mobile.HomePage = openerp.base.Widget.extend({
+openerp.web_mobile.HomePage = openerp.web.Widget.extend({
init: function(session, element_id) {
this._super(session, element_id);
},
@@ -106,7 +106,7 @@ openerp.web_mobile.HomePage = openerp.base.Widget.extend({
}
});
-openerp.web_mobile.Header = openerp.base.Widget.extend({
+openerp.web_mobile.Header = openerp.web.Widget.extend({
init: function(session, element_id) {
this._super(session, element_id);
},
@@ -125,13 +125,13 @@ openerp.web_mobile.Header = openerp.base.Widget.extend({
}
});
-openerp.web_mobile.Shortcuts = openerp.base.Widget.extend({
+openerp.web_mobile.Shortcuts = openerp.web.Widget.extend({
init: function(session, element_id) {
this._super(session, element_id);
},
start: function() {
var self = this;
- this.rpc('/base/session/sc_list',{} ,function(res){
+ this.rpc('/web/session/sc_list',{} ,function(res){
self.$element.html(QWeb.render("Shortcuts", {'sc' : res}))
self.$element.find("a").click(self.on_clicked);
})
@@ -146,7 +146,7 @@ openerp.web_mobile.Shortcuts = openerp.base.Widget.extend({
}
});
-openerp.web_mobile.Menu = openerp.base.Widget.extend({
+openerp.web_mobile.Menu = openerp.web.Widget.extend({
init: function(session, element_id, secondary_menu_id) {
this._super(session, element_id);
this.secondary_menu_id = secondary_menu_id;
@@ -154,7 +154,7 @@ openerp.web_mobile.Menu = openerp.base.Widget.extend({
this.menu = false;
},
start: function() {
- this.rpc("/base/menu/load", {}, this.on_loaded);
+ this.rpc("/web/menu/load", {}, this.on_loaded);
},
on_loaded: function(data) {
this.data = data;
@@ -179,7 +179,7 @@ openerp.web_mobile.Menu = openerp.base.Widget.extend({
}
});
-openerp.web_mobile.Secondary = openerp.base.Widget.extend({
+openerp.web_mobile.Secondary = openerp.web.Widget.extend({
init: function(session, element_id, secondary_menu_id) {
this._super(session, element_id);
this.data = secondary_menu_id;
@@ -216,7 +216,7 @@ openerp.web_mobile.Secondary = openerp.base.Widget.extend({
}
});
-openerp.web_mobile.Options = openerp.base.Widget.extend({
+openerp.web_mobile.Options = openerp.web.Widget.extend({
init: function(session, element_id) {
this._super(session, element_id);
},
@@ -232,7 +232,7 @@ openerp.web_mobile.Options = openerp.base.Widget.extend({
}
});
-openerp.web_mobile.Selection = openerp.base.Widget.extend({
+openerp.web_mobile.Selection = openerp.web.Widget.extend({
init: function (){
this._super();
},
diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index 4a3e2167c02..bfcf3a0c291 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -4,7 +4,7 @@
openerp.web_mobile.form_mobile = function (openerp) {
-openerp.web_mobile.FormView = openerp.base.Widget.extend({
+openerp.web_mobile.FormView = openerp.web.Widget.extend({
init: function(session, element_id, list_id, action) {
this._super(session, element_id);
this.list_id = list_id;
@@ -21,14 +21,14 @@ openerp.web_mobile.FormView = openerp.base.Widget.extend({
id = this.list_id;
model = this.action.res_model;
view_id = this.action.views[1][0];
- this.dataset = new openerp.base.DataSetSearch(this, this.action.res_model, null, null);
+ this.dataset = new openerp.web.DataSetSearch(this, this.action.res_model, null, null);
this.dataset.read_slice([],{}, function (result) {
for (var i = 0; i < result.length; i++) {
if (result[i].id == id) {
var data = result[i];
}
}
- self.rpc("/base/formview/load", {"model": model, "view_id": view_id }, function (result) {
+ self.rpc("/web/formview/load", {"model": model, "view_id": view_id }, function (result) {
var fields = result.fields_view.fields;
var view_fields = result.fields_view.arch.children;
var get_fields = self.get_fields(view_fields);
diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index b4ba5e08cc3..d168076729c 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -4,13 +4,13 @@
openerp.web_mobile.list_mobile = function (openerp) {
-openerp.web_mobile.ListView = openerp.base.Widget.extend({
+openerp.web_mobile.ListView = openerp.web.Widget.extend({
init: function(session, element_id, list_id) {
this._super(session, element_id);
this.list_id = list_id;
},
start: function() {
- this.rpc('/base/menu/action', {'menu_id': this.list_id},
+ this.rpc('/web/menu/action', {'menu_id': this.list_id},
this.on_menu_action_loaded);
},
on_menu_action_loaded: function(data) {
@@ -41,7 +41,7 @@ openerp.web_mobile.ListView = openerp.base.Widget.extend({
}
var self = this;
- var dataset = new openerp.base.DataSetStatic(this, this.action.res_model, this.action.context);
+ var dataset = new openerp.web.DataSetStatic(this, this.action.res_model, this.action.context);
dataset.domain=[['name','ilike',search_val]];
dataset.name_search(search_val, dataset.domain, 'ilike',false ,function(result){
self.$element.html(QWeb.render("ListView", {'records' : result}));
diff --git a/addons/web_rpc/__openerp__.py b/addons/web_rpc/__openerp__.py
index c1c744da43b..f0cc1dbdaa8 100644
--- a/addons/web_rpc/__openerp__.py
+++ b/addons/web_rpc/__openerp__.py
@@ -1,20 +1,20 @@
{
- "name" : "OpenERP Web base",
+ "name" : "OpenERP Web web",
"version" : "2.0",
"depends" : [],
'active': False,
'js' : [
- "../base/static/lib/datejs/date-en-US.js",
- "../base/static/lib/jquery/jquery-1.6.2.js",
- "../base/static/lib/json/json2.js",
- "../base/static/lib/qweb/qweb2.js",
- "../base/static/lib/underscore/underscore.js",
- "../base/static/lib/underscore/underscore.string.js",
- "../base/static/src/js/boot.js",
- "../base/static/src/js/core.js",
- "../base/static/src/js/formats.js",
- "../base/static/src/js/chrome.js",
- "../base/static/src/js/data.js",
+ "../web/static/lib/datejs/date-en-US.js",
+ "../web/static/lib/jquery/jquery-1.6.2.js",
+ "../web/static/lib/json/json2.js",
+ "../web/static/lib/qweb/qweb2.js",
+ "../web/static/lib/underscore/underscore.js",
+ "../web/static/lib/underscore/underscore.string.js",
+ "../web/static/src/js/boot.js",
+ "../web/static/src/js/core.js",
+ "../web/static/src/js/formats.js",
+ "../web/static/src/js/chrome.js",
+ "../web/static/src/js/data.js",
],
'css' : [
],
diff --git a/openerp-web.py b/openerp-web.py
index ee72c86eaa5..29a958b7834 100755
--- a/openerp-web.py
+++ b/openerp-web.py
@@ -32,13 +32,13 @@ optparser.add_option('--reloader', dest='reloader',
default=False, action='store_true',
help="Reload application when python files change")
-import base.common.dispatch
+import web.common.dispatch
if __name__ == "__main__":
(options, args) = optparser.parse_args(sys.argv[1:])
os.environ["TZ"] = "UTC"
- app = base.common.dispatch.Root(options)
+ app = web.common.dispatch.Root(options)
werkzeug.serving.run_simple(
'0.0.0.0', options.socket_port, app,
| |