From 6acc5a157dc287adde7d31978e2ecc163a3ef9ef Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Tue, 15 Nov 2011 17:38:43 +0100 Subject: [PATCH 001/364] [IMP] Moved the tests directory inside the openerp module, added --run-tests command-line argument. bzr revid: vmt@openerp.com-20111115163843-djq6hybp24lk9f5e --- openerp-server | 14 +++++++++++ openerp/addons/base/test/test_ir_cron.py | 12 +++++----- openerp/tests/__init__.py | 17 +++++++++++++ .../tests}/addons/test_exceptions/__init__.py | 0 .../addons/test_exceptions/__openerp__.py | 0 .../tests}/addons/test_exceptions/models.py | 0 .../tests}/addons/test_exceptions/view.xml | 0 {tests => openerp/tests}/common.py | 24 ++++++++++--------- {tests => openerp/tests}/test_ir_sequence.py | 4 +++- {tests => openerp/tests}/test_orm.py | 8 +++---- {tests => openerp/tests}/test_xmlrpc.py | 5 +++- openerp/tools/config.py | 5 ++++ tests/__init__.py | 2 -- 13 files changed, 66 insertions(+), 25 deletions(-) create mode 100644 openerp/tests/__init__.py rename {tests => openerp/tests}/addons/test_exceptions/__init__.py (100%) rename {tests => openerp/tests}/addons/test_exceptions/__openerp__.py (100%) rename {tests => openerp/tests}/addons/test_exceptions/models.py (100%) rename {tests => openerp/tests}/addons/test_exceptions/view.xml (100%) rename {tests => openerp/tests}/common.py (84%) rename {tests => openerp/tests}/test_ir_sequence.py (99%) rename {tests => openerp/tests}/test_orm.py (97%) rename {tests => openerp/tests}/test_xmlrpc.py (96%) delete mode 100644 tests/__init__.py diff --git a/openerp-server b/openerp-server index 71a52d5f06b..c108d9f9372 100755 --- a/openerp-server +++ b/openerp-server @@ -221,6 +221,20 @@ if __name__ == "__main__": setup_signal_handlers() + if config["run_tests_no_db"]: + import unittest2 + import openerp.tests + # This test suite creates a database. + unittest2.TextTestRunner(verbosity=2).run(openerp.tests.make_suite_no_db()) + sys.exit(0) + + if config["run_tests"]: + import unittest2 + import openerp.tests + # This test suite assumes a database. + unittest2.TextTestRunner(verbosity=2).run(openerp.tests.make_suite()) + sys.exit(0) + if config["test_file"]: run_test_file(config['db_name'], config['test_file']) sys.exit(0) diff --git a/openerp/addons/base/test/test_ir_cron.py b/openerp/addons/base/test/test_ir_cron.py index 6ef79ac3a78..2154c014f8c 100644 --- a/openerp/addons/base/test/test_ir_cron.py +++ b/openerp/addons/base/test/test_ir_cron.py @@ -40,7 +40,7 @@ JOB = { 'model': u'ir.cron' } -class test_ir_cron(openerp.osv.osv.osv): +class x_test_ir_cron(openerp.osv.osv.osv): """ Add a few handy methods to test cron jobs scheduling. """ _inherit = "ir.cron" @@ -57,7 +57,7 @@ class test_ir_cron(openerp.osv.osv.osv): time.sleep(80) print ">>> out _80_seconds" - def test_0(self, cr, uid): + def x_test_0(self, cr, uid): now = datetime.now() t1 = (now + relativedelta(minutes=1)).strftime('%Y-%m-%d %H:%M:%S') t2 = (now + relativedelta(minutes=1, seconds=5)).strftime('%Y-%m-%d %H:%M:%S') @@ -66,17 +66,17 @@ class test_ir_cron(openerp.osv.osv.osv): self.create(cr, uid, dict(JOB, name='test_0 _20_seconds B', function='_20_seconds', nextcall=t2)) self.create(cr, uid, dict(JOB, name='test_0 _20_seconds C', function='_20_seconds', nextcall=t3)) - def test_1(self, cr, uid): + def x_test_1(self, cr, uid): now = datetime.now() t1 = (now + relativedelta(minutes=1)).strftime('%Y-%m-%d %H:%M:%S') self.create(cr, uid, dict(JOB, name='test_1 _20_seconds * 3', function='_20_seconds', nextcall=t1, numbercall=3)) - def test_2(self, cr, uid): + def x_test_2(self, cr, uid): now = datetime.now() t1 = (now + relativedelta(minutes=1)).strftime('%Y-%m-%d %H:%M:%S') self.create(cr, uid, dict(JOB, name='test_2 _80_seconds * 2', function='_80_seconds', nextcall=t1, numbercall=2)) - def test_3(self, cr, uid): + def x_test_3(self, cr, uid): now = datetime.now() t1 = (now + relativedelta(minutes=1)).strftime('%Y-%m-%d %H:%M:%S') t2 = (now + relativedelta(minutes=1, seconds=5)).strftime('%Y-%m-%d %H:%M:%S') @@ -86,7 +86,7 @@ class test_ir_cron(openerp.osv.osv.osv): self.create(cr, uid, dict(JOB, name='test_3 _20_seconds C', function='_20_seconds', nextcall=t3)) # This test assumes 4 cron threads. - def test_00(self, cr, uid): + def x_test_00(self, cr, uid): self.test_00_set = set() now = datetime.now() t1 = (now + relativedelta(minutes=1)).strftime('%Y-%m-%d %H:%M:%S') diff --git a/openerp/tests/__init__.py b/openerp/tests/__init__.py new file mode 100644 index 00000000000..306edcd68ce --- /dev/null +++ b/openerp/tests/__init__.py @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +import unittest2 + +import test_orm +import test_ir_sequence +import test_xmlrpc + +def make_suite(): + suite = unittest2.TestSuite() + suite.addTests(unittest2.TestLoader().loadTestsFromModule(test_ir_sequence)) + suite.addTests(unittest2.TestLoader().loadTestsFromModule(test_orm)) + return suite + +def make_suite_no_db(): + suite = unittest2.TestSuite() + suite.addTests(unittest2.TestLoader().loadTestsFromModule(test_xmlrpc)) + return suite diff --git a/tests/addons/test_exceptions/__init__.py b/openerp/tests/addons/test_exceptions/__init__.py similarity index 100% rename from tests/addons/test_exceptions/__init__.py rename to openerp/tests/addons/test_exceptions/__init__.py diff --git a/tests/addons/test_exceptions/__openerp__.py b/openerp/tests/addons/test_exceptions/__openerp__.py similarity index 100% rename from tests/addons/test_exceptions/__openerp__.py rename to openerp/tests/addons/test_exceptions/__openerp__.py diff --git a/tests/addons/test_exceptions/models.py b/openerp/tests/addons/test_exceptions/models.py similarity index 100% rename from tests/addons/test_exceptions/models.py rename to openerp/tests/addons/test_exceptions/models.py diff --git a/tests/addons/test_exceptions/view.xml b/openerp/tests/addons/test_exceptions/view.xml similarity index 100% rename from tests/addons/test_exceptions/view.xml rename to openerp/tests/addons/test_exceptions/view.xml diff --git a/tests/common.py b/openerp/tests/common.py similarity index 84% rename from tests/common.py rename to openerp/tests/common.py index 116898dc7ef..618eafb21f7 100644 --- a/tests/common.py +++ b/openerp/tests/common.py @@ -6,9 +6,10 @@ import xmlrpclib import openerp -ADDONS_PATH = os.environ['OPENERP_ADDONS_PATH'] -PORT = int(os.environ['OPENERP_PORT']) -DB = os.environ['OPENERP_DATABASE'] +# The openerp library is supposed already configured. +ADDONS_PATH = openerp.tools.config['addons_path'] +PORT = openerp.tools.config['xmlrpc_port'] +DB = openerp.tools.config['db_name'] HOST = '127.0.0.1' @@ -25,15 +26,19 @@ db_proxy_61 = None model_proxy_61 = None model_uri_61 = None -def setUpModule(): +def start_openerp(): """ - Start the OpenERP server similary to the openerp-server script and - setup some xmlrpclib proxies. + Start the OpenERP server similary to the openerp-server script. """ - openerp.tools.config['addons_path'] = ADDONS_PATH - openerp.tools.config['xmlrpc_port'] = PORT openerp.service.start_services() + # Ugly way to ensure the server is listening. + time.sleep(2) + +def create_xmlrpc_proxies(): + """ + setup some xmlrpclib proxies. + """ global common_proxy_60 global db_proxy_60 global object_proxy_60 @@ -55,9 +60,6 @@ def setUpModule(): db_proxy_61 = xmlrpclib.ServerProxy(model_uri_61 + 'db') model_proxy_61 = xmlrpclib.ServerProxy(model_uri_61 + 'model/' + DB) - # Ugly way to ensure the server is listening. - time.sleep(2) - def tearDownModule(): """ Shutdown the OpenERP server similarly to a single ctrl-c. """ openerp.service.stop_services() diff --git a/tests/test_ir_sequence.py b/openerp/tests/test_ir_sequence.py similarity index 99% rename from tests/test_ir_sequence.py rename to openerp/tests/test_ir_sequence.py index 8a4731d524f..3bf84cf3404 100644 --- a/tests/test_ir_sequence.py +++ b/openerp/tests/test_ir_sequence.py @@ -19,7 +19,9 @@ import common DB = common.DB ADMIN_USER_ID = common.ADMIN_USER_ID -setUpModule = common.setUpModule +def setUpModule(): + common.create_xmlrpc_proxies() + tearDownModule = common.tearDownModule def registry(model): diff --git a/tests/test_orm.py b/openerp/tests/test_orm.py similarity index 97% rename from tests/test_orm.py rename to openerp/tests/test_orm.py index 61b574df5eb..79ac421b7ac 100644 --- a/tests/test_orm.py +++ b/openerp/tests/test_orm.py @@ -1,9 +1,10 @@ import os import unittest2 + import openerp UID = 1 -DB = os.environ['OPENERP_DATABASE'] +DB = openerp.tools.config['db_name'] CREATE = lambda values: (0, False, values) UPDATE = lambda id, values: (1, id, values) @@ -13,14 +14,13 @@ LINK_TO = lambda id: (4, id, False) DELETE_ALL = lambda: (5, False, False) REPLACE_WITH = lambda ids: (6, False, ids) -def setUpModule(): - openerp.tools.config['addons_path'] = os.environ['OPENERP_ADDONS_PATH'] - class TestO2MSerialization(unittest2.TestCase): + def setUp(self): self.cr = openerp.modules.registry.RegistryManager.get(DB).db.cursor() self.partner = openerp.modules.registry.RegistryManager.get(DB)['res.partner'] self.address = openerp.modules.registry.RegistryManager.get(DB)['res.partner.address'] + def tearDown(self): self.cr.rollback() self.cr.close() diff --git a/tests/test_xmlrpc.py b/openerp/tests/test_xmlrpc.py similarity index 96% rename from tests/test_xmlrpc.py rename to openerp/tests/test_xmlrpc.py index 4ad530cbeda..a08987cdd85 100644 --- a/tests/test_xmlrpc.py +++ b/openerp/tests/test_xmlrpc.py @@ -19,7 +19,10 @@ ADMIN_USER = common.ADMIN_USER ADMIN_USER_ID = common.ADMIN_USER_ID ADMIN_PASSWORD = common.ADMIN_PASSWORD -setUpModule = common.setUpModule +def setUpModule(): + common.start_openerp() + common.create_xmlrpc_proxies() + tearDownModule = common.tearDownModule class test_xmlrpc(unittest2.TestCase): diff --git a/openerp/tools/config.py b/openerp/tools/config.py index f1c3931e81f..2b27844ceed 100644 --- a/openerp/tools/config.py +++ b/openerp/tools/config.py @@ -266,6 +266,10 @@ class configmanager(object): type="int") group.add_option("--unaccent", dest="unaccent", my_default=False, action="store_true", help="Use the unaccent function provided by the database when available.") + group.add_option("--run-tests", dest="run_tests", my_default=False, action="store_true", + help="Run a test suite.") + group.add_option("--run-tests-no-db", dest="run_tests_no_db", my_default=False, action="store_true", + help="Run a test suite (which does'nt assume an existing database).") parser.add_option_group(group) @@ -370,6 +374,7 @@ class configmanager(object): 'list_db', 'xmlrpcs', 'test_file', 'test_disable', 'test_commit', 'test_report_directory', 'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads', 'unaccent', + 'run_tests', 'run_tests_no_db', ] for arg in keys: diff --git a/tests/__init__.py b/tests/__init__.py deleted file mode 100644 index 396284efaf7..00000000000 --- a/tests/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -# -*- coding: utf-8 -*- -import test_xmlrpc From 9e225c7c1e599624d419cd87f1705ad9a8dcb162 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Wed, 16 Nov 2011 13:11:42 +0100 Subject: [PATCH 002/364] [IMP] check the -d option is also provided when using --run-tests. bzr revid: vmt@openerp.com-20111116121142-bxahffcr7diseoiy --- openerp/tools/config.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openerp/tools/config.py b/openerp/tools/config.py index 2b27844ceed..7d496d524b1 100644 --- a/openerp/tools/config.py +++ b/openerp/tools/config.py @@ -267,9 +267,9 @@ class configmanager(object): group.add_option("--unaccent", dest="unaccent", my_default=False, action="store_true", help="Use the unaccent function provided by the database when available.") group.add_option("--run-tests", dest="run_tests", my_default=False, action="store_true", - help="Run a test suite.") + help="Run a test suite. This creates a database (possibly created with --run-tests-no-db).") group.add_option("--run-tests-no-db", dest="run_tests_no_db", my_default=False, action="store_true", - help="Run a test suite (which does'nt assume an existing database).") + help="Run a test suite (which doesn't assume an existing database).") parser.add_option_group(group) @@ -327,6 +327,10 @@ class configmanager(object): "The config file '%s' selected with -c/--config doesn't exist, "\ "use -s/--save if you want to generate it"%(opt.config)) + die((opt.run_tests or opt.run_tests_no_db) and not opt.db_name, + "The --run-tests and --run-tests-no-db need a database name "\ + "(using the --database or -d options).") + # place/search the config file on Win32 near the server installation # (../etc from the server) # if the server is run by an unprivileged user, he has to specify location of a config file where he has the rights to write, From 330316672ff5490602a1eb4e7743514355c306e4 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Thu, 17 Nov 2011 11:06:08 +0100 Subject: [PATCH 003/364] [IMP] Clearer use of update_module arg. - update_module was defined as config[init] or config[update] - this means it is a mutable dictionary - the code testing update_module is actually mutating config[init] and config[update]... - now update_module is really a True or False value. bzr revid: vmt@openerp.com-20111117100608-0n8o99slgk42kiiv --- openerp-server | 6 ++++-- openerp/modules/loading.py | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/openerp-server b/openerp-server index c108d9f9372..e47a8ea29cf 100755 --- a/openerp-server +++ b/openerp-server @@ -89,7 +89,8 @@ def setup_pid_file(): def preload_registry(dbname): """ Preload a registry, and start the cron.""" try: - db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False) + update_module = True if config['init'] or config['update'] else False + db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=update_module, pooljobs=False) # jobs will start to be processed later, when openerp.cron.start_master_thread() is called by openerp.service.start_services() registry.schedule_cron_jobs() @@ -99,7 +100,8 @@ def preload_registry(dbname): def run_test_file(dbname, test_file): """ Preload a registry, possibly run a test file, and start the cron.""" try: - db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False) + update_module = True if config['init'] or config['update'] else False + db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=update_module, pooljobs=False) cr = db.cursor() logger = logging.getLogger('server') logger.info('loading test file %s', test_file) diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py index 00948bc690e..6a2e653fd57 100644 --- a/openerp/modules/loading.py +++ b/openerp/modules/loading.py @@ -276,6 +276,7 @@ def load_modules(db, force_demo=False, status=None, update_module=False): tools.config['update']['all'] = 1 if not tools.config['without_demo']: tools.config["demo"]['all'] = 1 + update_module = True # This is a brand new pool, just created in pooler.get_db_and_pool() pool = pooler.get_pool(cr.dbname) @@ -293,7 +294,7 @@ def load_modules(db, force_demo=False, status=None, update_module=False): # processed_modules: for cleanup step after install # loaded_modules: to avoid double loading - loaded_modules, processed_modules = load_module_graph(cr, graph, status, perform_checks=(not update_module), report=report) + loaded_modules, processed_modules = load_module_graph(cr, graph, status, report=report) if tools.config['load_language']: for lang in tools.config['load_language'].split(','): From 99f99b6d8317ddeb53339b24934d722c97d1dc61 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Thu, 17 Nov 2011 15:46:28 +0100 Subject: [PATCH 004/364] [REF] openerp.modules.loading: preparing to support the -i=all option: getting almost rid of the mess with tools.config[init|update]. bzr revid: vmt@openerp.com-20111117144628-pjpac87b5whg5cl0 --- openerp/modules/graph.py | 10 ------- openerp/modules/loading.py | 53 ++++++++++++++++++-------------------- 2 files changed, 25 insertions(+), 38 deletions(-) diff --git a/openerp/modules/graph.py b/openerp/modules/graph.py index 7b302e99f4c..62b706ad846 100644 --- a/openerp/modules/graph.py +++ b/openerp/modules/graph.py @@ -122,9 +122,6 @@ class Graph(dict): current.remove(package) node = self.add_node(package, info) node.data = info - for kind in ('init', 'demo', 'update'): - if package in tools.config[kind] or 'all' in tools.config[kind] or kind in force: - setattr(node, kind, True) else: later.add(package) packages.append((package, info)) @@ -186,18 +183,11 @@ class Node(Singleton): node.depth = self.depth + 1 if node not in self.children: self.children.append(node) - for attr in ('init', 'update', 'demo'): - if hasattr(self, attr): - setattr(node, attr, True) self.children.sort(lambda x, y: cmp(x.name, y.name)) return node def __setattr__(self, name, value): super(Singleton, self).__setattr__(name, value) - if name in ('init', 'update', 'demo'): - tools.config[name][self.name] = 1 - for child in self.children: - setattr(child, name, value) if name == 'depth': for child in self.children: setattr(child, name, value + 1) diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py index 6a2e653fd57..551947cf4a4 100644 --- a/openerp/modules/loading.py +++ b/openerp/modules/loading.py @@ -164,7 +164,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules= register_module_classes(package.name) models = pool.load(cr, package) loaded_modules.append(package.name) - if hasattr(package, 'init') or hasattr(package, 'update') or package.state in ('to install', 'to upgrade'): + if package.state in ('to install', 'to upgrade'): init_module_models(cr, package.name, models) status['progress'] = float(index) / len(graph) @@ -178,18 +178,19 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules= idref = {} - mode = 'update' - if hasattr(package, 'init') or package.state == 'to install': + if package.state == 'to install': mode = 'init' + else: + mode = 'update' - if hasattr(package, 'init') or hasattr(package, 'update') or package.state in ('to install', 'to upgrade'): + if package.state in ('to install', 'to upgrade'): if package.state=='to upgrade': # upgrading the module information modobj.write(cr, 1, [module_id], modobj.get_values_from_terp(package.data)) load_init_xml(module_name, idref, mode) load_update_xml(module_name, idref, mode) load_data(module_name, idref, mode) - if hasattr(package, 'demo') or (package.dbdemo and package.state != 'installed'): + if package.dbdemo and package.state != 'installed': status['progress'] = (index + 0.75) / len(graph) load_demo_xml(module_name, idref, mode) load_demo(module_name, idref, mode) @@ -212,9 +213,6 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules= modobj.update_translations(cr, 1, [module_id], None) package.state = 'installed' - for kind in ('init', 'demo', 'update'): - if hasattr(package, kind): - delattr(package, kind) cr.commit() @@ -272,10 +270,6 @@ def load_modules(db, force_demo=False, status=None, update_module=False): if not openerp.modules.db.is_initialized(cr): logger.notifyChannel("init", netsvc.LOG_INFO, "init db") openerp.modules.db.initialize(cr) - tools.config["init"]["all"] = 1 - tools.config['update']['all'] = 1 - if not tools.config['without_demo']: - tools.config["demo"]['all'] = 1 update_module = True # This is a brand new pool, just created in pooler.get_db_and_pool() @@ -294,6 +288,7 @@ def load_modules(db, force_demo=False, status=None, update_module=False): # processed_modules: for cleanup step after install # loaded_modules: to avoid double loading + # After load_module_graph(), 'base' has been installed or updated and its state is 'installed'. loaded_modules, processed_modules = load_module_graph(cr, graph, status, report=report) if tools.config['load_language']: @@ -301,28 +296,33 @@ def load_modules(db, force_demo=False, status=None, update_module=False): tools.load_language(cr, lang) # STEP 2: Mark other modules to be loaded/updated + # This is a one-shot use of tools.config[init|update] from the command line + # arguments. It is directly cleared to not interfer with later create/update + # issued via RPC. if update_module: modobj = pool.get('ir.module.module') - if ('base' in tools.config['init']) or ('base' in tools.config['update']): + if ('base' in tools.config['init']) or ('base' in tools.config['update']) \ + or ('all' in tools.config['init']) or ('all' in tools.config['update']): logger.notifyChannel('init', netsvc.LOG_INFO, 'updating modules list') modobj.update_list(cr, 1) + if 'all' in tools.config['init']: + pass + _check_module_names(cr, itertools.chain(tools.config['init'].keys(), tools.config['update'].keys())) - mods = [k for k in tools.config['init'] if tools.config['init'][k]] - if mods: - ids = modobj.search(cr, 1, ['&', ('state', '=', 'uninstalled'), ('name', 'in', mods)]) - if ids: - modobj.button_install(cr, 1, ids) + mods = [k for k in tools.config['init'] if tools.config['init'][k] and k not in ('base', 'all')] + ids = modobj.search(cr, 1, ['&', ('state', '=', 'uninstalled'), ('name', 'in', mods)]) + if ids: + modobj.button_install(cr, 1, ids) # goes from 'uninstalled' to 'to install' - mods = [k for k in tools.config['update'] if tools.config['update'][k]] - if mods: - ids = modobj.search(cr, 1, ['&', ('state', '=', 'installed'), ('name', 'in', mods)]) - if ids: - modobj.button_upgrade(cr, 1, ids) - - cr.execute("update ir_module_module set state=%s where name=%s", ('installed', 'base')) + mods = [k for k in tools.config['update'] if tools.config['update'][k] and k not in ('base', 'all')] + ids = modobj.search(cr, 1, ['&', ('state', '=', 'installed'), ('name', 'in', mods)]) + if ids: + modobj.button_upgrade(cr, 1, ids) # goes from 'installed' to 'to upgrade' + for kind in ('init', 'demo', 'update'): + tools.config[kind] = {} # STEP 3: Load marked modules (skipping base which was done in STEP 1) # IMPORTANT: this is done in two parts, first loading all installed or @@ -372,9 +372,6 @@ def load_modules(db, force_demo=False, status=None, update_module=False): if report.get_report(): logger.notifyChannel('init', netsvc.LOG_INFO, report) - for kind in ('init', 'demo', 'update'): - tools.config[kind] = {} - cr.commit() if update_module: # Remove records referenced from ir_model_data for modules to be From b6b25ea70639bfe2eb5c1249e7b1d40216ab545b Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Thu, 17 Nov 2011 16:07:20 +0100 Subject: [PATCH 005/364] [IMP] openerp.modules.loading: -i all seems to work as documented in --help. bzr revid: vmt@openerp.com-20111117150720-uaer043c2k55937n --- openerp/modules/loading.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py index 551947cf4a4..d0b18632e31 100644 --- a/openerp/modules/loading.py +++ b/openerp/modules/loading.py @@ -307,7 +307,8 @@ def load_modules(db, force_demo=False, status=None, update_module=False): modobj.update_list(cr, 1) if 'all' in tools.config['init']: - pass + ids = modobj.search(cr, 1, []) + tools.config['init'] = dict.fromkeys([m['name'] for m in modobj.read(cr, 1, ids, ['name'])], 1) _check_module_names(cr, itertools.chain(tools.config['init'].keys(), tools.config['update'].keys())) From e9c405c244249e536f0a97c5b6b9d9b4d7215e06 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Thu, 17 Nov 2011 17:28:24 +0100 Subject: [PATCH 006/364] [FIX] openerp.modules.loading: previous change disabled demo data altogether, this should be now fixed by making sure that --withou-demo flag (or its absence) is taken care of, and setting the base module demo field. Normally the demo state of a module should have a ripple effect on all modules depending on it. This might prove not enough in this case and require some more testing. bzr revid: vmt@openerp.com-20111117162824-yqswv6yk7bmiyj4s --- openerp-server | 6 ++++-- openerp/modules/graph.py | 14 +++++++++----- openerp/modules/loading.py | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/openerp-server b/openerp-server index e47a8ea29cf..c985579ef15 100755 --- a/openerp-server +++ b/openerp-server @@ -90,7 +90,8 @@ def preload_registry(dbname): """ Preload a registry, and start the cron.""" try: update_module = True if config['init'] or config['update'] else False - db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=update_module, pooljobs=False) + db, registry = openerp.pooler.get_db_and_pool( + dbname, update_module=update_module, pooljobs=False, force_demo=not config['without_demo']) # jobs will start to be processed later, when openerp.cron.start_master_thread() is called by openerp.service.start_services() registry.schedule_cron_jobs() @@ -101,7 +102,8 @@ def run_test_file(dbname, test_file): """ Preload a registry, possibly run a test file, and start the cron.""" try: update_module = True if config['init'] or config['update'] else False - db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=update_module, pooljobs=False) + db, registry = openerp.pooler.get_db_and_pool( + dbname, update_module=update_module, pooljobs=False, force_demo=not config['without_demo']) cr = db.cursor() logger = logging.getLogger('server') logger.info('loading test file %s', test_file) diff --git a/openerp/modules/graph.py b/openerp/modules/graph.py index 62b706ad846..5c6e5899ce4 100644 --- a/openerp/modules/graph.py +++ b/openerp/modules/graph.py @@ -88,15 +88,19 @@ class Graph(dict): for k, v in additional_data[package.name].items(): setattr(package, k, v) - def add_module(self, cr, module, force=None): - self.add_modules(cr, [module], force) + def add_module(self, cr, module, force_demo=False): + self.add_modules(cr, [module], force_demo) - def add_modules(self, cr, module_list, force=None): - if force is None: - force = [] + def add_modules(self, cr, module_list, force_demo=False): packages = [] len_graph = len(self) for module in module_list: + if force_demo: + cr.execute(""" + UPDATE ir_module_module + SET demo='t' + WHERE name = %s""", + (module,)) # This will raise an exception if no/unreadable descriptor file. # NOTE The call to load_information_from_description_file is already # done by db.initialize, so it is possible to not do it again here. diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py index d0b18632e31..066b78f5e3f 100644 --- a/openerp/modules/loading.py +++ b/openerp/modules/loading.py @@ -281,7 +281,7 @@ def load_modules(db, force_demo=False, status=None, update_module=False): # STEP 1: LOAD BASE (must be done before module dependencies can be computed for later steps) graph = openerp.modules.graph.Graph() - graph.add_module(cr, 'base', force) + graph.add_module(cr, 'base', force_demo) if not graph: logger.notifyChannel('init', netsvc.LOG_CRITICAL, 'module base cannot be loaded! (hint: verify addons-path)') raise osv.osv.except_osv(_('Could not load base module'), _('module base cannot be loaded! (hint: verify addons-path)')) From 9212a7f81a4cc1fe74e81cdd4d58523119460a03 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Thu, 1 Dec 2011 13:18:56 +0100 Subject: [PATCH 007/364] [FIX] test_ir_cron: the names of the class and methods were changed by mistake. bzr revid: vmt@openerp.com-20111201121856-knw7ewbpj083zf12 --- openerp/addons/base/test/test_ir_cron.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/openerp/addons/base/test/test_ir_cron.py b/openerp/addons/base/test/test_ir_cron.py index 2154c014f8c..6ef79ac3a78 100644 --- a/openerp/addons/base/test/test_ir_cron.py +++ b/openerp/addons/base/test/test_ir_cron.py @@ -40,7 +40,7 @@ JOB = { 'model': u'ir.cron' } -class x_test_ir_cron(openerp.osv.osv.osv): +class test_ir_cron(openerp.osv.osv.osv): """ Add a few handy methods to test cron jobs scheduling. """ _inherit = "ir.cron" @@ -57,7 +57,7 @@ class x_test_ir_cron(openerp.osv.osv.osv): time.sleep(80) print ">>> out _80_seconds" - def x_test_0(self, cr, uid): + def test_0(self, cr, uid): now = datetime.now() t1 = (now + relativedelta(minutes=1)).strftime('%Y-%m-%d %H:%M:%S') t2 = (now + relativedelta(minutes=1, seconds=5)).strftime('%Y-%m-%d %H:%M:%S') @@ -66,17 +66,17 @@ class x_test_ir_cron(openerp.osv.osv.osv): self.create(cr, uid, dict(JOB, name='test_0 _20_seconds B', function='_20_seconds', nextcall=t2)) self.create(cr, uid, dict(JOB, name='test_0 _20_seconds C', function='_20_seconds', nextcall=t3)) - def x_test_1(self, cr, uid): + def test_1(self, cr, uid): now = datetime.now() t1 = (now + relativedelta(minutes=1)).strftime('%Y-%m-%d %H:%M:%S') self.create(cr, uid, dict(JOB, name='test_1 _20_seconds * 3', function='_20_seconds', nextcall=t1, numbercall=3)) - def x_test_2(self, cr, uid): + def test_2(self, cr, uid): now = datetime.now() t1 = (now + relativedelta(minutes=1)).strftime('%Y-%m-%d %H:%M:%S') self.create(cr, uid, dict(JOB, name='test_2 _80_seconds * 2', function='_80_seconds', nextcall=t1, numbercall=2)) - def x_test_3(self, cr, uid): + def test_3(self, cr, uid): now = datetime.now() t1 = (now + relativedelta(minutes=1)).strftime('%Y-%m-%d %H:%M:%S') t2 = (now + relativedelta(minutes=1, seconds=5)).strftime('%Y-%m-%d %H:%M:%S') @@ -86,7 +86,7 @@ class x_test_ir_cron(openerp.osv.osv.osv): self.create(cr, uid, dict(JOB, name='test_3 _20_seconds C', function='_20_seconds', nextcall=t3)) # This test assumes 4 cron threads. - def x_test_00(self, cr, uid): + def test_00(self, cr, uid): self.test_00_set = set() now = datetime.now() t1 = (now + relativedelta(minutes=1)).strftime('%Y-%m-%d %H:%M:%S') From 6f4abdfbd519e8f8a416e24fdb541a88ef3104c6 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 6 Aug 2012 11:46:27 +0200 Subject: [PATCH 008/364] [IMP] move eval functions for domains, groupbys and contexts outside of corelib, as well as the standard evaluation context building (and related objects) bzr revid: xmo@openerp.com-20120806094627-8c9lwtfkbfws2bmj --- addons/web/__openerp__.py | 1 + addons/web/static/src/js/boot.js | 2 +- addons/web/static/src/js/corelib.js | 229 +------------------------- addons/web/static/src/js/pyeval.js | 244 ++++++++++++++++++++++++++++ addons/web/static/test/evals.js | 13 +- addons/web/static/test/test.html | 1 + addons/web/static/test/testing.js | 3 +- 7 files changed, 258 insertions(+), 235 deletions(-) create mode 100644 addons/web/static/src/js/pyeval.js diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py index 822d2fa3cbf..f64f853d0ea 100644 --- a/addons/web/__openerp__.py +++ b/addons/web/__openerp__.py @@ -39,6 +39,7 @@ This module provides the core of the OpenERP Web Client. "static/lib/cleditor/jquery.cleditor.js", "static/lib/py.js/lib/py.js", "static/src/js/boot.js", + "static/src/js/pyeval.js", "static/src/js/corelib.js", "static/src/js/coresetup.js", "static/src/js/dates.js", diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js index 844dd88a0ac..dd014846884 100644 --- a/addons/web/static/src/js/boot.js +++ b/addons/web/static/src/js/boot.js @@ -48,7 +48,7 @@ * OpenERP Web web module split *---------------------------------------------------------*/ openerp.web = function(session) { - var files = ["corelib","coresetup","dates","formats","chrome","data","views","search","list","form","list_editable","web_mobile","view_tree","data_export","data_import"]; + var files = ["pyeval", "corelib","coresetup","dates","formats","chrome","data","views","search","list","form","list_editable","web_mobile","view_tree","data_export","data_import"]; for(var i=0; i 12) { - year += 1; - month -= 12; - } - } - - var lastMonthDay = new Date(year, month, 0).getDate(); - var day = asJS(this.ops.day) || asJS(other.day); - if (day > lastMonthDay) { day = lastMonthDay; } - var days_offset = ((asJS(this.ops.weeks) || 0) * 7) + (asJS(this.ops.days) || 0); - if (days_offset) { - day = new Date(year, month-1, day + days_offset).getDate(); - } - // TODO: leapdays? - // TODO: hours, minutes, seconds? Not used in XML domains - // TODO: weekday? - return new datetime.date(year, month, day); - }, - __radd__: function (other) { - return this.__add__(other); - }, - - __sub__: function (other) { - if (!(other instanceof datetime.date)) { - return py.NotImplemented; - } - // TODO: test this whole mess - var year = asJS(this.ops.year) || asJS(other.year); - if (asJS(this.ops.years)) { - year -= asJS(this.ops.years); - } - - var month = asJS(this.ops.month) || asJS(other.month); - if (asJS(this.ops.months)) { - month -= asJS(this.ops.months); - // FIXME: no divmod in JS? - while (month < 1) { - year -= 1; - month += 12; - } - while (month > 12) { - year += 1; - month -= 12; - } - } - - var lastMonthDay = new Date(year, month, 0).getDate(); - var day = asJS(this.ops.day) || asJS(other.day); - if (day > lastMonthDay) { day = lastMonthDay; } - var days_offset = ((asJS(this.ops.weeks) || 0) * 7) + (asJS(this.ops.days) || 0); - if (days_offset) { - day = new Date(year, month-1, day - days_offset).getDate(); - } - // TODO: leapdays? - // TODO: hours, minutes, seconds? Not used in XML domains - // TODO: weekday? - return new datetime.date(year, month, day); - }, - __rsub__: function (other) { - return this.__sub__(other); - } - }); - - return { - uid: new py.float(this.uid), - datetime: datetime, - time: time, - relativedelta: relativedelta, - current_date: date.today.__call__().strftime(['%Y-%m-%d']) - }; - }, /** * FIXME: Huge testing hack, especially the evaluation context, rewrite + test for real before switching */ @@ -1154,8 +1006,8 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({ ''; try { // see Session.eval_context in Python - var ctx = this.test_eval_contexts( - ([this.context] || []).concat(source.contexts)); + var ctx = instance.web.pyeval.eval('contexts', + ([this.context] || []).concat(source.contexts)); if (!_.isEqual(ctx, expected.context)) { instance.webclient.notification.warn('Context mismatch, report to xmo', _.str.sprintf(match_template, { @@ -1173,7 +1025,7 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({ } try { - var dom = this.test_eval_domains(source.domains, this.test_eval_get_context()); + var dom = instance.web.pyeval.eval('domains', source.domains); if (!_.isEqual(dom, expected.domain)) { instance.webclient.notification.warn('Domains mismatch, report to xmo', _.str.sprintf(match_template, { @@ -1191,7 +1043,7 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({ } try { - var groups = this.test_eval_groupby(source.group_by_seq); + var groups = instance.web.pyeval.eval('groupbys', source.group_by_seq); if (!_.isEqual(groups, expected.group_by)) { instance.webclient.notification.warn('GroupBy mismatch, report to xmo', _.str.sprintf(match_template, { @@ -1208,79 +1060,6 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({ }), true); } }, - test_eval_contexts: function (contexts, evaluation_context) { - evaluation_context = evaluation_context || {}; - var self = this; - return _(contexts).reduce(function (result_context, ctx) { - // __eval_context evaluations can lead to some of `contexts`'s - // values being null, skip them as well as empty contexts - if (_.isEmpty(ctx)) { return result_context; } - var evaluated = ctx; - switch(ctx.__ref) { - case 'context': - evaluated = py.eval(ctx.__debug, evaluation_context); - break; - case 'compound_context': - var eval_context = self.test_eval_contexts([ctx.__eval_context]); - evaluated = self.test_eval_contexts( - ctx.__contexts, _.extend({}, evaluation_context, eval_context)); - break; - } - // add newly evaluated context to evaluation context for following - // siblings - _.extend(evaluation_context, evaluated); - return _.extend(result_context, evaluated); - }, _.extend({}, this.user_context)); - }, - test_eval_domains: function (domains, evaluation_context) { - var result_domain = [], self = this; - _(domains).each(function (dom) { - switch(dom.__ref) { - case 'domain': - result_domain.push.apply( - result_domain, py.eval(dom.__debug, evaluation_context)); - break; - case 'compound_domain': - var eval_context = self.test_eval_contexts([dom.__eval_context]); - result_domain.push.apply( - result_domain, self.test_eval_domains( - dom.__domains, _.extend( - {}, evaluation_context, eval_context))); - break; - default: - result_domain.push.apply( - result_domain, dom); - } - }); - return result_domain; - }, - test_eval_groupby: function (contexts) { - var result_group = [], self = this; - _(contexts).each(function (ctx) { - var group; - switch(ctx.__ref) { - case 'context': - group = py.eval(ctx.__debug).group_by; - break; - case 'compound_context': - group = self.test_eval_contexts( - ctx.__contexts, ctx.__eval_context).group_by; - break; - default: - group = ctx.group_by - } - if (!group) { return; } - if (typeof group === 'string') { - result_group.push(group); - } else if (group instanceof Array) { - result_group.push.apply(result_group, group); - } else { - throw new Error('Got invalid groupby {{' - + JSON.stringify(group) + '}}'); - } - }); - return result_group; - }, /** * Executes an RPC call, registering the provided callbacks. * diff --git a/addons/web/static/src/js/pyeval.js b/addons/web/static/src/js/pyeval.js new file mode 100644 index 00000000000..8c498c3f885 --- /dev/null +++ b/addons/web/static/src/js/pyeval.js @@ -0,0 +1,244 @@ +/* + * py.js helpers and setup + */ +openerp.web.pyeval = function (instance) { + instance.web.pyeval = {}; + + var asJS = function (arg) { + if (arg instanceof py.object) { + return arg.toJSON(); + } + return arg; + }; + + var datetime = new py.object(); + datetime.datetime = new py.type(function datetime() { + throw new Error('datetime.datetime not implemented'); + }); + var date = datetime.date = new py.type(function date(y, m, d) { + if (y instanceof Array) { + d = y[2]; + m = y[1]; + y = y[0]; + } + this.year = asJS(y); + this.month = asJS(m); + this.day = asJS(d); + }, py.object, { + strftime: function (args) { + var f = asJS(args[0]), self = this; + return new py.str(f.replace(/%([A-Za-z])/g, function (m, c) { + switch (c) { + case 'Y': return self.year; + case 'm': return _.str.sprintf('%02d', self.month); + case 'd': return _.str.sprintf('%02d', self.day); + } + throw new Error('ValueError: No known conversion for ' + m); + })); + } + }); + date.__getattribute__ = function (name) { + if (name === 'today') { + return date.today; + } + throw new Error("AttributeError: object 'date' has no attribute '" + name +"'"); + }; + date.today = new py.def(function () { + var d = new Date(); + return new date(d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate()); + }); + datetime.time = new py.type(function time() { + throw new Error('datetime.time not implemented'); + }); + + var time = new py.object(); + time.strftime = new py.def(function (args) { + return date.today.__call__().strftime(args); + }); + + var relativedelta = new py.type(function relativedelta(args, kwargs) { + if (!_.isEmpty(args)) { + throw new Error('Extraction of relative deltas from existing datetimes not supported'); + } + this.ops = kwargs; + }, py.object, { + __add__: function (other) { + if (!(other instanceof datetime.date)) { + return py.NotImplemented; + } + // TODO: test this whole mess + var year = asJS(this.ops.year) || asJS(other.year); + if (asJS(this.ops.years)) { + year += asJS(this.ops.years); + } + + var month = asJS(this.ops.month) || asJS(other.month); + if (asJS(this.ops.months)) { + month += asJS(this.ops.months); + // FIXME: no divmod in JS? + while (month < 1) { + year -= 1; + month += 12; + } + while (month > 12) { + year += 1; + month -= 12; + } + } + + var lastMonthDay = new Date(year, month, 0).getDate(); + var day = asJS(this.ops.day) || asJS(other.day); + if (day > lastMonthDay) { day = lastMonthDay; } + var days_offset = ((asJS(this.ops.weeks) || 0) * 7) + (asJS(this.ops.days) || 0); + if (days_offset) { + day = new Date(year, month-1, day + days_offset).getDate(); + } + // TODO: leapdays? + // TODO: hours, minutes, seconds? Not used in XML domains + // TODO: weekday? + return new datetime.date(year, month, day); + }, + __radd__: function (other) { + return this.__add__(other); + }, + + __sub__: function (other) { + if (!(other instanceof datetime.date)) { + return py.NotImplemented; + } + // TODO: test this whole mess + var year = asJS(this.ops.year) || asJS(other.year); + if (asJS(this.ops.years)) { + year -= asJS(this.ops.years); + } + + var month = asJS(this.ops.month) || asJS(other.month); + if (asJS(this.ops.months)) { + month -= asJS(this.ops.months); + // FIXME: no divmod in JS? + while (month < 1) { + year -= 1; + month += 12; + } + while (month > 12) { + year += 1; + month -= 12; + } + } + + var lastMonthDay = new Date(year, month, 0).getDate(); + var day = asJS(this.ops.day) || asJS(other.day); + if (day > lastMonthDay) { day = lastMonthDay; } + var days_offset = ((asJS(this.ops.weeks) || 0) * 7) + (asJS(this.ops.days) || 0); + if (days_offset) { + day = new Date(year, month-1, day - days_offset).getDate(); + } + // TODO: leapdays? + // TODO: hours, minutes, seconds? Not used in XML domains + // TODO: weekday? + return new datetime.date(year, month, day); + }, + __rsub__: function (other) { + return this.__sub__(other); + } + }); + + var eval_contexts = function (contexts, evaluation_context) { + evaluation_context = evaluation_context || {}; + return _(contexts).reduce(function (result_context, ctx) { + // __eval_context evaluations can lead to some of `contexts`'s + // values being null, skip them as well as empty contexts + if (_.isEmpty(ctx)) { return result_context; } + var evaluated = ctx; + switch(ctx.__ref) { + case 'context': + evaluated = py.eval(ctx.__debug, evaluation_context); + break; + case 'compound_context': + var eval_context = eval_contexts([ctx.__eval_context]); + evaluated = eval_contexts( + ctx.__contexts, _.extend({}, evaluation_context, eval_context)); + break; + } + // add newly evaluated context to evaluation context for following + // siblings + _.extend(evaluation_context, evaluated); + return _.extend(result_context, evaluated); + }, _.extend({}, instance.connection.user_context)); + }; + var eval_domains = function (domains, evaluation_context) { + var result_domain = []; + _(domains).each(function (domain) { + switch(domain.__ref) { + case 'domain': + result_domain.push.apply( + result_domain, py.eval(domain.__debug, evaluation_context)); + break; + case 'compound_domain': + var eval_context = eval_contexts([domain.__eval_context]); + result_domain.push.apply( + result_domain, eval_domains( + domain.__domains, _.extend( + {}, evaluation_context, eval_context))); + break; + default: + result_domain.push.apply(result_domain, domain); + } + }); + return result_domain; + }; + var eval_groupbys = function (contexts, evaluation_context) { + var result_group = []; + _(contexts).each(function (ctx) { + var group; + var evaluated = ctx; + switch(ctx.__ref) { + case 'context': + evaluated = py.eval(ctx.__debug), evaluation_context; + break; + case 'compound_context': + var eval_context = eval_contexts([ctx.__eval_context]); + evaluated = eval_contexts( + ctx.__contexts, _.extend({}, evaluation_context, eval_context)); + break; + } + group = evaluated.group_by; + if (!group) { return; } + if (typeof group === 'string') { + result_group.push(group); + } else if (group instanceof Array) { + result_group.push.apply(result_group, group); + } else { + throw new Error('Got invalid groupby {{' + + JSON.stringify(group) + '}}'); + } + _.extend(evaluation_context, evaluated); + }); + return result_group; + }; + + instance.web.pyeval.context = function () { + return { + uid: new py.float(instance.connection.uid), + datetime: datetime, + time: time, + relativedelta: relativedelta, + current_date: date.today.__call__().strftime(['%Y-%m-%d']), + }; + }; + + /** + * @param {String} type "domains", "contexts" or "groupbys" + * @param {Array} object domains or contexts to evaluate + * @param {Object} [context] evaluation context + */ + instance.web.pyeval.eval = function (type, object, context) { + if (!context) { context = instance.web.pyeval.context()} + switch(type) { + case 'contexts': return eval_contexts(object, context); + case 'domains': return eval_domains(object, context); + case 'groupbys': return eval_groupbys(object, context); + } + throw new Error("Unknow evaluation type " + type) + }; +}; diff --git a/addons/web/static/test/evals.js b/addons/web/static/test/evals.js index 7bc6554e074..ee4aef4bf79 100644 --- a/addons/web/static/test/evals.js +++ b/addons/web/static/test/evals.js @@ -3,16 +3,14 @@ $(document).ready(function () { module("eval.contexts", { setup: function () { - openerp = window.openerp.init([]); - window.openerp.web.corelib(openerp); - window.openerp.web.coresetup(openerp); + openerp = window.openerp.testing.instanceFor('coresetup'); } }); test('context_sequences', function () { // Context n should have base evaluation context + all of contexts // 0..n-1 in its own evaluation context var active_id = 4; - var result = openerp.connection.test_eval_contexts([ + var result = openerp.web.pyeval.eval('contexts', [ { "__contexts": [ { @@ -56,7 +54,7 @@ $(document).ready(function () { }); }); test('non-literal_eval_contexts', function () { - var result = openerp.connection.test_eval_contexts([{ + var result = openerp.web.pyeval.eval('contexts', [{ "__ref": "compound_context", "__contexts": [ {"__ref": "context", "__debug": "{'type':parent.type}", @@ -141,9 +139,8 @@ $(document).ready(function () { }); test('current_date', function () { var current_date = openerp.web.date_to_str(new Date()); - var result = openerp.connection.test_eval_domains( - [[],{"__ref":"domain","__debug":"[('name','>=',current_date),('name','<=',current_date)]","__id":"5dedcfc96648"}], - openerp.connection.test_eval_get_context()); + var result = openerp.web.pyeval.eval('domains', + [[],{"__ref":"domain","__debug":"[('name','>=',current_date),('name','<=',current_date)]","__id":"5dedcfc96648"}]); deepEqual(result, [ ['name', '>=', current_date], ['name', '<=', current_date] diff --git a/addons/web/static/test/test.html b/addons/web/static/test/test.html index 35d57d3c3a6..91b45c44bad 100644 --- a/addons/web/static/test/test.html +++ b/addons/web/static/test/test.html @@ -28,6 +28,7 @@ + diff --git a/addons/web/static/test/testing.js b/addons/web/static/test/testing.js index e9525fc82a0..9a449a40493 100644 --- a/addons/web/static/test/testing.js +++ b/addons/web/static/test/testing.js @@ -6,7 +6,8 @@ openerp.testing = (function () { var doc = xhr.responseXML; var dependencies = { - corelib: [], + pyeval: [], + corelib: ['pyeval'], coresetup: ['corelib'], data: ['corelib', 'coresetup'], dates: [], From 6a23c24da13f5907d4c407e919bff187a3a0ae1d Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 6 Aug 2012 13:06:38 +0200 Subject: [PATCH 009/364] [UP] py.js, old != operator and basic dict handling bzr revid: xmo@openerp.com-20120806110638-1m4rg205sb3vjvm5 --- addons/web/static/lib/py.js/.hg_archival.txt | 4 +-- addons/web/static/lib/py.js/README.rst | 26 ++++++++++------ addons/web/static/lib/py.js/lib/py.js | 32 ++++++++++++++++++-- addons/web/static/lib/py.js/test/test.js | 28 +++++++++++++++++ 4 files changed, 75 insertions(+), 15 deletions(-) diff --git a/addons/web/static/lib/py.js/.hg_archival.txt b/addons/web/static/lib/py.js/.hg_archival.txt index 35e98c8501d..2aa926eb56a 100644 --- a/addons/web/static/lib/py.js/.hg_archival.txt +++ b/addons/web/static/lib/py.js/.hg_archival.txt @@ -1,5 +1,5 @@ repo: 076b192d0d8ab2b92d1dbcfa3da055382f30eaea -node: 1758bfec1ec1dcff95dcc4c72269cc0e3d000afd +node: 87e977311edbbb5f281b87390a9a304eb194ce89 branch: default latesttag: 0.5 -latesttagdistance: 11 +latesttagdistance: 15 diff --git a/addons/web/static/lib/py.js/README.rst b/addons/web/static/lib/py.js/README.rst index 046db7153d1..eea1cbbf963 100644 --- a/addons/web/static/lib/py.js/README.rst +++ b/addons/web/static/lib/py.js/README.rst @@ -60,7 +60,7 @@ Builtins Same as tuple (``list`` is currently an alias for ``tuple``) ``dict`` - Implements just about nothing + Implements trivial getting and setting, nothing beyond that. Note that most methods are probably missing from all of these. @@ -72,14 +72,14 @@ sub-protocols) of the `Python 2.7 data model `_: Rich comparisons - Roughly complete implementation but for two limits: ``__eq__`` and - ``__ne__`` can't return ``NotImplemented`` (well they can but it's - not going to work right), and the behavior is undefined if a - rich-comparison operation does not return a ``py.bool``. + Pretty much complete (including operator fallbacks), although the + behavior is currently undefined if an operation does not return + either a ``py.bool`` or ``NotImplemented``. - Also, a ``NotImplemented`` result does not try the reverse - operation, not sure if it's supposed to. It directly falls back to - comparing type names. + ``__hash__`` is supported (and used), but it should return **a + javascript string**. ``py.js``'s dict build on javascript objects, + reimplementing numeral hashing is worthless complexity at this + point. Boolean conversion Implementing ``__nonzero__`` should work. @@ -93,6 +93,12 @@ Descriptor protocol As with attributes, ``__delete__`` is not implemented. Callable objects + Work, although the handling of arguments isn't exactly nailed + down. For now, callables get two (javascript) arguments ``args`` + and ``kwargs``, holding (respectively) positional and keyword + arguments. + + Conflicts are *not* handled at this point. Collections Abstract Base Classes Container is the only implemented ABC protocol (ABCs themselves @@ -119,8 +125,8 @@ implementation: ``py.js`` types. When accessing instance methods, ``py.js`` automatically wraps - these in a variant of ``py.def`` automatically, to behave as - Python's (bound) methods. + these in a variant of ``py.def``, to behave as Python's (bound) + methods. Why === diff --git a/addons/web/static/lib/py.js/lib/py.js b/addons/web/static/lib/py.js/lib/py.js index a8c952679af..79a0ace1995 100644 --- a/addons/web/static/lib/py.js/lib/py.js +++ b/addons/web/static/lib/py.js/lib/py.js @@ -433,7 +433,8 @@ var py = {}; if (this._hash) { return this._hash; } - return this._hash = hash_counter++; + // tagged counter, to avoid collisions with e.g. number hashes + return this._hash = '\0\0\0' + String(hash_counter++); }, __eq__: function (other) { return (this === other) ? py.True : py.False; @@ -597,6 +598,9 @@ var py = {}; throw new Error('TypeError: __str__ returned non-string (type ' + v.constructor.name + ')'); }, py.object, { + __hash__: function () { + return '\1\0\1' + this._value; + }, __eq__: function (other) { if (other instanceof py.str && this._value === other._value) { return py.True; @@ -654,12 +658,33 @@ var py = {}; } }); py.list = py.tuple; - py.dict = py.type(function dict() { + py.dict = py.type(function dict(d) { this._store = {}; + for (var k in (d || {})) { + if (!d.hasOwnProperty(k)) { continue; } + var py_k = new py.str(k); + var val = PY_ensurepy(d[k]); + this._store[py_k.__hash__()] = [py_k, val]; + } }, py.object, { + __getitem__: function (key) { + var h = key.__hash__(); + if (!(h in this._store)) { + throw new Error("KeyError: '" + key.toJSON() + "'"); + } + return this._store[h][1]; + }, __setitem__: function (key, value) { this._store[key.__hash__()] = [key, value]; }, + get: function (args) { + var h = args[0].__hash__(); + var def = args.length > 1 ? args[1] : py.None; + if (!(h in this._store)) { + return def; + } + return this._store[h][1]; + }, toJSON: function () { var out = {}; for(var k in this._store) { @@ -700,6 +725,7 @@ var py = {}; var PY_operators = { '==': ['eq', 'eq', function (a, b) { return a === b; }], '!=': ['ne', 'ne', function (a, b) { return a !== b; }], + '<>': ['ne', 'ne', function (a, b) { return a !== b; }], '<': ['lt', 'gt', function (a, b) {return a.constructor.name < b.constructor.name;}], '<=': ['le', 'ge', function (a, b) {return a.constructor.name <= b.constructor.name;}], '>': ['gt', 'lt', function (a, b) {return a.constructor.name > b.constructor.name;}], @@ -782,7 +808,7 @@ var py = {}; return b.__contains__(a); case 'not in': return b.__contains__(a) === py.True ? py.False : py.True; - case '==': case '!=': + case '==': case '!=': case '<>': case '<': case '<=': case '>': case '>=': return PY_op(a, b, operator); diff --git a/addons/web/static/lib/py.js/test/test.js b/addons/web/static/lib/py.js/test/test.js index c1f92c44d81..f09245a38c8 100644 --- a/addons/web/static/lib/py.js/test/test.js +++ b/addons/web/static/lib/py.js/test/test.js @@ -117,6 +117,11 @@ describe('Comparisons', function () { expect(py.eval('foo != bar', {foo: 'qux', bar: 'quux'})) .to.be(true); }); + it('should accept deprecated form', function () { + expect(py.eval('1 <> 2')).to.be(true); + expect(py.eval('"foo" <> "foo"')).to.be(false); + expect(py.eval('"foo" <> "bar"')).to.be(true); + }); }); describe('rich comparisons', function () { it('should work with numbers', function () { @@ -377,6 +382,29 @@ describe('numerical protocols', function () { }); }); }); +describe('dicts', function () { + it('should be possible to retrieve their value', function () { + var d = new py.dict({foo: 3, bar: 4, baz: 5}); + expect(py.eval('d["foo"]', {d: d})).to.be(3); + expect(py.eval('d["baz"]', {d: d})).to.be(5); + }); + it('should raise KeyError if a key is missing', function () { + var d = new py.dict(); + expect(function () { + py.eval('d["foo"]', {d: d}); + }).to.throwException(/^KeyError/); + }); + it('should have a method to provide a default value', function () { + var d = new py.dict({foo: 3}); + expect(py.eval('d.get("foo")', {d: d})).to.be(3); + expect(py.eval('d.get("bar")', {d: d})).to.be(null); + expect(py.eval('d.get("bar", 42)', {d: d})).to.be(42); + + var e = new py.dict({foo: null}); + expect(py.eval('d.get("foo")', {d: e})).to.be(null); + expect(py.eval('d.get("bar")', {d: e})).to.be(null); + }); +}); describe('Type converter', function () { it('should convert bare objects to objects', function () { expect(py.eval('foo.bar', {foo: {bar: 3}})).to.be(3); From 620453c4a04822af52f25449433dcfd1a0c848e5 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 5 Sep 2012 15:58:21 +0530 Subject: [PATCH 010/364] [FIX] Workflow function activities explode if they contain empty lines. bzr revid: tpa@tinyerp.com-20120905102821-8q6d42d5p0xudxmv --- openerp/workflow/wkf_expr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/workflow/wkf_expr.py b/openerp/workflow/wkf_expr.py index 608af34d118..bf9e99f00a4 100644 --- a/openerp/workflow/wkf_expr.py +++ b/openerp/workflow/wkf_expr.py @@ -44,7 +44,7 @@ class Env(dict): def _eval_expr(cr, ident, workitem, action): ret=False assert action, 'You used a NULL action in a workflow, use dummy node instead.' - for line in action.split('\n'): + for line in filter(lambda action: action != "", action.split('\n')): line = line.strip() uid=ident[0] model=ident[1] From 1b54fb39f23f8a6ba0d6e458723b12eb65bbaf94 Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Fri, 14 Sep 2012 19:16:04 +0530 Subject: [PATCH 011/364] [FIX] Compute domain fail to eval when domain has array comparision bzr revid: rgaopenerp-20120914134604-agowp1k0lxgutk7s --- addons/web/static/src/js/view_form.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 7d328f012fe..43e5313eb7b 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1527,7 +1527,8 @@ instance.web.form.compute_domain = function(expr, fields) { switch (op.toLowerCase()) { case '=': case '==': - stack.push(field_value == val); + // ([] == []) ==> false + stack.push(_.isEqual(field_value, val)); break; case '!=': case '<>': @@ -1559,6 +1560,7 @@ instance.web.form.compute_domain = function(expr, fields) { op, JSON.stringify(expr)); } } + return _.all(stack, _.identity); }; From 0e101c63a3355e2aebce2d38f985e9ac6dc96376 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 5 Oct 2012 15:12:05 +0200 Subject: [PATCH 012/364] [FIX] evaluator: connection -> session bzr revid: xmo@openerp.com-20121005131205-ffk746ac5xrua62j --- addons/web/static/src/js/pyeval.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/pyeval.js b/addons/web/static/src/js/pyeval.js index 8c498c3f885..007d73081ce 100644 --- a/addons/web/static/src/js/pyeval.js +++ b/addons/web/static/src/js/pyeval.js @@ -164,7 +164,7 @@ openerp.web.pyeval = function (instance) { // siblings _.extend(evaluation_context, evaluated); return _.extend(result_context, evaluated); - }, _.extend({}, instance.connection.user_context)); + }, _.extend({}, instance.session.user_context)); }; var eval_domains = function (domains, evaluation_context) { var result_domain = []; @@ -219,7 +219,7 @@ openerp.web.pyeval = function (instance) { instance.web.pyeval.context = function () { return { - uid: new py.float(instance.connection.uid), + uid: new py.float(instance.session.uid), datetime: datetime, time: time, relativedelta: relativedelta, From 10bc6ddfe4e12e792d856369b482ae74f73197d0 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 5 Oct 2012 16:28:08 +0200 Subject: [PATCH 013/364] [ADD] groupby eval tests bzr revid: xmo@openerp.com-20121005142808-yx6o8nfnn0o4ms56 --- addons/web/static/src/js/pyeval.js | 2 +- addons/web/static/test/evals.js | 73 +++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/pyeval.js b/addons/web/static/src/js/pyeval.js index 007d73081ce..34ddf0e119b 100644 --- a/addons/web/static/src/js/pyeval.js +++ b/addons/web/static/src/js/pyeval.js @@ -194,7 +194,7 @@ openerp.web.pyeval = function (instance) { var evaluated = ctx; switch(ctx.__ref) { case 'context': - evaluated = py.eval(ctx.__debug), evaluation_context; + evaluated = py.eval(ctx.__debug, evaluation_context); break; case 'compound_context': var eval_context = eval_contexts([ctx.__eval_context]); diff --git a/addons/web/static/test/evals.js b/addons/web/static/test/evals.js index ee4aef4bf79..dc8ceb83daf 100644 --- a/addons/web/static/test/evals.js +++ b/addons/web/static/test/evals.js @@ -145,5 +145,76 @@ $(document).ready(function () { ['name', '>=', current_date], ['name', '<=', current_date] ]); - }) + }); + + module('eval.groupbys', { + setup: function () { + openerp = window.openerp.testing.instanceFor('coresetup'); + } + }); + test('groupbys_00', function () { + var result = openerp.web.pyeval.eval('groupbys', [ + {group_by: 'foo'}, + {group_by: ['bar', 'qux']}, + {group_by: null}, + {group_by: 'grault'} + ]); + deepEqual(result, ['foo', 'bar', 'qux', 'grault']); + }); + test('groupbys_01', function () { + var result = openerp.web.pyeval.eval('groupbys', [ + {group_by: 'foo'}, + { __ref: 'context', __debug: '{"group_by": "bar"}' }, + {group_by: 'grault'} + ]); + deepEqual(result, ['foo', 'bar', 'grault']); + }); + test('groupbys_02', function () { + var result = openerp.web.pyeval.eval('groupbys', [ + {group_by: 'foo'}, + { + __ref: 'compound_context', + __contexts: [ {group_by: 'bar'} ], + __eval_context: null + }, + {group_by: 'grault'} + ]); + deepEqual(result, ['foo', 'bar', 'grault']); + }); + test('groupbys_03', function () { + var result = openerp.web.pyeval.eval('groupbys', [ + {group_by: 'foo'}, + { + __ref: 'compound_context', + __contexts: [ + { __ref: 'context', __debug: '{"group_by": value}' } + ], + __eval_context: { value: 'bar' } + }, + {group_by: 'grault'} + ]); + deepEqual(result, ['foo', 'bar', 'grault']); + }); + test('groupbys_04', function () { + var result = openerp.web.pyeval.eval('groupbys', [ + {group_by: 'foo'}, + { + __ref: 'compound_context', + __contexts: [ + { __ref: 'context', __debug: '{"group_by": value}' } + ], + __eval_context: { value: 'bar' } + }, + {group_by: 'grault'} + ], { value: 'bar' }); + deepEqual(result, ['foo', 'bar', 'grault']); + }); + test('groupbys_05', function () { + var result = openerp.web.pyeval.eval('groupbys', [ + {group_by: 'foo'}, + { __ref: 'context', __debug: '{"group_by": value}' }, + {group_by: 'grault'} + ], { value: 'bar' }); + deepEqual(result, ['foo', 'bar', 'grault']); + }); }); From 7bcbadb099a71b731812ace299b98317edc49ae4 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 8 Oct 2012 14:06:19 +0200 Subject: [PATCH 014/364] [FIX] update py.js to 0.6, port existin classes to it, attempt to implement timedelta bzr revid: xmo@openerp.com-20121008120619-lhmexjnujjrigjn9 --- addons/web/static/lib/py.js/.hg_archival.txt | 6 +- addons/web/static/lib/py.js/README.rst | 9 +- addons/web/static/lib/py.js/doc/Makefile | 153 +++++ addons/web/static/lib/py.js/doc/builtins.rst | 53 ++ addons/web/static/lib/py.js/doc/conf.py | 247 ++++++++ .../web/static/lib/py.js/doc/differences.rst | 64 +++ addons/web/static/lib/py.js/doc/index.rst | 161 ++++++ addons/web/static/lib/py.js/doc/make.bat | 190 +++++++ addons/web/static/lib/py.js/doc/types.rst | 248 ++++++++ addons/web/static/lib/py.js/doc/utility.rst | 111 ++++ addons/web/static/lib/py.js/lib/py.js | 532 +++++++++++++----- addons/web/static/lib/py.js/test/parser.js | 132 ----- addons/web/static/lib/py.js/test/test.js | 416 -------------- addons/web/static/src/js/pyeval.js | 197 +++++-- addons/web/static/test/evals.js | 44 ++ 15 files changed, 1798 insertions(+), 765 deletions(-) create mode 100644 addons/web/static/lib/py.js/doc/Makefile create mode 100644 addons/web/static/lib/py.js/doc/builtins.rst create mode 100644 addons/web/static/lib/py.js/doc/conf.py create mode 100644 addons/web/static/lib/py.js/doc/differences.rst create mode 100644 addons/web/static/lib/py.js/doc/index.rst create mode 100644 addons/web/static/lib/py.js/doc/make.bat create mode 100644 addons/web/static/lib/py.js/doc/types.rst create mode 100644 addons/web/static/lib/py.js/doc/utility.rst delete mode 100644 addons/web/static/lib/py.js/test/parser.js delete mode 100644 addons/web/static/lib/py.js/test/test.js diff --git a/addons/web/static/lib/py.js/.hg_archival.txt b/addons/web/static/lib/py.js/.hg_archival.txt index 2aa926eb56a..e97bf6a334b 100644 --- a/addons/web/static/lib/py.js/.hg_archival.txt +++ b/addons/web/static/lib/py.js/.hg_archival.txt @@ -1,5 +1,5 @@ repo: 076b192d0d8ab2b92d1dbcfa3da055382f30eaea -node: 87e977311edbbb5f281b87390a9a304eb194ce89 +node: e47d717cf47d165a5a9916abbb5ceb138661efc6 branch: default -latesttag: 0.5 -latesttagdistance: 15 +latesttag: 0.6 +latesttagdistance: 1 diff --git a/addons/web/static/lib/py.js/README.rst b/addons/web/static/lib/py.js/README.rst index eea1cbbf963..7601318df6d 100644 --- a/addons/web/static/lib/py.js/README.rst +++ b/addons/web/static/lib/py.js/README.rst @@ -1,14 +1,7 @@ What ==== -``py.js`` is a parser and evaluator of Python expressions, written in -pure javascript. -``py.js`` is not intended to implement a full Python interpreter -(although it could be used for such an effort later on), its -specification document is the `Python 2.7 Expressions spec -`_ (along with the -lexical analysis part). Syntax ------ @@ -69,7 +62,7 @@ Data model protocols ``py.js`` currently implements the following protocols (or sub-protocols) of the `Python 2.7 data model -`_: +<>`_: Rich comparisons Pretty much complete (including operator fallbacks), although the diff --git a/addons/web/static/lib/py.js/doc/Makefile b/addons/web/static/lib/py.js/doc/Makefile new file mode 100644 index 00000000000..cb7d658e796 --- /dev/null +++ b/addons/web/static/lib/py.js/doc/Makefile @@ -0,0 +1,153 @@ +# Makefile for Sphinx documentation +# + +# You can set these variables from the command line. +SPHINXOPTS = +SPHINXBUILD = sphinx-build +PAPER = +BUILDDIR = _build + +# Internal variables. +PAPEROPT_a4 = -D latex_paper_size=a4 +PAPEROPT_letter = -D latex_paper_size=letter +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . +# the i18n builder cannot share the environment and doctrees with the others +I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . + +.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext + +help: + @echo "Please use \`make ' where is one of" + @echo " html to make standalone HTML files" + @echo " dirhtml to make HTML files named index.html in directories" + @echo " singlehtml to make a single large HTML file" + @echo " pickle to make pickle files" + @echo " json to make JSON files" + @echo " htmlhelp to make HTML files and a HTML help project" + @echo " qthelp to make HTML files and a qthelp project" + @echo " devhelp to make HTML files and a Devhelp project" + @echo " epub to make an epub" + @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" + @echo " latexpdf to make LaTeX files and run them through pdflatex" + @echo " text to make text files" + @echo " man to make manual pages" + @echo " texinfo to make Texinfo files" + @echo " info to make Texinfo files and run them through makeinfo" + @echo " gettext to make PO message catalogs" + @echo " changes to make an overview of all changed/added/deprecated items" + @echo " linkcheck to check all external links for integrity" + @echo " doctest to run all doctests embedded in the documentation (if enabled)" + +clean: + -rm -rf $(BUILDDIR)/* + +html: + $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html + @echo + @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." + +dirhtml: + $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml + @echo + @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." + +singlehtml: + $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml + @echo + @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." + +pickle: + $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle + @echo + @echo "Build finished; now you can process the pickle files." + +json: + $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json + @echo + @echo "Build finished; now you can process the JSON files." + +htmlhelp: + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp + @echo + @echo "Build finished; now you can run HTML Help Workshop with the" \ + ".hhp project file in $(BUILDDIR)/htmlhelp." + +qthelp: + $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp + @echo + @echo "Build finished; now you can run "qcollectiongenerator" with the" \ + ".qhcp project file in $(BUILDDIR)/qthelp, like this:" + @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/pyjs.qhcp" + @echo "To view the help file:" + @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/pyjs.qhc" + +devhelp: + $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp + @echo + @echo "Build finished." + @echo "To view the help file:" + @echo "# mkdir -p $$HOME/.local/share/devhelp/pyjs" + @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/pyjs" + @echo "# devhelp" + +epub: + $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub + @echo + @echo "Build finished. The epub file is in $(BUILDDIR)/epub." + +latex: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo + @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." + @echo "Run \`make' in that directory to run these through (pdf)latex" \ + "(use \`make latexpdf' here to do that automatically)." + +latexpdf: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo "Running LaTeX files through pdflatex..." + $(MAKE) -C $(BUILDDIR)/latex all-pdf + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." + +text: + $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text + @echo + @echo "Build finished. The text files are in $(BUILDDIR)/text." + +man: + $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man + @echo + @echo "Build finished. The manual pages are in $(BUILDDIR)/man." + +texinfo: + $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo + @echo + @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." + @echo "Run \`make' in that directory to run these through makeinfo" \ + "(use \`make info' here to do that automatically)." + +info: + $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo + @echo "Running Texinfo files through makeinfo..." + make -C $(BUILDDIR)/texinfo info + @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." + +gettext: + $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale + @echo + @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." + +changes: + $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes + @echo + @echo "The overview file is in $(BUILDDIR)/changes." + +linkcheck: + $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck + @echo + @echo "Link check complete; look for any errors in the above output " \ + "or in $(BUILDDIR)/linkcheck/output.txt." + +doctest: + $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest + @echo "Testing of doctests in the sources finished, look at the " \ + "results in $(BUILDDIR)/doctest/output.txt." diff --git a/addons/web/static/lib/py.js/doc/builtins.rst b/addons/web/static/lib/py.js/doc/builtins.rst new file mode 100644 index 00000000000..e46926566d3 --- /dev/null +++ b/addons/web/static/lib/py.js/doc/builtins.rst @@ -0,0 +1,53 @@ +.. default-domain: python + +.. _builtins: + +Supported Python builtins +========================= + +.. function:: py.type(object) + + Gets the class of a provided object, if possible. + + .. note:: currently doesn't work correctly when called on a class + object, will return the class itself (also, classes + don't currently have a type). + +.. js:function:: py.type(name, bases, dict) + + Not exactly a builtin as this form is solely javascript-level + (currently). Used to create new ``py.js`` types. See :doc:`types` + for its usage. + +.. data:: py.None + +.. data:: py.True + +.. data:: py.False + +.. data:: py.NotImplemented + +.. class:: py.object + + Base class for all types, even implicitly (if no bases are + provided to :js:func:`py.type`) + +.. class:: py.bool([object]) + +.. class:: py.float([object]) + +.. class:: py.str([object]) + +.. class:: py.unicode([object]) + +.. class:: py.tuple() + +.. class:: py.list() + +.. class:: py.dict() + +.. function:: py.isinstance(object, type) + +.. function:: py.issubclass(type, other_type) + +.. class:: py.classmethod diff --git a/addons/web/static/lib/py.js/doc/conf.py b/addons/web/static/lib/py.js/doc/conf.py new file mode 100644 index 00000000000..287f21af577 --- /dev/null +++ b/addons/web/static/lib/py.js/doc/conf.py @@ -0,0 +1,247 @@ +# -*- coding: utf-8 -*- +# +# py.js documentation build configuration file, created by +# sphinx-quickstart on Sun Sep 9 19:36:23 2012. +# +# This file is execfile()d with the current directory set to its containing dir. +# +# Note that not all possible configuration values are present in this +# autogenerated file. +# +# All configuration values have a default; values that are commented out +# serve to show the default. + +import sys, os + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. +#sys.path.insert(0, os.path.abspath('.')) + +# -- General configuration ----------------------------------------------------- + +# If your documentation needs a minimal Sphinx version, state it here. +#needs_sphinx = '1.0' + +# Add any Sphinx extension module names here, as strings. They can be extensions +# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +extensions = ['sphinx.ext.todo'] + +# Add any paths that contain templates here, relative to this directory. +templates_path = ['_templates'] + +# The suffix of source filenames. +source_suffix = '.rst' + +# The encoding of source files. +#source_encoding = 'utf-8-sig' + +# The master toctree document. +master_doc = 'index' + +# General information about the project. +project = u'py.js' +copyright = u'2012, Xavier Morel' + +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the +# built documents. +# +# The short X.Y version. +version = '0.6' +# The full version, including alpha/beta/rc tags. +release = '0.6' + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +#language = None + +# There are two options for replacing |today|: either, you set today to some +# non-false value, then it is used: +#today = '' +# Else, today_fmt is used as the format for a strftime call. +#today_fmt = '%B %d, %Y' + +# List of patterns, relative to source directory, that match files and +# directories to ignore when looking for source files. +exclude_patterns = ['_build'] + +# The reST default role (used for this markup: `text`) to use for all documents. +#default_role = None + +# Default sphinx domain +default_domain = 'js' + +# If true, '()' will be appended to :func: etc. cross-reference text. +#add_function_parentheses = True + +# If true, the current module name will be prepended to all description +# unit titles (such as .. function::). +#add_module_names = True + +# If true, sectionauthor and moduleauthor directives will be shown in the +# output. They are ignored by default. +#show_authors = False + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = 'sphinx' +# default code-block highlighting +highlight_language = 'javascript' + +# A list of ignored prefixes for module index sorting. +#modindex_common_prefix = [] + + +# -- Options for HTML output --------------------------------------------------- + +# The theme to use for HTML and HTML Help pages. See the documentation for +# a list of builtin themes. +html_theme = 'default' + +# Theme options are theme-specific and customize the look and feel of a theme +# further. For a list of options available for each theme, see the +# documentation. +#html_theme_options = {} + +# Add any paths that contain custom themes here, relative to this directory. +#html_theme_path = [] + +# The name for this set of Sphinx documents. If None, it defaults to +# " v documentation". +#html_title = None + +# A shorter title for the navigation bar. Default is the same as html_title. +#html_short_title = None + +# The name of an image file (relative to this directory) to place at the top +# of the sidebar. +#html_logo = None + +# The name of an image file (within the static path) to use as favicon of the +# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 +# pixels large. +#html_favicon = None + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ['_static'] + +# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, +# using the given strftime format. +#html_last_updated_fmt = '%b %d, %Y' + +# If true, SmartyPants will be used to convert quotes and dashes to +# typographically correct entities. +#html_use_smartypants = True + +# Custom sidebar templates, maps document names to template names. +#html_sidebars = {} + +# Additional templates that should be rendered to pages, maps page names to +# template names. +#html_additional_pages = {} + +# If false, no module index is generated. +#html_domain_indices = True + +# If false, no index is generated. +#html_use_index = True + +# If true, the index is split into individual pages for each letter. +#html_split_index = False + +# If true, links to the reST sources are added to the pages. +#html_show_sourcelink = True + +# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. +#html_show_sphinx = True + +# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. +#html_show_copyright = True + +# If true, an OpenSearch description file will be output, and all pages will +# contain a tag referring to it. The value of this option must be the +# base URL from which the finished HTML is served. +#html_use_opensearch = '' + +# This is the file name suffix for HTML files (e.g. ".xhtml"). +#html_file_suffix = None + +# Output file base name for HTML help builder. +htmlhelp_basename = 'pyjsdoc' + + +# -- Options for LaTeX output -------------------------------------------------- + +latex_elements = { +# The paper size ('letterpaper' or 'a4paper'). +#'papersize': 'letterpaper', + +# The font size ('10pt', '11pt' or '12pt'). +#'pointsize': '10pt', + +# Additional stuff for the LaTeX preamble. +#'preamble': '', +} + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, author, documentclass [howto/manual]). +latex_documents = [ + ('index', 'pyjs.tex', u'py.js Documentation', + u'Xavier Morel', 'manual'), +] + +# The name of an image file (relative to this directory) to place at the top of +# the title page. +#latex_logo = None + +# For "manual" documents, if this is true, then toplevel headings are parts, +# not chapters. +#latex_use_parts = False + +# If true, show page references after internal links. +#latex_show_pagerefs = False + +# If true, show URL addresses after external links. +#latex_show_urls = False + +# Documents to append as an appendix to all manuals. +#latex_appendices = [] + +# If false, no module index is generated. +#latex_domain_indices = True + + +# -- Options for manual page output -------------------------------------------- + +# One entry per manual page. List of tuples +# (source start file, name, description, authors, manual section). +man_pages = [ + ('index', 'pyjs', u'py.js Documentation', + [u'Xavier Morel'], 1) +] + +# If true, show URL addresses after external links. +#man_show_urls = False + + +# -- Options for Texinfo output ------------------------------------------------ + +# Grouping the document tree into Texinfo files. List of tuples +# (source start file, target name, title, author, +# dir menu entry, description, category) +texinfo_documents = [ + ('index', 'pyjs', u'py.js Documentation', + u'Xavier Morel', 'pyjs', 'One line description of project.', + 'Miscellaneous'), +] + +# Documents to append as an appendix to all manuals. +#texinfo_appendices = [] + +# If false, no module index is generated. +#texinfo_domain_indices = True + +# How to display URL addresses: 'footnote', 'no', or 'inline'. +#texinfo_show_urls = 'footnote' diff --git a/addons/web/static/lib/py.js/doc/differences.rst b/addons/web/static/lib/py.js/doc/differences.rst new file mode 100644 index 00000000000..d81acd240a2 --- /dev/null +++ b/addons/web/static/lib/py.js/doc/differences.rst @@ -0,0 +1,64 @@ +Differences with Python +======================= + +* ``py.js`` completely ignores old-style classes as well as their + lookup details. All ``py.js`` types should be considered matching + the behavior of new-style classes + +* New types can only have a single base. This is due to ``py.js`` + implementing its types on top of Javascript's, and javascript being + a single-inheritance language. + + This may change if ``py.js`` ever reimplements its object model from + scratch. + +* Piggybacking on javascript's object model also means metaclasses are + not available (:js:func:`py.type` is a function) + +* A python-level function (created through :js:class:`py.PY_def`) set + on a new type will not become a method, it'll remain a function. + +* :js:func:`py.PY_parseArgs` supports keyword-only arguments (though + it's a Python 3 feature) + +* Because the underlying type is a javascript ``String``, there + currently is no difference between :js:class:`py.str` and + :js:class:`py.unicode`. As a result, there also is no difference + between :js:func:`__str__` and :js:func:`__unicode__`. + +Unsupported features +-------------------- + +These are Python features which are not supported at all in ``py.js``, +usually because they don't make sense or there is no way to support them + +* The ``__delattr__``, ``__delete__`` and ``__delitem__``: as + ``py.js`` only handles expressions and these are accessed via the + ``del`` statement, there would be no way to call them. + +* ``__del__`` the lack of cross-platform GC hook means there is no way + to know when an object is deallocated. + +* ``__slots__`` are not handled + +* Dedicated (and deprecated) slicing special methods are unsupported + +Missing features +---------------- + +These are Python features which are missing because they haven't been +implemented yet: + +* Class-binding of descriptors doesn't currently work. + +* Instance and subclass checks can't be customized + +* "poor" comparison methods (``__cmp__`` and ``__rcmp__``) are not + supported and won't be falled-back to. + +* ``__coerce__`` is currently supported + +* Context managers are not currently supported + +* Unbound methods are not supported, instance methods can only be + accessed from instances. diff --git a/addons/web/static/lib/py.js/doc/index.rst b/addons/web/static/lib/py.js/doc/index.rst new file mode 100644 index 00000000000..1b9167529b8 --- /dev/null +++ b/addons/web/static/lib/py.js/doc/index.rst @@ -0,0 +1,161 @@ +.. py.js documentation master file, created by + sphinx-quickstart on Sun Sep 9 19:36:23 2012. + You can adapt this file completely to your liking, but it should at least + contain the root `toctree` directive. + +py.js, a Python expressions parser and evaluator +================================================ + +``py.js`` is a parser and evaluator of Python expressions, written in +pure javascript. + +``py.js`` is not intended to implement a full Python interpreter, its +specification document is the `Python 2.7 Expressions spec +`_ (along with the +lexical analysis part) as well as the Python builtins. + + +.. toctree:: + :maxdepth: 2 + + builtins + types + utility + differences + +Usage +----- + +To evaluate a Python expression, simply call +:func:`py.eval`. :func:`py.eval` takes a mandatory Python expression +parameter, as a string, and an optional evaluation context (namespace +for the expression's free variables), and returns a javascript value:: + + > py.eval("t in ('a', 'b', 'c') and foo", {t: 'c', foo: true}); + true + +If the expression needs to be repeatedly evaluated, or the result of +the expression is needed in its "python" form without being converted +back to javascript, you can use the underlying triplet of functions +:func:`py.tokenize`, :func:`py.parse` and :func:`py.evaluate` +directly. + +API +--- + +Core functions +++++++++++++++ + +.. function:: py.eval(expr[, context]) + + "Do everything" function, to use for one-shot evaluation of Python + expressions. Chains tokenizing, parsing and evaluating the + expression then :ref:`converts the result back to javascript + ` + + :param expr: Python expression to evaluate + :type expr: String + :param context: evaluation context for the expression's free + variables + :type context: Object + :returns: the expression's result, converted back to javascript + +.. function:: py.tokenize(expr) + + Expression tokenizer + + :param expr: Python expression to tokenize + :type expr: String + :returns: token stream + +.. function:: py.parse(tokens) + + Parses a token stream and returns the corresponding parse tree. + + The parse tree is stateless and can be memoized and reused for + frequently evaluated expressions. + + :param tokens: token stream from :func:`py.tokenize` + :returns: parse tree + +.. function:: py.evaluate(tree[, context]) + + Evaluates the expression represented by the provided parse tree, + using the provided context for the exprssion's free variables. + + :param tree: parse tree returned by :func:`py.parse` + :param context: evaluation context + :returns: the "python object" resulting from the expression's + evaluation + :rtype: :class:`py.object` + +.. _convert-py: + +Conversions from Javascript to Python ++++++++++++++++++++++++++++++++++++++ + +``py.js`` will automatically attempt to convert non-:class:`py.object` +values into their ``py.js`` equivalent in the following situations: + +* Values passed through the context of :func:`py.eval` or + :func:`py.evaluate` + +* Attributes accessed directly on objects + +* Values of mappings passed to :class:`py.dict` + +Notably, ``py.js`` will *not* attempt an automatic conversion of +values returned by functions or methods, these must be +:class:`py.object` instances. + +The automatic conversions performed by ``py.js`` are the following: + +* ``null`` is converted to :data:`py.None` + +* ``true`` is converted to :data:`py.True` + +* ``false`` is converted to :data:`py.False` + +* numbers are converted to :class:`py.float` + +* strings are converted to :class:`py.str` + +* functions are wrapped into :class:`py.PY_dev` + +* ``Array`` instances are converted to :class:`py.list` + +The rest generates an error, except for ``undefined`` which +specifically generates a ``NameError``. + +.. _convert-js: + +Conversions from Python to Javascript ++++++++++++++++++++++++++++++++++++++ + +py.js types (extensions of :js:class:`py.object`) can be converted +back to javascript by calling their :js:func:`py.object.toJSON` +method. + +The default implementation raises an error, as arbitrary objects can +not be converted back to javascript. + +Most built-in objects provide a :js:func:`py.object.toJSON` +implementation out of the box. + +Javascript-level exceptions ++++++++++++++++++++++++++++ + +Javascript allows throwing arbitrary things, but runtimes don't seem +to provide any useful information (when they ever do) if what is +thrown isn't a direct instance of ``Error``. As a result, while +``py.js`` tries to match the exception-throwing semantics of Python it +only ever throws bare ``Error`` at the javascript-level. Instead, it +prefixes the error message with the name of the Python expression, a +colon, a space, and the actual message. + +For instance, where Python would throw ``KeyError("'foo'")`` when +accessing an invalid key on a ``dict``, ``py.js`` will throw +``Error("KeyError: 'foo'")``. + +.. _Python Data Model: http://docs.python.org/reference/datamodel.html + diff --git a/addons/web/static/lib/py.js/doc/make.bat b/addons/web/static/lib/py.js/doc/make.bat new file mode 100644 index 00000000000..c3db032e01a --- /dev/null +++ b/addons/web/static/lib/py.js/doc/make.bat @@ -0,0 +1,190 @@ +@ECHO OFF + +REM Command file for Sphinx documentation + +if "%SPHINXBUILD%" == "" ( + set SPHINXBUILD=sphinx-build +) +set BUILDDIR=_build +set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% . +set I18NSPHINXOPTS=%SPHINXOPTS% . +if NOT "%PAPER%" == "" ( + set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% + set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS% +) + +if "%1" == "" goto help + +if "%1" == "help" ( + :help + echo.Please use `make ^` where ^ is one of + echo. html to make standalone HTML files + echo. dirhtml to make HTML files named index.html in directories + echo. singlehtml to make a single large HTML file + echo. pickle to make pickle files + echo. json to make JSON files + echo. htmlhelp to make HTML files and a HTML help project + echo. qthelp to make HTML files and a qthelp project + echo. devhelp to make HTML files and a Devhelp project + echo. epub to make an epub + echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter + echo. text to make text files + echo. man to make manual pages + echo. texinfo to make Texinfo files + echo. gettext to make PO message catalogs + echo. changes to make an overview over all changed/added/deprecated items + echo. linkcheck to check all external links for integrity + echo. doctest to run all doctests embedded in the documentation if enabled + goto end +) + +if "%1" == "clean" ( + for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i + del /q /s %BUILDDIR%\* + goto end +) + +if "%1" == "html" ( + %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The HTML pages are in %BUILDDIR%/html. + goto end +) + +if "%1" == "dirhtml" ( + %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml. + goto end +) + +if "%1" == "singlehtml" ( + %SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml. + goto end +) + +if "%1" == "pickle" ( + %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle + if errorlevel 1 exit /b 1 + echo. + echo.Build finished; now you can process the pickle files. + goto end +) + +if "%1" == "json" ( + %SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json + if errorlevel 1 exit /b 1 + echo. + echo.Build finished; now you can process the JSON files. + goto end +) + +if "%1" == "htmlhelp" ( + %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp + if errorlevel 1 exit /b 1 + echo. + echo.Build finished; now you can run HTML Help Workshop with the ^ +.hhp project file in %BUILDDIR%/htmlhelp. + goto end +) + +if "%1" == "qthelp" ( + %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp + if errorlevel 1 exit /b 1 + echo. + echo.Build finished; now you can run "qcollectiongenerator" with the ^ +.qhcp project file in %BUILDDIR%/qthelp, like this: + echo.^> qcollectiongenerator %BUILDDIR%\qthelp\pyjs.qhcp + echo.To view the help file: + echo.^> assistant -collectionFile %BUILDDIR%\qthelp\pyjs.ghc + goto end +) + +if "%1" == "devhelp" ( + %SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. + goto end +) + +if "%1" == "epub" ( + %SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The epub file is in %BUILDDIR%/epub. + goto end +) + +if "%1" == "latex" ( + %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex + if errorlevel 1 exit /b 1 + echo. + echo.Build finished; the LaTeX files are in %BUILDDIR%/latex. + goto end +) + +if "%1" == "text" ( + %SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The text files are in %BUILDDIR%/text. + goto end +) + +if "%1" == "man" ( + %SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The manual pages are in %BUILDDIR%/man. + goto end +) + +if "%1" == "texinfo" ( + %SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo. + goto end +) + +if "%1" == "gettext" ( + %SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The message catalogs are in %BUILDDIR%/locale. + goto end +) + +if "%1" == "changes" ( + %SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes + if errorlevel 1 exit /b 1 + echo. + echo.The overview file is in %BUILDDIR%/changes. + goto end +) + +if "%1" == "linkcheck" ( + %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck + if errorlevel 1 exit /b 1 + echo. + echo.Link check complete; look for any errors in the above output ^ +or in %BUILDDIR%/linkcheck/output.txt. + goto end +) + +if "%1" == "doctest" ( + %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest + if errorlevel 1 exit /b 1 + echo. + echo.Testing of doctests in the sources finished, look at the ^ +results in %BUILDDIR%/doctest/output.txt. + goto end +) + +:end diff --git a/addons/web/static/lib/py.js/doc/types.rst b/addons/web/static/lib/py.js/doc/types.rst new file mode 100644 index 00000000000..61d950c6ec6 --- /dev/null +++ b/addons/web/static/lib/py.js/doc/types.rst @@ -0,0 +1,248 @@ +Implementing a custom type +========================== + +To implement a custom python-level type, one can use the +:func:`py.type` builtin. At the JS-level, it is a function with the +same signature as the :py:class:`type` builtin [#bases]_. It returns a +child type of its one base (or :py:class:`py.object` if no base is +provided). + +The ``dict`` parameter to :func:`py.type` can contain any +attribute, javascript-level or python-level: the default +``__getattribute__`` implementation will ensure they are converted to +Python-level attributes if needed. Most methods are also wrapped and +converted to :ref:`types-methods-python`, although there are a number +of special cases: + +* Most "magic methods" of the data model ("dunder" methods) remain + javascript-level. See :ref:`the listing of magic methods and their + signatures `. As a result, they do not respect + the :ref:`types-methods-python-call` + +* The ``toJSON`` and ``fromJSON`` methods are special-cased to remain + javascript-level and don't follow the + :ref:`types-methods-python-call` + +* Functions which have been wrapped explicitly (via + :class:`py.PY_def`, :py:class:`py.classmethod` or + :py:class:`py.staticmethod`) are associated to the class + untouched. But due to their wrapper, they will use the + :ref:`types-methods-python-call` anyway + +.. _types-methods-python: + +Python-level callable +--------------------- + +Wrapped javascript function *or* the :func:`__call__` method itself +follow the :ref:`types-methods-python-call`. As a result, they can't +(easily) be called directly from javascript code. Because +:func:`__new__` and :func:`__init__` follow from :func:`__call__`, +they also follow the :ref:`types-methods-python-call`. + +:func:`py.PY_call` should be used when interacting with them from +javascript is necessary. + +Because ``__call__`` follows the :ref:`types-methods-python-call`, +instantiating a ``py.js`` type from javascript requires using +:func:`py.PY_call`. + +.. _types-methods-python-call: + +Python calling conventions +++++++++++++++++++++++++++ + +The python-level arguments should be considered completely opaque, +they should be interacted with through :func:`py.PY_parseArgs` (to +extract python-level arguments to javascript implementation code) and +:func:`py.PY_call` (to call :ref:`types-methods-python` from +javascript code). + +A callable following the :ref:`types-methods-python-call` *must* +return a ``py.js`` object, an error will be generated when failing to +do so. + +.. todo:: arguments forwarding when e.g. overriding methods? + +.. _types-methods-dunder: + +Magic methods +------------- + +``py.js`` doesn't support calling magic ("dunder") methods of the +datamodel from Python code, and these methods remain javascript-level +(they don't follow the :ref:`types-methods-python-call`). + +Here is a list of the understood datamodel methods, refer to `the +relevant Python documentation +`_ +for their roles. + +Basic customization ++++++++++++++++++++ + +.. function:: __hash__() + + :returns: String + +.. function:: __eq__(other) + + The default implementation tests for identity + + :param other: :py:class:`py.object` to compare this object with + :returns: :py:class:`py.bool` + +.. function:: __ne__(other) + + The default implementation calls :func:`__eq__` and reverses + its result. + + :param other: :py:class:`py.object` to compare this object with + :returns: :py:class:`py.bool` + +.. function:: __lt__(other) + + The default implementation simply returns + :data:`py.NotImplemented`. + + :param other: :py:class:`py.object` to compare this object with + :returns: :py:class:`py.bool` + + +.. function:: __le__(other) + + The default implementation simply returns + :data:`py.NotImplemented`. + + :param other: :py:class:`py.object` to compare this object with + :returns: :py:class:`py.bool` + + +.. function:: __ge__(other) + + The default implementation simply returns + :data:`py.NotImplemented`. + + :param other: :py:class:`py.object` to compare this object with + :returns: :py:class:`py.bool` + + +.. function:: __gt__(other) + + The default implementation simply returns + :data:`py.NotImplemented`. + + :param other: :py:class:`py.object` to compare this object with + :returns: :py:class:`py.bool` + +.. function:: __str__() + + Simply calls :func:`__unicode__`. This method should not be + overridden, :func:`__unicode__` should be overridden instead. + + :returns: :py:class:`py.str` + +.. function:: __unicode__() + + :returns: :py:class:`py.unicode` + +.. function:: __nonzero__() + + The default implementation always returns :data:`py.True` + + :returns: :py:class:`py.bool` + +Customizing attribute access +++++++++++++++++++++++++++++ + +.. function:: __getattribute__(name) + + :param String name: name of the attribute, as a javascript string + :returns: :py:class:`py.object` + +.. function:: __getattr__(name) + + :param String name: name of the attribute, as a javascript string + :returns: :py:class:`py.object` + +.. function:: __setattr__(name, value) + + :param String name: name of the attribute, as a javascript string + :param value: :py:class:`py.object` + +Implementing descriptors +++++++++++++++++++++++++ + +.. function:: __get__(instance) + + .. note:: readable descriptors don't currently handle "owner + classes" + + :param instance: :py:class:`py.object` + :returns: :py:class:`py.object` + +.. function:: __set__(instance, value) + + :param instance: :py:class:`py.object` + :param value: :py:class:`py.object` + +Emulating Numeric Types ++++++++++++++++++++++++ + +* Non-in-place binary numeric methods (e.g. ``__add__``, ``__mul__``, + ...) should all be supported including reversed calls (in case the + primary call is not available or returns + :py:data:`py.NotImplemented`). They take a single + :py:class:`py.object` parameter and return a single + :py:class:`py.object` parameter. + +* Unary operator numeric methods are all supported: + + .. function:: __pos__() + + :returns: :py:class:`py.object` + + .. function:: __neg__() + + :returns: :py:class:`py.object` + + .. function:: __invert__() + + :returns: :py:class:`py.object` + +* For non-operator numeric methods, support is contingent on the + corresponding :ref:`builtins ` being implemented + +Emulating container types ++++++++++++++++++++++++++ + +.. function:: __len__() + + :returns: :py:class:`py.int` + +.. function:: __getitem__(name) + + :param name: :py:class:`py.object` + :returns: :py:class:`py.object` + +.. function:: __setitem__(name, value) + + :param name: :py:class:`py.object` + :param value: :py:class:`py.object` + +.. function:: __iter__() + + :returns: :py:class:`py.object` + +.. function:: __reversed__() + + :returns: :py:class:`py.object` + +.. function:: __contains__(other) + + :param other: :py:class:`py.object` + :returns: :py:class:`py.bool` + +.. [#bases] with the limitation that, because :ref:`py.js builds its + object model on top of javascript's + `, only one base is allowed. diff --git a/addons/web/static/lib/py.js/doc/utility.rst b/addons/web/static/lib/py.js/doc/utility.rst new file mode 100644 index 00000000000..90c05d448e1 --- /dev/null +++ b/addons/web/static/lib/py.js/doc/utility.rst @@ -0,0 +1,111 @@ +Utility functions for interacting with ``py.js`` objects +======================================================== + +Essentially the ``py.js`` version of the Python C API, these functions +are used to implement new ``py.js`` types or to interact with existing +ones. + +They are prefixed with ``PY_``. + +.. function:: py.PY_call(callable[, args][, kwargs]) + + Call an arbitrary python-level callable from javascript. + + :param callable: A ``py.js`` callable object (broadly speaking, + either a class or an object with a ``__call__`` + method) + + :param args: javascript Array of :class:`py.object`, used as + positional arguments to ``callable`` + + :param kwargs: javascript Object mapping names to + :class:`py.object`, used as named arguments to + ``callable`` + + :returns: nothing or :class:`py.object` + +.. function:: py.PY_parseArgs(arguments, format) + + Arguments parser converting from the :ref:`user-defined calling + conventions ` to a JS object mapping + argument names to values. It serves the same role as + `PyArg_ParseTupleAndKeywords`_. + + :: + + var args = py.PY_parseArgs( + arguments, ['foo', 'bar', ['baz', 3], ['qux', "foo"]]); + + roughly corresponds to the argument spec: + + .. code-block:: python + + def func(foo, bar, baz=3, qux="foo"): + pass + + .. note:: a significant difference is that "default values" will + be re-evaluated at each call, since they are within the + function. + + :param arguments: array-like objects holding the args and kwargs + passed to the callable, generally the + ``arguments`` of the caller. + + :param format: mapping declaration to the actual arguments of the + function. A javascript array composed of five + possible types of elements: + + * The literal string ``'*'`` marks all following + parameters as keyword-only, regardless of them + having a default value or not [#kwonly]_. Can + only be present once in the parameters list. + + * A string prefixed by ``*``, marks the positional + variadic parameter for the function: gathers all + provided positional arguments left and makes all + following parameters keyword-only + [#star-args]_. ``*args`` is incompatible with + ``*``. + + * A string prefixed with ``**``, marks the + positional keyword variadic parameter for the + function: gathers all provided keyword arguments + left and closes the argslist. If present, this + must be the last parameter of the format list. + + * A string defines a required parameter, accessible + positionally or through keyword + + * A pair of ``[String, py.object]`` defines an + optional parameter and its default value. + + For simplicity, when not using optional parameters + it is possible to use a simple string as the format + (using space-separated elements). The string will + be split on whitespace and processed as a normal + format array. + + :returns: a javascript object mapping argument names to values + + :raises: ``TypeError`` if the provided arguments don't match the + format + +.. class:: py.PY_def(fn) + + Type wrapping javascript functions into py.js callables. The + wrapped function follows :ref:`the py.js calling conventions + ` + + :param Function fn: the javascript function to wrap + :returns: a callable py.js object + +.. [#kwonly] Python 2, which py.js currently implements, does not + support Python-level keyword-only parameters (it can be + done through the C-API), but it seemed neat and easy + enough so there. + +.. [#star-args] due to this and contrary to Python 2, py.js allows + arguments other than ``**kwargs`` to follow ``*args``. + +.. _PyArg_ParseTupleAndKeywords: + http://docs.python.org/c-api/arg.html#PyArg_ParseTupleAndKeywords diff --git a/addons/web/static/lib/py.js/lib/py.js b/addons/web/static/lib/py.js/lib/py.js index 79a0ace1995..d03de622689 100644 --- a/addons/web/static/lib/py.js/lib/py.js +++ b/addons/web/static/lib/py.js/lib/py.js @@ -369,24 +369,26 @@ var py = {}; return py.False; } - if (val instanceof py.object - || val === py.object - || py.issubclass.__call__([val, py.object]) === py.True) { + var fn = function () {} + fn.prototype = py.object; + if (py.PY_call(py.isinstance, [val, py.object]) === py.True + || py.PY_call(py.issubclass, [val, py.object]) === py.True) { return val; } switch (typeof val) { case 'number': - return new py.float(val); + return py.float.fromJSON(val); case 'string': - return new py.str(val); + return py.str.fromJSON(val); case 'function': - return new py.def(val); + return py.PY_def.fromJSON(val); } switch(val.constructor) { case Object: - var o = new py.object(); + // TODO: why py.object instead of py.dict? + var o = py.PY_call(py.object); for (var prop in val) { if (val.hasOwnProperty(prop)) { o[prop] = val[prop]; @@ -394,40 +396,170 @@ var py = {}; } return o; case Array: - var a = new py.list(); - a.values = val; + var a = py.PY_call(py.list); + a._values = val; return a; } throw new Error("Could not convert " + val + " to a pyval"); } - // Builtins - py.type = function type(constructor, base, dict) { - var proto; - if (!base) { - base = py.object; + + // JSAPI, JS-level utility functions for implementing new py.js + // types + py.py = {}; + + py.PY_parseArgs = function PY_parseArgs(argument, format) { + var out = {}; + var args = argument[0]; + var kwargs = {}; + for (var k in argument[1]) { + kwargs[k] = argument[1][k]; } - proto = constructor.prototype = create(base.prototype); - proto.constructor = constructor; - if (dict) { - for(var k in dict) { - if (!dict.hasOwnProperty(k)) { continue; } - proto[k] = dict[k]; + if (typeof format === 'string') { + format = format.split(/\s+/); + } + var name = function (spec) { + if (typeof spec === 'string') { + return spec; + } else if (spec instanceof Array && spec.length === 2) { + return spec[0]; + } + throw new Error( + "TypeError: unknown format specification " + + JSON.stringify(spec)); + }; + // TODO: ensure all format arg names are actual names? + for(var i=0; i 1) { + throw new Error("ValueError: can't provide multiple bases for a " + + "new type"); + } + var base = bases[0]; + var ClassObj = create(base); + if (dict) { + for (var k in dict) { + if (!dict.hasOwnProperty(k)) { continue; } + ClassObj[k] = dict[k]; + } + } + ClassObj.__class__ = ClassObj; + ClassObj.__name__ = name; + ClassObj.__bases__ = bases; + ClassObj.__is_type = true; + + return ClassObj; + }; + py.type.__call__ = function () { + var args = py.PY_parseArgs(arguments, ['object']); + return args.object.__class__; }; var hash_counter = 0; - py.object = py.type(function object() {}, {}, { + py.object = py.type('object', [{}], { + __new__: function () { + // If ``this`` isn't the class object, this is going to be + // beyond fucked up + var inst = create(this); + inst.__is_type = false; + return inst; + }, + __init__: function () {}, // Basic customization __hash__: function () { if (this._hash) { @@ -466,11 +598,11 @@ var py = {}; var val = this[name]; if (typeof val === 'object' && '__get__' in val) { // TODO: second argument should be class - return val.__get__(this); + return val.__get__(this, py.PY_call(py.type, [this])); } if (typeof val === 'function' && !this.hasOwnProperty(name)) { // val is a method from the class - return new PY_instancemethod(val, this); + return PY_instancemethod.fromJSON(val, this); } return PY_ensurepy(val); } @@ -492,140 +624,182 @@ var py = {}; throw new Error(this.constructor.name + ' can not be converted to JSON'); } }); - var NoneType = py.type(function NoneType() {}, py.object, { + var NoneType = py.type('NoneType', null, { __nonzero__: function () { return py.False; }, toJSON: function () { return null; } }); - py.None = new NoneType(); - var NotImplementedType = py.type(function NotImplementedType(){}); - py.NotImplemented = new NotImplementedType(); + py.None = py.PY_call(NoneType); + var NotImplementedType = py.type('NotImplementedType', null, {}); + py.NotImplemented = py.PY_call(NotImplementedType); var booleans_initialized = false; - py.bool = py.type(function bool(value) { - value = (value instanceof Array) ? value[0] : value; - // The only actual instance of py.bool should be py.True - // and py.False. Return the new instance of py.bool if we - // are initializing py.True and py.False, otherwise always - // return either py.True or py.False. - if (!booleans_initialized) { - return; - } - if (value === undefined) { return py.False; } - return value.__nonzero__() === py.True ? py.True : py.False; - }, py.object, { + py.bool = py.type('bool', null, { + __new__: function () { + if (!booleans_initialized) { + return py.object.__new__.apply(this); + } + + var ph = {}; + var args = py.PY_parseArgs(arguments, [['value', ph]]); + if (args.value === ph) { + return py.False; + } + return args.value.__nonzero__() === py.True ? py.True : py.False; + }, __nonzero__: function () { return this; }, toJSON: function () { return this === py.True; } }); - py.True = new py.bool(); - py.False = new py.bool(); + py.True = py.PY_call(py.bool); + py.False = py.PY_call(py.bool); booleans_initialized = true; - py.float = py.type(function float(value) { - value = (value instanceof Array) ? value[0] : value; - if (value === undefined) { this._value = 0; return; } - if (value instanceof py.float) { return value; } - if (typeof value === 'number' || value instanceof Number) { - this._value = value; - return; - } - if (typeof value === 'string' || value instanceof String) { - this._value = parseFloat(value); - return; - } - if (value instanceof py.object && '__float__' in value) { - var res = value.__float__(); - if (res instanceof py.float) { - return res; + py.float = py.type('float', null, { + __init__: function () { + var placeholder = {}; + var args = py.PY_parseArgs(arguments, [['value', placeholder]]); + var value = args.value; + if (value === placeholder) { + this._value = 0; return; } - throw new Error('TypeError: __float__ returned non-float (type ' + - res.constructor.name + ')'); - } - throw new Error('TypeError: float() argument must be a string or a number'); - }, py.object, { + if (py.PY_call(py.isinstance, [value, py.float]) === py.True) { + this._value = value._value; + } + if (py.PY_call(py.isinstance, [value, py.object]) === py.True + && '__float__' in value) { + var res = value.__float__(); + if (py.PY_call(py.isinstance, [res, py.float]) === py.True) { + this._value = res._value; + return; + } + throw new Error('TypeError: __float__ returned non-float (type ' + + res.__class__.__name__ + ')'); + } + throw new Error('TypeError: float() argument must be a string or a number'); + }, __eq__: function (other) { return this._value === other._value ? py.True : py.False; }, __lt__: function (other) { - if (!(other instanceof py.float)) { return py.NotImplemented; } + if (py.PY_call(py.isinstance, [other, py.float]) !== py.True) { + return py.NotImplemented; + } return this._value < other._value ? py.True : py.False; }, __le__: function (other) { - if (!(other instanceof py.float)) { return py.NotImplemented; } + if (py.PY_call(py.isinstance, [other, py.float]) !== py.True) { + return py.NotImplemented; + } return this._value <= other._value ? py.True : py.False; }, __gt__: function (other) { - if (!(other instanceof py.float)) { return py.NotImplemented; } + if (py.PY_call(py.isinstance, [other, py.float]) !== py.True) { + return py.NotImplemented; + } return this._value > other._value ? py.True : py.False; }, __ge__: function (other) { - if (!(other instanceof py.float)) { return py.NotImplemented; } + if (py.PY_call(py.isinstance, [other, py.float]) !== py.True) { + return py.NotImplemented; + } return this._value >= other._value ? py.True : py.False; }, __add__: function (other) { - if (!(other instanceof py.float)) { return py.NotImplemented; } - return new py.float(this._value + other._value); + if (py.PY_call(py.isinstance, [other, py.float]) !== py.True) { + return py.NotImplemented; + } + return py.float.fromJSON(this._value + other._value); }, __neg__: function () { - return new py.float(-this._value); + return py.float.fromJSON(-this._value); }, __sub__: function (other) { - if (!(other instanceof py.float)) { return py.NotImplemented; } - return new py.float(this._value - other._value); + if (py.PY_call(py.isinstance, [other, py.float]) !== py.True) { + return py.NotImplemented; + } + return py.float.fromJSON(this._value - other._value); }, __mul__: function (other) { - if (!(other instanceof py.float)) { return py.NotImplemented; } - return new py.float(this._value * other._value); + if (py.PY_call(py.isinstance, [other, py.float]) !== py.True) { + return py.NotImplemented; + } + return py.float.fromJSON(this._value * other._value); }, __div__: function (other) { - if (!(other instanceof py.float)) { return py.NotImplemented; } - return new py.float(this._value / other._value); + if (py.PY_call(py.isinstance, [other, py.float]) !== py.True) { + return py.NotImplemented; + } + return py.float.fromJSON(this._value / other._value); }, __nonzero__: function () { return this._value ? py.True : py.False; }, + fromJSON: function (v) { + if (!(typeof v === 'number')) { + throw new Error('py.float.fromJSON can only take numbers '); + } + var instance = py.PY_call(py.float); + instance._value = v; + return instance; + }, toJSON: function () { return this._value; } }); - py.str = py.type(function str(s) { - s = (s instanceof Array) ? s[0] : s; - if (s === undefined) { this._value = ''; return; } - if (s instanceof py.str) { return s; } - if (typeof s === 'string' || s instanceof String) { - this._value = s; - return; - } - var v = s.__str__(); - if (v instanceof py.str) { return v; } - throw new Error('TypeError: __str__ returned non-string (type ' + - v.constructor.name + ')'); - }, py.object, { + py.str = py.type('str', null, { + __init__: function () { + var placeholder = {}; + var args = py.PY_parseArgs(arguments, [['value', placeholder]]); + var s = args.value; + if (s === placeholder) { this._value = ''; return; } + if (py.PY_call(py.isinstance, [s, py.str]) === py.True) { + this._value = s._value; + return; + } + var v = s.__str__(); + if (py.PY_call(py.isinstance, [v, py.str]) === py.True) { + this._value = v._value; + return; + } + throw new Error('TypeError: __str__ returned non-string (type ' + + v.__class__.__name__ + ')'); + }, __hash__: function () { return '\1\0\1' + this._value; }, __eq__: function (other) { - if (other instanceof py.str && this._value === other._value) { + if (py.PY_call(py.isinstance, [other, py.str]) === py.True + && this._value === other._value) { return py.True; } return py.False; }, __lt__: function (other) { - if (!(other instanceof py.str)) { return py.NotImplemented; } + if (py.PY_call(py.isinstance, [other, py.str]) !== py.True) { + return py.NotImplemented; + } return this._value < other._value ? py.True : py.False; }, __le__: function (other) { - if (!(other instanceof py.str)) { return py.NotImplemented; } + if (py.PY_call(py.isinstance, [other, py.str]) !== py.True) { + return py.NotImplemented; + } return this._value <= other._value ? py.True : py.False; }, __gt__: function (other) { - if (!(other instanceof py.str)) { return py.NotImplemented; } + if (py.PY_call(py.isinstance, [other, py.str]) !== py.True) { + return py.NotImplemented; + } return this._value > other._value ? py.True : py.False; }, __ge__: function (other) { - if (!(other instanceof py.str)) { return py.NotImplemented; } + if (py.PY_call(py.isinstance, [other, py.str]) !== py.True) { + return py.NotImplemented; + } return this._value >= other._value ? py.True : py.False; }, __add__: function (other) { - if (!(other instanceof py.str)) { return py.NotImplemented; } - return new py.str(this._value + other._value); + if (py.PY_call(py.isinstance, [other, py.str]) !== py.True) { + return py.NotImplemented; + } + return py.str.fromJSON(this._value + other._value); }, __nonzero__: function () { return this._value.length ? py.True : py.False; @@ -633,40 +807,46 @@ var py = {}; __contains__: function (s) { return (this._value.indexOf(s._value) !== -1) ? py.True : py.False; }, + fromJSON: function (s) { + if (typeof s === 'string') { + var instance = py.PY_call(py.str); + instance._value = s; + return instance; + }; + throw new Error("str.fromJSON can only take strings"); + }, toJSON: function () { return this._value; } }); - py.tuple = py.type(function tuple() {}, null, { + py.tuple = py.type('tuple', null, { + __init__: function () { + this._values = []; + }, __contains__: function (value) { - for(var i=0, len=this.values.length; i 1 ? args[1] : py.None; + get: function () { + var args = py.PY_parseArgs(arguments, ['k', ['d', py.None]]); + var h = args.k.__hash__(); if (!(h in this._store)) { - return def; + return args.d; } return this._store[h][1]; }, + fromJSON: function (d) { + var instance = py.PY_call(py.dict); + for (var k in (d || {})) { + if (!d.hasOwnProperty(k)) { continue; } + instance.__setitem__( + py.str.fromJSON(k), + PY_ensurepy(d[k])); + } + return instance; + }, toJSON: function () { var out = {}; for(var k in this._store) { @@ -694,30 +884,57 @@ var py = {}; return out; } }); - py.def = py.type(function def(nativefunc) { - this._inst = null; - this._func = nativefunc; - }, py.object, { - __call__: function (args, kwargs) { + py.PY_def = py.type('function', null, { + __call__: function () { // don't want to rewrite __call__ for instancemethod - return this._func.call(this._inst, args, kwargs); + return this._func.apply(this._inst, arguments); + }, + fromJSON: function (nativefunc) { + var instance = py.PY_call(py.PY_def); + instance._inst = null; + instance._func = nativefunc; + return instance; }, toJSON: function () { return this._func; } }); - var PY_instancemethod = py.type(function instancemethod(nativefunc, instance, _cls) { - // could also use bind? - this._inst = instance; - this._func = nativefunc; - }, py.def, {}); + py.classmethod = py.type('classmethod', null, { + __init__: function () { + var args = py.PY_parseArgs(arguments, 'function'); + this._func = args['function']; + }, + __get__: function (obj, type) { + return PY_instancemethod.fromJSON(this._func, type); + }, + fromJSON: function (func) { + return py.PY_call(py.classmethod, [func]); + } + }); + var PY_instancemethod = py.type('instancemethod', [py.PY_def], { + fromJSON: function (nativefunc, instance) { + var inst = py.PY_call(PY_instancemethod); + // could also use bind? + inst._inst = instance; + inst._func = nativefunc; + return inst; + } + }); - py.issubclass = new py.def(function issubclass(args) { - var derived = args[0], parent = args[1]; - // still hurts my brain that this can work - return derived.prototype instanceof py.object - ? py.True - : py.False; + py.isinstance = new py.PY_def.fromJSON(function isinstance() { + var args = py.PY_parseArgs(arguments, ['object', 'class']); + var fn = function () {}; + fn.prototype = args['class']; + return (args.object instanceof fn) ? py.True : py.False; + }); + py.issubclass = new py.PY_def.fromJSON(function issubclass() { + var args = py.PY_parseArgs(arguments, ['C', 'B']); + var fn = function () {}; + fn.prototype = args.B; + if (args.C === args.B || args.C instanceof fn) { + return py.True; + } + return py.False; }); @@ -726,10 +943,10 @@ var py = {}; '==': ['eq', 'eq', function (a, b) { return a === b; }], '!=': ['ne', 'ne', function (a, b) { return a !== b; }], '<>': ['ne', 'ne', function (a, b) { return a !== b; }], - '<': ['lt', 'gt', function (a, b) {return a.constructor.name < b.constructor.name;}], - '<=': ['le', 'ge', function (a, b) {return a.constructor.name <= b.constructor.name;}], - '>': ['gt', 'lt', function (a, b) {return a.constructor.name > b.constructor.name;}], - '>=': ['ge', 'le', function (a, b) {return a.constructor.name >= b.constructor.name;}], + '<': ['lt', 'gt', function (a, b) {return a.__class__.__name__ < b.__class__.__name__;}], + '<=': ['le', 'ge', function (a, b) {return a.__class__.__name__ <= b.__class__.__name__;}], + '>': ['gt', 'lt', function (a, b) {return a.__class__.__name__ > b.__class__.__name__;}], + '>=': ['ge', 'le', function (a, b) {return a.__class__.__name__ >= b.__class__.__name__;}], '+': ['add', 'radd'], '-': ['sub', 'rsub'], @@ -772,8 +989,8 @@ var py = {}; } throw new Error( "TypeError: unsupported operand type(s) for " + op + ": '" - + o1.constructor.name + "' and '" - + o2.constructor.name + "'"); + + o1.__class__.__name__ + "' and '" + + o2.__class__.__name__ + "'"); }; var PY_builtins = { @@ -787,10 +1004,15 @@ var py = {}; object: py.object, bool: py.bool, float: py.float, + str: py.str, + unicode: py.unicode, tuple: py.tuple, list: py.list, dict: py.dict, - issubclass: py.issubclass + + isinstance: py.isinstance, + issubclass: py.issubclass, + classmethod: py.classmethod, }; py.parse = function (toks) { @@ -825,9 +1047,9 @@ var py = {}; } return PY_ensurepy(val, expr.value); case '(string)': - return new py.str(expr.value); + return py.str.fromJSON(expr.value); case '(number)': - return new py.float(expr.value); + return py.float.fromJSON(expr.value); case '(constant)': switch (expr.value) { case 'None': return py.None; @@ -876,7 +1098,7 @@ var py = {}; py.evaluate(arg.second, context); } } - return callable.__call__(args, kwargs); + return py.PY_call(callable, args, kwargs); } var tuple_exprs = expr.first, tuple_values = []; @@ -884,8 +1106,8 @@ var py = {}; tuple_values.push(py.evaluate( tuple_exprs[j], context)); } - var t = new py.tuple(); - t.values = tuple_values; + var t = py.PY_call(py.tuple); + t._values = tuple_values; return t; case '[': if (expr.second) { @@ -897,11 +1119,11 @@ var py = {}; list_values.push(py.evaluate( list_exprs[k], context)); } - var l = new py.list(); - l.values = list_values; + var l = py.PY_call(py.list); + l._values = list_values; return l; case '{': - var dict_exprs = expr.first, dict = new py.dict; + var dict_exprs = expr.first, dict = py.PY_call(py.dict); for(var l=0; l 2')).to.be(true); - expect(py.eval('"foo" <> "foo"')).to.be(false); - expect(py.eval('"foo" <> "bar"')).to.be(true); - }); - }); - describe('rich comparisons', function () { - it('should work with numbers', function () { - expect(py.eval('3 < 5')).to.be(true); - expect(py.eval('5 >= 3')).to.be(true); - expect(py.eval('3 >= 3')).to.be(true); - expect(py.eval('3 > 5')).to.be(false); - }); - it('should support comparison chains', function () { - expect(py.eval('1 < 3 < 5')).to.be(true); - expect(py.eval('5 > 3 > 1')).to.be(true); - expect(py.eval('1 < 3 > 2 == 2 > -2')).to.be(true); - }); - it('should compare strings', function () { - expect(py.eval('date >= current', - {date: '2010-06-08', current: '2010-06-05'})) - .to.be(true); - expect(py.eval('state == "cancel"', {state: 'cancel'})) - .to.be(true); - expect(py.eval('state == "cancel"', {state: 'open'})) - .to.be(false); - }); - }); - describe('missing eq/neq', function () { - it('should fall back on identity', function () { - var typ = new py.type(function MyType() {}); - expect(py.eval('MyType() == MyType()', {MyType: typ})).to.be(false); - }); - }); - describe('un-comparable types', function () { - it('should default to type-name ordering', function () { - var t1 = new py.type(function Type1() {}); - var t2 = new py.type(function Type2() {}); - expect(py.eval('T1() < T2()', {T1: t1, T2: t2})).to.be(true); - expect(py.eval('T1() > T2()', {T1: t1, T2: t2})).to.be(false); - }); - it('should handle native stuff', function () { - expect(py.eval('None < 42')).to.be(true); - expect(py.eval('42 > None')).to.be(true); - expect(py.eval('None > 42')).to.be(false); - - expect(py.eval('None < False')).to.be(true); - expect(py.eval('None < True')).to.be(true); - expect(py.eval('False > None')).to.be(true); - expect(py.eval('True > None')).to.be(true); - expect(py.eval('None > False')).to.be(false); - expect(py.eval('None > True')).to.be(false); - - expect(py.eval('False < ""')).to.be(true); - expect(py.eval('"" > False')).to.be(true); - expect(py.eval('False > ""')).to.be(false); - }); - }); -}); -describe('Boolean operators', function () { - it('should work', function () { - expect(py.eval("foo == 'foo' or foo == 'bar'", - {foo: 'bar'})) - .to.be(true);; - expect(py.eval("foo == 'foo' and bar == 'bar'", - {foo: 'foo', bar: 'bar'})) - .to.be(true);; - }); - it('should be lazy', function () { - // second clause should nameerror if evaluated - expect(py.eval("foo == 'foo' or bar == 'bar'", - {foo: 'foo'})) - .to.be(true);; - expect(py.eval("foo == 'foo' and bar == 'bar'", - {foo: 'bar'})) - .to.be(false);; - }); - it('should return the actual object', function () { - expect(py.eval('"foo" or "bar"')).to.be('foo'); - expect(py.eval('None or "bar"')).to.be('bar'); - expect(py.eval('False or None')).to.be(null); - expect(py.eval('0 or 1')).to.be(1); - }); -}); -describe('Containment', function () { - describe('in sequences', function () { - it('should match collection items', function () { - expect(py.eval("'bar' in ('foo', 'bar')")) - .to.be(true); - expect(py.eval('1 in (1, 2, 3, 4)')) - .to.be(true);; - expect(py.eval('1 in (2, 3, 4)')) - .to.be(false);; - expect(py.eval('"url" in ("url",)')) - .to.be(true); - expect(py.eval('"foo" in ["foo", "bar"]')) - .to.be(true); - }); - it('should not be recursive', function () { - expect(py.eval('"ur" in ("url",)')) - .to.be(false);; - }); - it('should be negatable', function () { - expect(py.eval('1 not in (2, 3, 4)')).to.be(true); - expect(py.eval('"ur" not in ("url",)')).to.be(true); - expect(py.eval('-2 not in (1, 2, 3)')).to.be(true); - }); - }); - describe('in dict', function () { - // TODO - }); - describe('in strings', function () { - it('should match the whole string', function () { - expect(py.eval('"view" in "view"')).to.be(true); - expect(py.eval('"bob" in "view"')).to.be(false); - }); - it('should match substrings', function () { - expect(py.eval('"ur" in "url"')).to.be(true); - }); - }); -}); -describe('Conversions', function () { - describe('to bool', function () { - describe('strings', function () { - it('should be true if non-empty', function () { - expect(py.eval('bool(date_deadline)', - {date_deadline: '2008'})) - .to.be(true); - }); - it('should be false if empty', function () { - expect(py.eval('bool(s)', {s: ''})) .to.be(false); - }); - }); - }); -}); -describe('Attribute access', function () { - it("should return the attribute's value", function () { - var o = new py.object(); - o.bar = py.True; - expect(py.eval('foo.bar', {foo: o})).to.be(true); - o.bar = py.False; - expect(py.eval('foo.bar', {foo: o})).to.be(false); - }); - it("should work with functions", function () { - var o = new py.object(); - o.bar = new py.def(function () { - return new py.str("ok"); - }); - expect(py.eval('foo.bar()', {foo: o})).to.be('ok'); - }); - it('should not convert function attributes into methods', function () { - var o = new py.object(); - o.bar = new py.type(function bar() {}); - o.bar.__getattribute__ = function () { - return o.bar.baz; - } - o.bar.baz = py.True; - expect(py.eval('foo.bar.baz', {foo: o})).to.be(true); - }); - it('should work on instance attributes', function () { - var typ = py.type(function MyType() { - this.attr = new py.float(3); - }, py.object, {}); - expect(py.eval('MyType().attr', {MyType: typ})).to.be(3); - }); - it('should work on class attributes', function () { - var typ = py.type(function MyType() {}, py.object, { - attr: new py.float(3) - }); - expect(py.eval('MyType().attr', {MyType: typ})).to.be(3); - }); - it('should work with methods', function () { - var typ = py.type(function MyType() { - this.attr = new py.float(3); - }, py.object, { - some_method: function () { return new py.str('ok'); }, - get_attr: function () { return this.attr; } - }); - expect(py.eval('MyType().some_method()', {MyType: typ})).to.be('ok'); - expect(py.eval('MyType().get_attr()', {MyType: typ})).to.be(3); - }); -}); -describe('Callables', function () { - it('should wrap JS functions', function () { - expect(py.eval('foo()', {foo: function foo() { return new py.float(3); }})) - .to.be(3); - }); - it('should work on custom types', function () { - var typ = py.type(function MyType() {}, py.object, { - toJSON: function () { return true; } - }); - expect(py.eval('MyType()', {MyType: typ})).to.be(true); - }); - it('should accept kwargs', function () { - expect(py.eval('foo(ok=True)', { - foo: function foo() { return py.True; } - })).to.be(true); - }); - it('should be able to get its kwargs', function () { - expect(py.eval('foo(ok=True)', { - foo: function foo(args, kwargs) { return kwargs.ok; } - })).to.be(true); - }); - it('should be able to have both args and kwargs', function () { - expect(py.eval('foo(1, 2, 3, ok=True, nok=False)', { - foo: function (args, kwargs) { - expect(args).to.have.length(3); - expect(args[0].toJSON()).to.be(1); - expect(kwargs).to.only.have.keys('ok', 'nok') - expect(kwargs.nok.toJSON()).to.be(false); - return kwargs.ok; - } - })).to.be(true); - }); -}); -describe('issubclass', function () { - it('should say a type is its own subclass', function () { - expect(py.issubclass.__call__([py.dict, py.dict]).toJSON()) - .to.be(true); - expect(py.eval('issubclass(dict, dict)')) - .to.be(true); - }); - it('should work with subtypes', function () { - expect(py.issubclass.__call__([py.bool, py.object]).toJSON()) - .to.be(true); - }); -}); -describe('builtins', function () { - it('should aways be available', function () { - expect(py.eval('bool("foo")')).to.be(true); - }); -}); - -describe('numerical protocols', function () { - describe('True numbers (float)', function () { - describe('Basic arithmetic', function () { - it('can be added', function () { - expect(py.eval('1 + 1')).to.be(2); - expect(py.eval('1.5 + 2')).to.be(3.5); - expect(py.eval('1 + -1')).to.be(0); - }); - it('can be subtracted', function () { - expect(py.eval('1 - 1')).to.be(0); - expect(py.eval('1.5 - 2')).to.be(-0.5); - expect(py.eval('2 - 1.5')).to.be(0.5); - }); - it('can be multiplied', function () { - expect(py.eval('1 * 3')).to.be(3); - expect(py.eval('0 * 5')).to.be(0); - expect(py.eval('42 * -2')).to.be(-84); - }); - it('can be divided', function () { - expect(py.eval('1 / 2')).to.be(0.5); - expect(py.eval('2 / 1')).to.be(2); - }); - }); - }); - describe('Strings', function () { - describe('Basic arithmetics operators', function () { - it('can be added (concatenation)', function () { - expect(py.eval('"foo" + "bar"')).to.be('foobar'); - }); - }); - }); -}); -describe('dicts', function () { - it('should be possible to retrieve their value', function () { - var d = new py.dict({foo: 3, bar: 4, baz: 5}); - expect(py.eval('d["foo"]', {d: d})).to.be(3); - expect(py.eval('d["baz"]', {d: d})).to.be(5); - }); - it('should raise KeyError if a key is missing', function () { - var d = new py.dict(); - expect(function () { - py.eval('d["foo"]', {d: d}); - }).to.throwException(/^KeyError/); - }); - it('should have a method to provide a default value', function () { - var d = new py.dict({foo: 3}); - expect(py.eval('d.get("foo")', {d: d})).to.be(3); - expect(py.eval('d.get("bar")', {d: d})).to.be(null); - expect(py.eval('d.get("bar", 42)', {d: d})).to.be(42); - - var e = new py.dict({foo: null}); - expect(py.eval('d.get("foo")', {d: e})).to.be(null); - expect(py.eval('d.get("bar")', {d: e})).to.be(null); - }); -}); -describe('Type converter', function () { - it('should convert bare objects to objects', function () { - expect(py.eval('foo.bar', {foo: {bar: 3}})).to.be(3); - }); - it('should convert arrays to lists', function () { - expect(py.eval('foo[3]', {foo: [9, 8, 7, 6, 5]})) - .to.be(6); - }); -}); diff --git a/addons/web/static/src/js/pyeval.js b/addons/web/static/src/js/pyeval.js index 34ddf0e119b..80aac87ecbe 100644 --- a/addons/web/static/src/js/pyeval.js +++ b/addons/web/static/src/js/pyeval.js @@ -4,66 +4,151 @@ openerp.web.pyeval = function (instance) { instance.web.pyeval = {}; + var obj = function () {}; + obj.prototype = py.object; var asJS = function (arg) { - if (arg instanceof py.object) { + if (arg instanceof obj) { return arg.toJSON(); } return arg; }; - var datetime = new py.object(); - datetime.datetime = new py.type(function datetime() { - throw new Error('datetime.datetime not implemented'); + var datetime = py.PY_call(py.object); + datetime.datetime = py.type('datetime', null, { + __init__: function () { + var zero = py.float.fromJSON(0); + var args = py.PY_parseArgs(arguments, [ + 'year', 'month', 'day', + ['hour', zero], ['minute', zero], ['second', zero], + ['microsecond', zero], ['tzinfo', py.None] + ]); + for(var key in args) { + if (!args.hasOwnProperty(key)) { continue; } + this[key] = asJS(args[key]); + } + }, + strftime: function () { + var self = this; + var args = py.PY_parseArgs(arguments, 'format'); + return py.str.fromJSON(args.format.toJSON() + .replace(/%([A-Za-z])/g, function (m, c) { + switch (c) { + case 'Y': return self.year; + case 'm': return _.str.sprintf('%02d', self.month); + case 'd': return _.str.sprintf('%02d', self.day); + case 'H': return _.str.sprintf('%02d', self.hour); + case 'M': return _.str.sprintf('%02d', self.minute); + case 'S': return _.str.sprintf('%02d', self.second); + } + throw new Error('ValueError: No known conversion for ' + m); + })); + }, + now: py.classmethod.fromJSON(function () { + var d = new Date(); + return py.PY_call(datetime.datetime, + [d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate(), + d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds(), + d.getUTCMilliseconds() * 1000]); + }), + today: py.classmethod.fromJSON(function () { + var d = new Date(); + return py.PY_call(datetime.datetime, + [d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate()]); + }), + combine: py.classmethod.fromJSON(function () { + var args = py.PY_parseArgs(arguments, 'date time'); + return py.PY_call(datetime.datetime, [ + // FIXME: should use getattr + args.date.year, + args.date.month, + args.date.day, + args.time.hour, + args.time.minute, + args.time.second + ]); + }) }); - var date = datetime.date = new py.type(function date(y, m, d) { - if (y instanceof Array) { - d = y[2]; - m = y[1]; - y = y[0]; - } - this.year = asJS(y); - this.month = asJS(m); - this.day = asJS(d); - }, py.object, { - strftime: function (args) { - var f = asJS(args[0]), self = this; - return new py.str(f.replace(/%([A-Za-z])/g, function (m, c) { - switch (c) { - case 'Y': return self.year; - case 'm': return _.str.sprintf('%02d', self.month); - case 'd': return _.str.sprintf('%02d', self.day); - } - throw new Error('ValueError: No known conversion for ' + m); - })); - } + datetime.date = py.type('date', null, { + __init__: function () { + var args = py.PY_parseArgs(arguments, 'year month day'); + this.year = asJS(args.year); + this.month = asJS(args.month); + this.day = asJS(args.day); + }, + strftime: function () { + var self = this; + var args = py.PY_parseArgs(arguments, 'format'); + return py.str.fromJSON(args.format.toJSON() + .replace(/%([A-Za-z])/g, function (m, c) { + switch (c) { + case 'Y': return self.year; + case 'm': return _.str.sprintf('%02d', self.month); + case 'd': return _.str.sprintf('%02d', self.day); + } + throw new Error('ValueError: No known conversion for ' + m); + })); + }, + today: py.classmethod.fromJSON(function () { + var d = new Date(); + return py.PY_call( + datetime.date, [d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate()]); + }) }); - date.__getattribute__ = function (name) { - if (name === 'today') { - return date.today; + datetime.time = py.type('time', null, { + __init__: function () { + var zero = py.float.fromJSON(0); + var args = py.PY_parseArgs(arguments, [ + ['hour', zero], ['minute', zero], ['second', zero], ['microsecond', zero], + ['tzinfo', py.None] + ]); + + for(var k in args) { + if (!args.hasOwnProperty(k)) { continue; } + this[k] = asJS(args[k]); + } } - throw new Error("AttributeError: object 'date' has no attribute '" + name +"'"); - }; - date.today = new py.def(function () { - var d = new Date(); - return new date(d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate()); - }); - datetime.time = new py.type(function time() { - throw new Error('datetime.time not implemented'); }); - var time = new py.object(); - time.strftime = new py.def(function (args) { - return date.today.__call__().strftime(args); + datetime.timedelta = py.type('timedelta', null, { + __init__: function () { + var zero = py.float.fromJSON(0); + var args = py.PY_parseArgs(arguments, + [['days', zero], ['seconds', zero], ['microseconds', zero], + ['milliseconds', zero], ['minutes', zero], ['hours', zero], + ['weeks', zero]]); + var ms = args['microseconds'].toJSON() + + 1000 * args['milliseconds'].toJSON(); + this.milliseconds = ms % 1000000; + var sec = Math.floor(ms / 1000000) + + args['seconds'].toJSON() + + 60 * args['minutes'].toJSON() + + 3600 * args['hours'].toJSON(); + this.seconds = sec % 86400; + this.days = Math.floor(sec / 86400) + + args['days'].toJSON() + + 7 * args['weeks'].toJSON(); + } }); - var relativedelta = new py.type(function relativedelta(args, kwargs) { - if (!_.isEmpty(args)) { - throw new Error('Extraction of relative deltas from existing datetimes not supported'); - } - this.ops = kwargs; - }, py.object, { + var time = py.PY_call(py.object); + time.strftime = py.PY_def.fromJSON(function () { + // FIXME: needs PY_getattr + var d = py.PY_call(datetime.__getattribute__('datetime') + .__getattribute__('now')); + var args = [].slice.call(arguments); + return py.PY_call.apply( + null, [d.__getattribute__('strftime')].concat(args)); + }); + + var relativedelta = py.type('relativedelta', null, { + __init__: function () { + this.ops = py.PY_parseArgs(arguments, + '* year month day hour minute second microsecond ' + + 'years months weeks days hours minutes secondes microseconds ' + + 'weekday leakdays yearday nlyearday'); + }, __add__: function (other) { - if (!(other instanceof datetime.date)) { + if (py.PY_call(py.isinstance, [datetime.date]) !== py.True) { return py.NotImplemented; } // TODO: test this whole mess @@ -96,14 +181,19 @@ openerp.web.pyeval = function (instance) { // TODO: leapdays? // TODO: hours, minutes, seconds? Not used in XML domains // TODO: weekday? - return new datetime.date(year, month, day); + // FIXME: use date.replace + return py.PY_call(datetime.date, [ + py.float.fromJSON(year), + py.float.fromJSON(month), + py.float.fromJSON(day) + ]); }, __radd__: function (other) { return this.__add__(other); }, __sub__: function (other) { - if (!(other instanceof datetime.date)) { + if (py.PY_call(py.isinstance, [datetime.date]) !== py.True) { return py.NotImplemented; } // TODO: test this whole mess @@ -136,7 +226,11 @@ openerp.web.pyeval = function (instance) { // TODO: leapdays? // TODO: hours, minutes, seconds? Not used in XML domains // TODO: weekday? - return new datetime.date(year, month, day); + return py.PY_call(datetime.date, [ + py.float.fromJSON(year), + py.float.fromJSON(month), + py.float.fromJSON(day) + ]); }, __rsub__: function (other) { return this.__sub__(other); @@ -219,11 +313,12 @@ openerp.web.pyeval = function (instance) { instance.web.pyeval.context = function () { return { - uid: new py.float(instance.session.uid), + uid: py.float.fromJSON(instance.session.uid), datetime: datetime, time: time, relativedelta: relativedelta, - current_date: date.today.__call__().strftime(['%Y-%m-%d']), + current_date: py.PY_call( + time.strftime, [py.str.fromJSON('%Y-%m-%d')]), }; }; diff --git a/addons/web/static/test/evals.js b/addons/web/static/test/evals.js index dc8ceb83daf..3c3bface529 100644 --- a/addons/web/static/test/evals.js +++ b/addons/web/static/test/evals.js @@ -1,9 +1,51 @@ $(document).ready(function () { var openerp; + module("eval.types", { + setup: function () { + openerp = window.openerp.testing.instanceFor('coresetup'); + openerp.session.uid = 42; + } + }); + test('datetime.datetime', function () { + }); + test('datetime.date', function () { + + }); + test('datetime.timedelta', function () { + var d = new Date(); + d.setUTCDate(d.getUTCDate() - 15); + strictEqual( + py.eval("(datetime.date.today()" + + "- datetime.timedelta(days=15))" + + ".strftime('%Y-%m-%d')", openerp.web.pyeval.context()), + _.str.strftime('%04d-%02d-%02d', + d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate())); + + }); + test('relativedelta', function () { + + }); + test('strftime', function () { + var d = new Date(); + var context = openerp.web.pyeval.context(); + strictEqual( + py.eval("time.strftime('%Y')", context), + String(d.getUTCFullYear())); + strictEqual( + py.eval("time.strftime('%Y')+'-01-30'", context), + String(d.getUTCFullYear()) + '-01-30'); + strictEqual( + py.eval("time.strftime('%Y-%m-%d %H:%M:%S')", context), + _.str.sprintf('%04d-%02d-%02d %02d:%02d:%02d', + d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate(), + d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds())); + }); + module("eval.contexts", { setup: function () { openerp = window.openerp.testing.instanceFor('coresetup'); + openerp.session.uid = 42; } }); test('context_sequences', function () { @@ -135,6 +177,7 @@ $(document).ready(function () { setup: function () { openerp = window.openerp.testing.instanceFor('coresetup'); window.openerp.web.dates(openerp); + openerp.session.uid = 42; } }); test('current_date', function () { @@ -150,6 +193,7 @@ $(document).ready(function () { module('eval.groupbys', { setup: function () { openerp = window.openerp.testing.instanceFor('coresetup'); + openerp.session.uid = 42; } }); test('groupbys_00', function () { From 894bd34e6275fe838bb0de30e25de4b0e09d4636 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 8 Oct 2012 14:55:23 +0200 Subject: [PATCH 015/364] [REM] timedelta, because pain bzr revid: xmo@openerp.com-20121008125523-ed1g42vjxbcfo62r --- addons/web/static/src/js/pyeval.js | 21 --------------------- addons/web/static/test/evals.js | 19 ------------------- 2 files changed, 40 deletions(-) diff --git a/addons/web/static/src/js/pyeval.js b/addons/web/static/src/js/pyeval.js index 80aac87ecbe..8b56d17c14e 100644 --- a/addons/web/static/src/js/pyeval.js +++ b/addons/web/static/src/js/pyeval.js @@ -109,27 +109,6 @@ openerp.web.pyeval = function (instance) { } }); - datetime.timedelta = py.type('timedelta', null, { - __init__: function () { - var zero = py.float.fromJSON(0); - var args = py.PY_parseArgs(arguments, - [['days', zero], ['seconds', zero], ['microseconds', zero], - ['milliseconds', zero], ['minutes', zero], ['hours', zero], - ['weeks', zero]]); - var ms = args['microseconds'].toJSON() - + 1000 * args['milliseconds'].toJSON(); - this.milliseconds = ms % 1000000; - var sec = Math.floor(ms / 1000000) - + args['seconds'].toJSON() - + 60 * args['minutes'].toJSON() - + 3600 * args['hours'].toJSON(); - this.seconds = sec % 86400; - this.days = Math.floor(sec / 86400) - + args['days'].toJSON() - + 7 * args['weeks'].toJSON(); - } - }); - var time = py.PY_call(py.object); time.strftime = py.PY_def.fromJSON(function () { // FIXME: needs PY_getattr diff --git a/addons/web/static/test/evals.js b/addons/web/static/test/evals.js index 3c3bface529..72c4cd7323a 100644 --- a/addons/web/static/test/evals.js +++ b/addons/web/static/test/evals.js @@ -6,25 +6,6 @@ $(document).ready(function () { openerp = window.openerp.testing.instanceFor('coresetup'); openerp.session.uid = 42; } - }); - test('datetime.datetime', function () { - }); - test('datetime.date', function () { - - }); - test('datetime.timedelta', function () { - var d = new Date(); - d.setUTCDate(d.getUTCDate() - 15); - strictEqual( - py.eval("(datetime.date.today()" + - "- datetime.timedelta(days=15))" + - ".strftime('%Y-%m-%d')", openerp.web.pyeval.context()), - _.str.strftime('%04d-%02d-%02d', - d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate())); - - }); - test('relativedelta', function () { - }); test('strftime', function () { var d = new Date(); From 1fa00288b269e68a47849eaa3fefc090759a357d Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 10 Oct 2012 16:59:45 +0200 Subject: [PATCH 016/364] [FIX] add 'context' free variable in evaluation contexts for domains and contexts bzr revid: xmo@openerp.com-20121010145945-16shdry3udum0mn1 --- addons/web/static/src/js/pyeval.js | 4 +++- addons/web/static/test/evals.js | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/pyeval.js b/addons/web/static/src/js/pyeval.js index 8b56d17c14e..a00fd186d58 100644 --- a/addons/web/static/src/js/pyeval.js +++ b/addons/web/static/src/js/pyeval.js @@ -307,7 +307,9 @@ openerp.web.pyeval = function (instance) { * @param {Object} [context] evaluation context */ instance.web.pyeval.eval = function (type, object, context) { - if (!context) { context = instance.web.pyeval.context()} + context = _.extend(instance.web.pyeval.context(), context || {}); + context['context'] = py.dict.fromJSON(context); + switch(type) { case 'contexts': return eval_contexts(object, context); case 'domains': return eval_domains(object, context); diff --git a/addons/web/static/test/evals.js b/addons/web/static/test/evals.js index 72c4cd7323a..72503d5313b 100644 --- a/addons/web/static/test/evals.js +++ b/addons/web/static/test/evals.js @@ -29,6 +29,21 @@ $(document).ready(function () { openerp.session.uid = 42; } }); + test('context_recursive', function () { + var context_to_eval = [{ + __ref: 'context', + __debug: '{"foo": context.get("bar", "qux")}' + }]; + deepEqual( + openerp.web.pyeval.eval('contexts', context_to_eval, {bar: "ok"}), + {foo: 'ok'}); + deepEqual( + openerp.web.pyeval.eval('contexts', context_to_eval, {bar: false}), + {foo: false}); + deepEqual( + openerp.web.pyeval.eval('contexts', context_to_eval), + {foo: 'qux'}); + }); test('context_sequences', function () { // Context n should have base evaluation context + all of contexts // 0..n-1 in its own evaluation context @@ -170,6 +185,21 @@ $(document).ready(function () { ['name', '<=', current_date] ]); }); + test('context_freevar', function () { + var domains_to_eval = [{ + __ref: 'domain', + __debug: '[("foo", "=", context.get("bar", "qux"))]' + }, [['bar', '>=', 42]]]; + deepEqual( + openerp.web.pyeval.eval('domains', domains_to_eval, {bar: "ok"}), + [['foo', '=', 'ok'], ['bar', '>=', 42]]); + deepEqual( + openerp.web.pyeval.eval('domains', domains_to_eval, {bar: false}), + [['foo', '=', false], ['bar', '>=', 42]]); + deepEqual( + openerp.web.pyeval.eval('domains', domains_to_eval), + [['foo', '=', 'qux'], ['bar', '>=', 42]]); + }); module('eval.groupbys', { setup: function () { From b94e9c30a78e0047457977bf8ff5bd6bdda81372 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 11 Oct 2012 09:57:59 +0200 Subject: [PATCH 017/364] [FIX] after discussions with odo, date/datetime/time for locally-evaluated contexts and domains should be local, not UTC bzr revid: xmo@openerp.com-20121011075759-qfwkfws5tu9yidab --- addons/web/static/src/js/pyeval.js | 10 +++++----- addons/web/static/test/evals.js | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/web/static/src/js/pyeval.js b/addons/web/static/src/js/pyeval.js index a00fd186d58..51fdc63e84c 100644 --- a/addons/web/static/src/js/pyeval.js +++ b/addons/web/static/src/js/pyeval.js @@ -46,14 +46,14 @@ openerp.web.pyeval = function (instance) { now: py.classmethod.fromJSON(function () { var d = new Date(); return py.PY_call(datetime.datetime, - [d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate(), - d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds(), - d.getUTCMilliseconds() * 1000]); + [d.getFullYear(), d.getMonth() + 1, d.getDate(), + d.getHours(), d.getMinutes(), d.getSeconds(), + d.getMilliseconds() * 1000]); }), today: py.classmethod.fromJSON(function () { var d = new Date(); return py.PY_call(datetime.datetime, - [d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate()]); + [d.getFullYear(), d.getMonth() + 1, d.getDate()]); }), combine: py.classmethod.fromJSON(function () { var args = py.PY_parseArgs(arguments, 'date time'); @@ -91,7 +91,7 @@ openerp.web.pyeval = function (instance) { today: py.classmethod.fromJSON(function () { var d = new Date(); return py.PY_call( - datetime.date, [d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate()]); + datetime.date, [d.getFullYear(), d.getMonth() + 1, d.getDate()]); }) }); datetime.time = py.type('time', null, { diff --git a/addons/web/static/test/evals.js b/addons/web/static/test/evals.js index 72503d5313b..276636c1ed2 100644 --- a/addons/web/static/test/evals.js +++ b/addons/web/static/test/evals.js @@ -12,15 +12,15 @@ $(document).ready(function () { var context = openerp.web.pyeval.context(); strictEqual( py.eval("time.strftime('%Y')", context), - String(d.getUTCFullYear())); + String(d.getFullYear())); strictEqual( py.eval("time.strftime('%Y')+'-01-30'", context), - String(d.getUTCFullYear()) + '-01-30'); + String(d.getFullYear()) + '-01-30'); strictEqual( py.eval("time.strftime('%Y-%m-%d %H:%M:%S')", context), _.str.sprintf('%04d-%02d-%02d %02d:%02d:%02d', - d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate(), - d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds())); + d.getFullYear(), d.getMonth() + 1, d.getDate(), + d.getHours(), d.getMinutes(), d.getSeconds())); }); module("eval.contexts", { From e6b77eb820a7670b416319f314808e4b90931a01 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 11 Oct 2012 12:05:32 +0200 Subject: [PATCH 018/364] [IMP] shortcut call to eval_domain_and_context to be evaluated on the JS side, also add some offline-evaluation of contexts and domains in rpc call methods bzr revid: xmo@openerp.com-20121011100532-5ihje0maslp37zpf --- addons/web/static/src/js/corelib.js | 83 ++++------------------------- addons/web/static/src/js/data.js | 14 +++-- addons/web/static/src/js/pyeval.js | 57 ++++++++++++++++++++ 3 files changed, 77 insertions(+), 77 deletions(-) diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js index 228cee5e411..e26a839639c 100644 --- a/addons/web/static/src/js/corelib.js +++ b/addons/web/static/src/js/corelib.js @@ -997,75 +997,6 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({ this.server = this.origin; // keep chs happy this.rpc_function = (this.origin == window_origin) ? this.rpc_json : this.rpc_jsonp; }, - /** - * FIXME: Huge testing hack, especially the evaluation context, rewrite + test for real before switching - */ - test_eval: function (source, expected) { - var match_template = '
    ' + - '
  • Source: %(source)s
    • ' + - '
  • Local: %(local)s
    • ' + - '
  • Remote: %(remote)s
    • ' + - '
', - fail_template = '
    ' + - '
  • Error: %(error)s
    • ' + - '
  • Source: %(source)s
    • ' + - '
'; - try { - // see Session.eval_context in Python - var ctx = instance.web.pyeval.eval('contexts', - ([this.context] || []).concat(source.contexts)); - if (!_.isEqual(ctx, expected.context)) { - instance.webclient.notification.warn('Context mismatch, report to xmo', - _.str.sprintf(match_template, { - source: JSON.stringify(source.contexts), - local: JSON.stringify(ctx), - remote: JSON.stringify(expected.context) - }), true); - } - } catch (e) { - instance.webclient.notification.warn('Context fail, report to xmo', - _.str.sprintf(fail_template, { - error: e.message, - source: JSON.stringify(source.contexts) - }), true); - } - - try { - var dom = instance.web.pyeval.eval('domains', source.domains); - if (!_.isEqual(dom, expected.domain)) { - instance.webclient.notification.warn('Domains mismatch, report to xmo', - _.str.sprintf(match_template, { - source: JSON.stringify(source.domains), - local: JSON.stringify(dom), - remote: JSON.stringify(expected.domain) - }), true); - } - } catch (e) { - instance.webclient.notification.warn('Domain fail, report to xmo', - _.str.sprintf(fail_template, { - error: e.message, - source: JSON.stringify(source.domains) - }), true); - } - - try { - var groups = instance.web.pyeval.eval('groupbys', source.group_by_seq); - if (!_.isEqual(groups, expected.group_by)) { - instance.webclient.notification.warn('GroupBy mismatch, report to xmo', - _.str.sprintf(match_template, { - source: JSON.stringify(source.group_by_seq), - local: JSON.stringify(groups), - remote: JSON.stringify(expected.group_by) - }), true); - } - } catch (e) { - instance.webclient.notification.warn('GroupBy fail, report to xmo', - _.str.sprintf(fail_template, { - error: e.message, - source: JSON.stringify(source.group_by_seq) - }), true); - } - }, /** * Executes an RPC call, registering the provided callbacks. * @@ -1098,13 +1029,17 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({ this.trigger('request', url, payload); var aborter = params.aborter; delete params.aborter; - var request = this.rpc_function(url, payload).then( - function (response, textStatus, jqXHR) { + var request; + if (url.url === '/web/session/eval_domain_and_context') { + // intercept eval_domain_and_context + request = instance.web.pyeval.eval_domains_and_contexts( + params) + } else { + request = this.rpc_function(url, payload); + } + request.then(function (response, textStatus, jqXHR) { self.trigger('response', response); if (!response.error) { - if (url.url === '/web/session/eval_domain_and_context') { - self.test_eval(params, response.result); - } deferred.resolve(response["result"], textStatus, jqXHR); } else if (response.error.data.type === "session_invalid") { self.uid = false; diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index 2b82e618203..af887a5152f 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -61,8 +61,10 @@ instance.web.Query = instance.web.Class.extend({ return instance.session.rpc('/web/dataset/search_read', { model: this._model.name, fields: this._fields || false, - domain: this._model.domain(this._filter), - context: this._model.context(this._context), + domain: instance.web.pyeval.eval('domains', + [this._model.domain(this._filter)]), + context: instance.web.pyeval.eval('contexts', + [this._model.context(this._context)]), offset: this._offset, limit: this._limit, sort: instance.web.serialize_sort(this._order_by) @@ -280,6 +282,7 @@ instance.web.Model = instance.web.Class.extend({ kwargs = args; args = []; } + instance.web.pyeval.ensure_evaluated(args, kwargs); return instance.session.rpc('/web/dataset/call_kw', { model: this.name, method: method, @@ -291,7 +294,7 @@ instance.web.Model = instance.web.Class.extend({ * Fetches a Query instance bound to this model, for searching * * @param {Array} [fields] fields to ultimately fetch during the search - * @returns {openerp.web.Query} + * @returns {instance.web.Query} */ query: function (fields) { return new instance.web.Query(this, fields); @@ -339,9 +342,11 @@ instance.web.Model = instance.web.Class.extend({ * FIXME: remove when evaluator integrated */ call_button: function (method, args) { + instance.web.pyeval.ensure_evaluated(args, {}); return instance.session.rpc('/web/dataset/call_button', { model: this.name, method: method, + // Should not be necessary anymore. Integrate remote in this? domain_id: null, context_id: args.length - 1, args: args || [] @@ -599,9 +604,12 @@ instance.web.DataSet = instance.web.CallbackEnabled.extend({ * @returns {$.Deferred} */ call_and_eval: function (method, args, domain_index, context_index) { + instance.web.pyeval.ensure_evaluated(args, {}); return instance.session.rpc('/web/dataset/call', { model: this.model, method: method, + // Should not be necessary anymore as ensure_evaluated traverses + // all of the args array domain_id: domain_index == undefined ? null : domain_index, context_id: context_index == undefined ? null : context_index, args: args || [] diff --git a/addons/web/static/src/js/pyeval.js b/addons/web/static/src/js/pyeval.js index 51fdc63e84c..ca4d5a0a1e7 100644 --- a/addons/web/static/src/js/pyeval.js +++ b/addons/web/static/src/js/pyeval.js @@ -2,6 +2,7 @@ * py.js helpers and setup */ openerp.web.pyeval = function (instance) { + var _t = instance.web._t; instance.web.pyeval = {}; var obj = function () {}; @@ -317,4 +318,60 @@ openerp.web.pyeval = function (instance) { } throw new Error("Unknow evaluation type " + type) }; + + var eval_arg = function (arg) { + if (typeof arg !== 'object' || !arg.__ref) { return arg; } + switch(arg.__ref) { + case 'domain': case 'compound_domain': + return instance.web.pyeval.eval('domains', [arg]); + case 'context': case 'compound_context': + return instance.web.pyeval.eval('contexts', [arg]); + default: + throw new Error(_t("Unknown nonliteral type " + arg.__ref)); + } + }; + /** + * If args or kwargs are unevaluated contexts or domains (compound or not), + * evaluated them in-place. + * + * Potentially mutates both parameters. + * + * @param args + * @param kwargs + */ + instance.web.pyeval.ensure_evaluated = function (args, kwargs) { + for (var i=0; i Date: Wed, 17 Oct 2012 18:30:47 +0530 Subject: [PATCH 019/364] [IMP] Right click on header logo open dialog box to resize logo. bzr revid: bth@tinyerp.com-20121017130047-xw1j2jw9eje8wn8p --- addons/web/static/src/js/chrome.js | 10 +++++++++- addons/web/static/src/xml/base.xml | 19 +++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 67e36678040..bfcb7639a26 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -983,7 +983,15 @@ instance.web.WebClient = instance.web.Client.extend({ start: function() { var self = this; return $.when(this._super()).pipe(function() { - self.$el.on('click', '.oe_logo', function() { + self.$el.on('contextmenu','.oe_logo',function(e) { + instance.web.dialog($(QWeb.render('Resolution')),{ + title: "OpenERP Resolution" }); + $('.resolution a').click(function() { + self.$el.find('.oe_logo').css('width', $(this).text()+"px"); + self.$el.find('.oe_logo img').css('width', $(this).text()+"px"); + }) + }) + self.$el.on('click', '.oe_logo', function(e) { self.action_manager.do_action('home'); }); if (jQuery.param !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index a09897862f6..956d5164729 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -10,6 +10,21 @@ Loading... + +
+ + + + + + + + + + +
100px200px
250px300px
+
+
@@ -404,7 +419,7 @@ - +
Powered by OpenERP @@ -1090,7 +1105,7 @@
- Edit + Edit -
- - - - - - - - - - -
100px200px
250px300px
-
+
+ + + + + + + + + + + + + + + + +
100px200px
250px300px
Original
+
From decc05e68eb1b57c2f02b5a005a3d28fd367c5fa Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Thu, 18 Oct 2012 12:48:40 +0530 Subject: [PATCH 021/364] [IMP] Set height & width for logo and improve code. bzr revid: bth@tinyerp.com-20121018071840-mzl3286v0twl088n --- addons/web/static/src/js/chrome.js | 10 ++++------ addons/web/static/src/xml/base.xml | 10 +++++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index ce871af68c3..a039433f09b 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -987,12 +987,10 @@ instance.web.WebClient = instance.web.Client.extend({ instance.web.dialog($(QWeb.render('Resolution')),{ title: "OpenERP Resolution" }); $('.resolution a').click(function() { - if ($(this).text() == "Original") { - self.$el.find('.oe_logo').css('width', "220px"); - self.$el.find('.oe_logo img').css('width', "157px"); - } - self.$el.find('.oe_logo').css('width', $(this).text()+"px"); - self.$el.find('.oe_logo img').css('width', $(this).text()+"px"); + self.$el.find('.oe_logo').css('width', $(this).attr('awidth')+"px"); + self.$el.find('.oe_logo').css('height', $(this).attr('aheight')+"px"); + self.$el.find('.oe_logo img').css('width', $(this).attr('imgw')+"px"); + self.$el.find('.oe_logo img').css('height', $(this).attr('imgh')+"px"); }) }) self.$el.on('click', '.oe_logo', function(e) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 90dc55cb29a..99437d8d66f 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -17,16 +17,16 @@ - 100px - 200px + 150 x 60 + 250 x 90 - 250px - 300px + 290 x 90 + 320 x 100 - Original + Original
From 419f31928cdd562fec4c45e5e65bf4c9dd1cfb75 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Thu, 18 Oct 2012 17:56:20 +0530 Subject: [PATCH 022/364] [Fix]display in a form what are the keyboard shortcuts defined in screen when hold ALT key bzr revid: vja@tinyerp.com-20121018122620-7angnmxvaig2l8ac --- addons/web/static/src/css/base.css | 34 +++---- addons/web/static/src/js/view_form.js | 136 ++++++++------------------ addons/web/static/src/xml/base.xml | 15 ++- 3 files changed, 61 insertions(+), 124 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index e4b8885b1a1..5dc5f7d8cbf 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -25,6 +25,7 @@ display: none !important; } } + .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -473,6 +474,11 @@ max-width: 180px; max-height: 180px; } +.openerp .oe_view_manager_current .accessactive{ + text-decoration:underline; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + font-weight:bold; +} .openerp .oe_button.oe_link { border: none; padding: 0; @@ -2561,12 +2567,6 @@ .openerp .oe_list.oe_list_editable td.oe_list_record_delete { position: absolute; } -.openerp .oe_list.oe_list_editable.oe_editing .oe_edition .oe_list_field_cell:not(.oe_readonly) { - color: transparent; -} -.openerp .oe_list.oe_list_editable.oe_editing .oe_edition .oe_list_field_cell:not(.oe_readonly) * { - visibility: hidden; -} .openerp .oe_list.oe_list_editable.oe_editing .oe_m2o_drop_down_button { top: 5px; } @@ -2585,10 +2585,10 @@ } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer input { text-align: right; - width: 100% !important; + width: 100%; } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime > span, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date > span { - width: 100% !important; + width: 100%; } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime input.oe_datepicker_master, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date input.oe_datepicker_master { width: 100% !important; @@ -2597,9 +2597,6 @@ min-width: 0 !important; max-width: none !important; } -.openerp .oe_list_group_name { - white-space: nowrap; -} .openerp .oe_form .oe_form_field_many2many > .oe_list .oe_list_pager_single_page { display: none; } @@ -2659,17 +2656,14 @@ background: #eeeeee; vertical-align: top; } +.openerp .oe_list_content > thead th { + position: relative; +} .openerp .oe_list_content td, .openerp .oe_list_content th { padding: 3px 6px; line-height: 18px; } -.openerp .oe_list_content th.oe_sortable, .openerp .oe_list_content th.oe_sortable div { - cursor: pointer; -} -.openerp .oe_list_content th.oe_sortable div { - position: relative; -} -.openerp .oe_list_content th.oe_sortable div:after { +.openerp .oe_list_content th:after { position: absolute; right: 6px; content: ""; @@ -2679,12 +2673,12 @@ border-color: black transparent; visibility: hidden; } -.openerp .oe_list_content th.sortup div:after { +.openerp .oe_list_content th.sortup:after { visibility: visible; filter: alpha(opacity=60); opacity: 0.6; } -.openerp .oe_list_content th.sortdown div:after { +.openerp .oe_list_content th.sortdown:after { border-bottom: none; border-left: 4px solid transparent; border-right: 4px solid transparent; diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index bc171ef1d6e..f43a4f10da2 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -125,9 +125,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM self.check_actual_mode(); self.on("change:actual_mode", self, self.init_pager); self.init_pager(); + self.widgetAccesskey(); }); self.on("load_record", self, self.load_record); - this.on('view_loaded', self, self.load_form); instance.web.bus.on('clear_uncommitted_changes', this, function(e) { if (!this.can_be_discarded()) { e.preventDefault(); @@ -144,13 +144,13 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } this._super(); }, - load_form: function(data) { + on_loaded: function(data) { var self = this; if (!data) { throw new Error("No data provided."); } if (this.arch) { - throw "Form view does not support multiple calls to load_form"; + throw "Form view does not support multiple calls to on_loaded"; } this.fields_order = []; this.fields_view = data; @@ -214,9 +214,19 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM e.stopPropagation(); } }); - this.trigger('form_view_loaded', data); + return $.when(); }, + widgetAccesskey:function(){ + $(document).keydown(function(e){ + if(e.keyCode === $.ui.keyCode.ALT) { + $("[accesskey] span").addClass('accessactive'); + } + e.stopPropagation(); + }).keyup(function(e){ + $("[accesskey] span").removeClass('accessactive'); + }); + }, widgetFocused: function() { // Clear click flag if used to focus a widget this.__clicked_inside = false; @@ -2153,20 +2163,6 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w self.do_action(r); }); }, - - set_dimensions: function (height, width) { - // remove width css property - this.$el.css('width', ''); - // extract style (without width) - var old_style = this.$el.attr('style'); - // jQuery doesn't understand/use !important - var style = 'width:' + width + 'px !important;'; - if (old_style) { - style += old_style - } - this.$el.attr('style', style); - this.$el.css('minHeight', height); - } }); /** @@ -2545,13 +2541,6 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we focus: function($el) { this.$textarea.focus(); }, - set_dimensions: function (height, width) { - this._super(); - this.$textarea.css({ - width: width, - minHeight: height - }); - }, }); /** @@ -3172,9 +3161,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc return ! this.get("value"); }, focus: function () { - if (!this.get('effective_readonly')) { - this.$input.focus(); - } + this.$input.focus(); }, _quick_create: function() { this.no_ed = true; @@ -3351,23 +3338,6 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ controller.on('edit:before', self, function (e) { e.cancel = true; }); - var has_handle = _(controller.columns).find(function (column) { - if (!column instanceof instance.web.list.Handle) { - return false; - } - column.modifiers.tree_invisible = true; - column.invisible = '1'; - // remove from visibles - controller.visible_columns.splice( - controller.visible_columns.indexOf(column), - 1); - return true; - }); - if (has_handle) { - // recompute aggregates - controller.aggregate_columns = - _(controller.visible_columns).invoke('to_aggregate'); - } } } else if (view_type === "form") { if (self.get("effective_readonly")) { @@ -3603,7 +3573,6 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({ _template: 'One2Many.listview', init: function (parent, dataset, view_id, options) { this._super(parent, dataset, view_id, _.extend(options || {}, { - GroupsType: instance.web.form.One2ManyGroups, ListType: instance.web.form.One2ManyList })); this.on('edit:before', this, this.proxy('_before_edit')); @@ -3784,13 +3753,6 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({ }); } }); -instance.web.form.One2ManyGroups = instance.web.ListView.Groups.extend({ - setup_resequence_rows: function () { - if (!this.view.o2m.get('effective_readonly')) { - this._super.apply(this, arguments); - } - } -}); instance.web.form.One2ManyList = instance.web.ListView.List.extend({ pad_table_to: function (count) { if (!this.view.is_action_enabled('create')) { @@ -3851,7 +3813,7 @@ instance.web.form.One2ManyList = instance.web.ListView.List.extend({ instance.web.form.One2ManyFormView = instance.web.FormView.extend({ form_template: 'One2Many.formview', - load_form: function(data) { + on_loaded: function(data) { this._super(data); var self = this; this.$buttons.find('button.oe_form_button_create').click(function() { @@ -4061,7 +4023,7 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({ } this.list_view.m2m_field = this; var loaded = $.Deferred(); - this.list_view.on("list_view_loaded", self, function() { + this.list_view.on_loaded.add_last(function() { self.initial_is_loaded.resolve(); loaded.resolve(); }); @@ -4106,17 +4068,13 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in ); var self = this; pop.on("elements_selected", self, function(element_ids) { - var reload = false; - _(element_ids).each(function (id) { - if(! _.detect(self.dataset.ids, function(x) {return x == id;})) { - self.dataset.set_ids(self.dataset.ids.concat([id])); + _.each(element_ids, function(one_id) { + if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) { + self.dataset.set_ids([].concat(self.dataset.ids, [one_id])); self.m2m_field.dataset_changed(); - reload = true; + self.reload_content(); } }); - if (reload) { - self.reload_content(); - } }); }, do_activate_record: function(index, id) { @@ -4185,7 +4143,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend( } this.kanban_view.m2m = this; var loaded = $.Deferred(); - this.kanban_view.on("kanban_view_loaded",self,function() { + this.kanban_view.on_loaded.add_last(function() { self.initial_is_loaded.resolve(); loaded.resolve(); }); @@ -4409,7 +4367,7 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({ this.view_form.set_embedded_view(this.options.alternative_form_view); } this.view_form.appendTo(this.$el.find(".oe_popup_form")); - this.view_form.on("form_view_loaded", self, function() { + this.view_form.on_loaded.add_last(function() { var multi_select = self.row_id === null && ! self.options.disable_multiple_selection; self.$buttonpane.html(QWeb.render("AbstractFormPopup.buttons", { multi_select: multi_select, @@ -4520,7 +4478,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend } this.searchview = new instance.web.SearchView(this, this.dataset, false, search_defaults); - this.searchview.on('search_data', self, function(domains, contexts, groupbys) { + this.searchview.on_search.add(function(domains, contexts, groupbys) { if (self.initial_ids) { self.do_search(domains.concat([[["id", "in", self.initial_ids]], self.domain]), contexts, groupbys); @@ -4529,7 +4487,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend self.do_search(domains.concat([self.domain]), contexts.concat(self.context), groupbys); } }); - this.searchview.on("search_view_loaded", self, function() { + this.searchview.on_loaded.add_last(function () { self.view_list = new instance.web.form.SelectCreateListView(self, self.dataset, false, _.extend({'deletable': false, @@ -4546,7 +4504,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend }).pipe(function() { self.searchview.do_search(); }); - self.view_list.on("list_view_loaded", self, function() { + self.view_list.on_loaded.add_last(function() { self.$buttonpane.html(QWeb.render("SelectCreatePopup.search.buttons", {widget:self})); var $cbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-close"); $cbutton.click(function() { @@ -4559,7 +4517,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend }); }); }); - this.searchview.appendTo($(".oe_popup_search", self.$el)); + this.searchview.appendTo($(".oe_popup_list", self.$el)); }, do_search: function(domains, contexts, groupbys) { var self = this; @@ -4695,19 +4653,14 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance. var self = this; this._super(field_manager, node); this.binary_value = false; - this.useFileAPI = !!window.FileReader; - if (!this.useFileAPI) { - this.fileupload_id = _.uniqueId('oe_fileupload'); - $(window).on(this.fileupload_id, function() { - var args = [].slice.call(arguments).slice(1); - self.on_file_uploaded.apply(self, args); - }); - } + this.fileupload_id = _.uniqueId('oe_fileupload'); + $(window).on(this.fileupload_id, function() { + var args = [].slice.call(arguments).slice(1); + self.on_file_uploaded.apply(self, args); + }); }, stop: function() { - if (!this.useFileAPI) { - $(window).off(this.fileupload_id); - } + $(window).off(this.fileupload_id); this._super.apply(this, arguments); }, initialize_content: function() { @@ -4725,22 +4678,13 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance. return size.toFixed(2) + ' ' + units[i]; }, on_file_change: function(e) { - var self = this; - var file_node = e.target; - if ((this.useFileAPI && file_node.files.length) || (!this.useFileAPI && $(file_node).val() !== '')) { - if (this.useFileAPI) { - var file = file_node.files[0]; - var filereader = new FileReader(); - filereader.readAsDataURL(file); - filereader.onloadend = function(upload) { - var data = upload.target.result; - data = data.split(',')[1]; - self.on_file_uploaded(file.size, file.name, file.type, data); - }; - } else { - this.$el.find('form.oe_form_binary_form input[name=session_id]').val(this.session.session_id); - this.$el.find('form.oe_form_binary_form').submit(); - } + // TODO: on modern browsers, we could directly read the file locally on client ready to be used on image cropper + // http://www.html5rocks.com/tutorials/file/dndfiles/ + // http://deepliquid.com/projects/Jcrop/demos.php?demo=handler + + if ($(e.target).val() !== '') { + this.$el.find('form.oe_form_binary_form input[name=session_id]').val(this.session.session_id); + this.$el.find('form.oe_form_binary_form').submit(); this.$el.find('.oe_form_binary_progress').show(); this.$el.find('.oe_form_binary').hide(); } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 899bd614f76..b543b31e75e 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -631,9 +631,9 @@
+ t-attf-class="oe_list_header_#{column.widget or column.type} #{((options.sortable and column.tag !== 'button') ? 'oe_sortable' : null)}"> -
+ @@ -730,15 +730,15 @@
- +
+ type="button" class="oe_button oe_form_button_create" accesskey="C">Create - + or - Discard + Discard
@@ -1297,8 +1297,7 @@
+ contenteditable="true"/>
Date: Thu, 18 Oct 2012 18:13:53 +0530 Subject: [PATCH 023/364] [IMP] Added code for the notification numbers when number > 99 than infinity image will be display. bzr revid: psa@tinyerp.com-20121018124353-gf7h6t44lirh8rg3 --- addons/web/static/src/img/infinity.gif | Bin 0 -> 1049 bytes addons/web_kanban/static/src/xml/web_kanban.xml | 8 +++++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 addons/web/static/src/img/infinity.gif diff --git a/addons/web/static/src/img/infinity.gif b/addons/web/static/src/img/infinity.gif new file mode 100644 index 0000000000000000000000000000000000000000..509f6846a49113f176fc439f78eedec21ca5fbf6 GIT binary patch literal 1049 zcmbu8(Myz35XH}ChO#ERNfD9oxxQqSq(fw6AhOsN1R`vd^-vp*NC|?a6oiWzZWIyp z;)Mv6=wTsHf{<2%h#=w?5eY>ILeNVny+tqG&V2tu_hDg}nKQpR^X;+YJspQH?7=Sl z27)~wf(t=IkPu*z_rbg1HFyagmUKQi7n}ws!NF?P2X#R;s04+ziVxy~Xb=ekDh2oe z7oY(Wz<}D6rWTu74Vz=nd9U7!_pq^yobyh-6YpRYOsey$Ud1a6inZdrs2A}9GP2df zd8mhYa4M-OMrcwJi#ZOaHl?Y>X4pa&^Qm*<9Be<1Wu)pE9nO@*-bmh#D%#bsVPQib`pym987IW!%k$?Of%*KFGeG|AICBh z*vDbM#`m^ld_uE1zKYexMw{!gch(x)VMmBJG^H5YZW42ta4gNwfmfn=+-U@Y2AWe+_NN;RxtgfzBDwT4%Tq>2u$H(*ed^VfSWHRZrX*d0Cym)zNqh^)Nn@W&`Pwv=Km+jqN=t~}~?H?|Gil*voqL+80{Q2tH z;Y8=s{iyJHa&V%s-g5ua^o!I)f7F7+R63pOpZQb#{=PnSueH(PF9|;e_I;;*|Rf+BmV$~SHSTA literal 0 HcmV?d00001 diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index 5f9d9fdac11..6bfbc11d898 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -47,7 +47,13 @@
- + + + + + + +
  • From cf3f05d58b13cd6e32ba2ebcb1c710de078e70af Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Fri, 19 Oct 2012 11:10:52 +0530 Subject: [PATCH 024/364] [IMP]percentage in title. bzr revid: vme@tinyerp.com-20121019054052-valignwzrc4jao4v --- addons/web/static/src/js/chrome.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 3cb4437d1c3..62f55c439cf 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -236,6 +236,9 @@ instance.web.Loading = instance.web.Widget.extend({ this._super(parent); this.count = 0; this.blocked_ui = false; + this.old_title = document.title; + this.request_count = 0; + this.response_count = 0; this.session.on("request", this, this.request_call); this.session.on("response", this, this.response_call); this.session.on("response_failed", this, this.response_call); @@ -245,13 +248,19 @@ instance.web.Loading = instance.web.Widget.extend({ this._super(); }, request_call: function() { + this.request_count += 1; this.on_rpc_event(1); }, response_call: function() { + this.response_count += 1; this.on_rpc_event(-1); }, + loading_title:function(percentage){ + document.title = percentage + "% processed |" + this.old_title; + }, on_rpc_event : function(increment) { var self = this; + this.loading_title(parseInt(this.response_count * 100 / this.request_count)) if (!this.count && increment === 1) { // Block UI after 3s this.long_running_timer = setTimeout(function () { @@ -271,6 +280,7 @@ instance.web.Loading = instance.web.Widget.extend({ this.getParent().$el.addClass('oe_wait'); } else { this.count = 0; + document.title = this.old_title; clearTimeout(this.long_running_timer); // Don't unblock if blocked by somebody else if (self.blocked_ui) { From 5cd85cdeb27615d406467b239dbb485d5b4c2a72 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Fri, 19 Oct 2012 11:36:36 +0530 Subject: [PATCH 025/364] [IMP]Improved. bzr revid: psa@tinyerp.com-20121019060636-c0ojx04izoh1v6ix --- addons/web_kanban/static/src/xml/web_kanban.xml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index 6bfbc11d898..7e1ef68c632 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -48,11 +48,8 @@
    - - - - - + +
      From ba2697d34466fc19e5be5335a960ac4d6477c32f Mon Sep 17 00:00:00 2001 From: "Anand Patel (OpenERP)" Date: Fri, 19 Oct 2012 16:47:39 +0530 Subject: [PATCH 026/364] [IMP] Improved code for red button bounce effect when click on non-editable status bars bzr revid: pan@tinyerp.com-20121019111739-3snflq85acs4nxt6 --- addons/web/static/src/js/view_form.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index d096e15b51d..19f68a575de 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -207,12 +207,13 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } }); //bounce effect on red button when click on statusbar. - this.$el.find(".oe_form_field_status:not(.oe_form_status_clickable)").on('click', function (e) { - if((self.get("actual_mode") == "view")) { - var $button = self.$el.find(".oe_highlight:not(.oe_form_invisible)").css({'float':'left','clear':'none'}); + $(".oe_highlight:not(.oe_form_invisible)").wrap(""); + $(".oe_form_field_status:not(.oe_form_status_clickable)").on('click',function (e) { + // if((self.get("actual_mode") == "view")) { + var $button = $(".oe_highlight:not(.oe_form_invisible)")/*.css({'float':'left','white-space':'nowrap'})*/; $button.effect('bounce', {distance:18, times: 5}, 150); e.stopPropagation(); - } + // } }); this.trigger('form_view_loaded', data); return $.when(); From d6c28e5be7a0c4550d0e2b9cf8b241f52fb444a0 Mon Sep 17 00:00:00 2001 From: "Anand Patel (OpenERP)" Date: Mon, 22 Oct 2012 10:48:02 +0530 Subject: [PATCH 027/364] [IMP]More clean code bzr revid: pan@tinyerp.com-20121022051802-forh9rhexkd2x2y0 --- addons/web/static/src/js/view_form.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 9c5c40a321c..57620a9856f 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -209,11 +209,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM //bounce effect on red button when click on statusbar. $(".oe_highlight:not(.oe_form_invisible)").wrap(""); $(".oe_form_field_status:not(.oe_form_status_clickable)").on('click',function (e) { - // if((self.get("actual_mode") == "view")) { - var $button = $(".oe_highlight:not(.oe_form_invisible)")/*.css({'float':'left','white-space':'nowrap'})*/; + var $button = $(".oe_highlight:not(.oe_form_invisible)"); $button.effect('bounce', {distance:18, times: 5}, 150); e.stopPropagation(); - // } }); this.trigger('form_view_loaded', data); return $.when(); From 83bdf22d5f6b45851c7648010669fd7d90b2e9f9 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Mon, 22 Oct 2012 10:59:06 +0530 Subject: [PATCH 028/364] [IMP] Improved code. bzr revid: psa@tinyerp.com-20121022052906-hdpilxhxcss6jwgm --- addons/web/static/src/img/infinity.gif | Bin 1049 -> 0 bytes addons/web/static/src/img/infinity.png | Bin 0 -> 2816 bytes addons/web_kanban/static/src/xml/web_kanban.xml | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 addons/web/static/src/img/infinity.gif create mode 100644 addons/web/static/src/img/infinity.png diff --git a/addons/web/static/src/img/infinity.gif b/addons/web/static/src/img/infinity.gif deleted file mode 100644 index 509f6846a49113f176fc439f78eedec21ca5fbf6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1049 zcmbu8(Myz35XH}ChO#ERNfD9oxxQqSq(fw6AhOsN1R`vd^-vp*NC|?a6oiWzZWIyp z;)Mv6=wTsHf{<2%h#=w?5eY>ILeNVny+tqG&V2tu_hDg}nKQpR^X;+YJspQH?7=Sl z27)~wf(t=IkPu*z_rbg1HFyagmUKQi7n}ws!NF?P2X#R;s04+ziVxy~Xb=ekDh2oe z7oY(Wz<}D6rWTu74Vz=nd9U7!_pq^yobyh-6YpRYOsey$Ud1a6inZdrs2A}9GP2df zd8mhYa4M-OMrcwJi#ZOaHl?Y>X4pa&^Qm*<9Be<1Wu)pE9nO@*-bmh#D%#bsVPQib`pym987IW!%k$?Of%*KFGeG|AICBh z*vDbM#`m^ld_uE1zKYexMw{!gch(x)VMmBJG^H5YZW42ta4gNwfmfn=+-U@Y2AWe+_NN;RxtgfzBDwT4%Tq>2u$H(*ed^VfSWHRZrX*d0Cym)zNqh^)Nn@W&`Pwv=Km+jqN=t~}~?H?|Gil*voqL+80{Q2tH z;Y8=s{iyJHa&V%s-g5ua^o!I)f7F7+R63pOpZQb#{=PnSueH(PF9|;e_I;;*|Rf+BmV$~SHSTA diff --git a/addons/web/static/src/img/infinity.png b/addons/web/static/src/img/infinity.png new file mode 100644 index 0000000000000000000000000000000000000000..5424b856735eef58ef2049cf4a9a9df39008eed2 GIT binary patch literal 2816 zcmZ{mXHXO97KRfbK&YXGD!oV&Ab@TNhNe=5&>@i+LkU$#=m{t#G{H~=M5KxfDy2mk;OcXT-I zai~FueOy@ZaI%ruUm_TA#{M+m;8)#ze7oe(0aG3Du>fFu*slf#Q|)$snF&;zkVE}1 z575pwSwHk%I-a)iqD_xgB^UXSj|^Jvu{e*qJJeA?kd!}JxGR@gRP2)NBN!;(&x#%i zeu@|zVcys8rr%&ytOk~y3O0Fdd*t|YW0rfkCb!h#s_lYmp6DtImC*a+Yci2$R=xgY zscI``cJ3)9+kb8e-TP%dIjVQY)81*~ZmI;|0N_P>7$=N#`le#2fM6PyWV8nBP^5uh zfxh!iHpty_t`9WR1+1sVrlC2qIjvF(%kNhNr_)zBqnx?44Gvr)#E~Y=p1PYLlNOua zz#)*Nkz$QT;}-#DV#~l9p&CF9-$US!DK93ft|GmkV?qKW6+@lIz12F@UI}CPT7c7O z>3IuRqpL|3JSaEVrrlbH+DoeBB{S#@8yJ29X9hV2o;9Ko#@#g~)LbihK3p*rQI4N_ zi+7LF%1Ac>uF=`N-?;VrD0pTAw!?bOk2^2I8;Y&unMS=C$r$t;z(?tBctg^vZXIaQ zC|$l+*swO4>DA zq<7;svru?51Ypft{}{r!8y0f?Hq!^?d5<&i%8C%!$nBu1TOw!%fe?O%kbq1vtiSIo zlzUI{-O#$m>n>?mebvkBpc4@Q>zY&}1vOuN)dEw2&*9cTZ+cj^nW2zE3&*&-N)XJ@ z*2r620PI~5x58v}9Nw+T?oMARJ{MoIxqhC@>HzzE;Rj{|P=NK43$Z{YK$6N?_9bf2@ZN|%WRwHv~oZ?JdXb>27W==n13^E?;z=EBL*DWkJv|Z%yQU}eBhIG z{BC8xvFKxof)^7pB)Q<|!3H8JM`jx&L^7fdfeoLojEgY`5c7&0giw(7R|~Atv)jRQY9EsW zKeVW=m9O#y6KXDa3Z%l+`^>pV&ugFtAxT7?Yf^mmj%y$;moFx=j9#mURxE)9mhhHg zE-ZRpf=&GBexiN4d<=Y9y65rP5n(`6qF<0kA@>~POTF7bYLFncKbr2eQ-15&M>Ua8 zkgBH8J3X$!pM1R)f$C_kJ%}P(elFUO&r+?lE4w*+^n{jLe$mHTMy{}r?D+Kb@5z34 z@6*Jj3ANvt!r!F0FH0wfeN|P2Eg{CUD~v?-PK%Rk#Mk+HB~wy-f7n3rh~s9PHv>9J zu*-oh%M97l2iJh&lUAW|QXx!U7~> zcR@{}qo&QE`AbS7gbezbl5s3A;igsupny2INCh>bzd$8D^gce!$}3{4{5^=7aI8F# zozV>^GvWhx2sYtE{>DY>8>Bn+WuXF83+QKulger5t;df34iWzwXn*pjI%2#OO~3Qb z<3g5p9TAbhf=8$T!__Zpd|&LCg4A={+*`-vc;37+Z_iI; z+I}<9VVh@@{HB9Vr0qC<=kLQk!q?1lN=_-#YIjPt_RNO2& z#@To3B6y2n>79S{b2j4X`Pk^Mg^g-f>I$AXiBQ@Agc1zgu<8CPQjr=?39Tq9* zn(k{cuBUB~`BB_0>%Ml`P^3DpK|1_+p73M0wU?z!ec@eyst&fYw&Uu4yTq^;xZ<6z zTwW4b#H$u5ln|unS2_>IkAEsl(P+TDKSn&f$ZF!Oi_NY2*S=EN-cmd=tR_SkfA&)~ zQ5;r7JTStyTzVB}3akrh|JEQ(YlNeSA3e#}W@3rjA zp5J^QtMB+!{EX)aqQCpTSKeF^UB)TN`lfqA7BjZp2$cv<(HzAg?7d|e!zK|=CUato zze(Kaa;td!&ie2MAzn3(U@$TRGoaccZ@X(*mM=*V}rBhf$>`ajD z+xN5D5ixW787-_%6?i~5!ZS5$!T{!-z}&O8K+2dtDtnY#sGSnoiR_C|?ts!DcfdwF zH+p1o04yMwUp`l26JV7Aa7{XiU`3RG2KvGbC# zm?%Erp?AXg%oFkC1aq050Lq2(5~Ga6Fu>6kd%Eo; GiSZwO9{M2w literal 0 HcmV?d00001 diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index 7e1ef68c632..091f30bfa11 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -48,7 +48,7 @@
      - +
      From c429019b5c56ce1a835f0854834fb935e6cb6407 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Mon, 22 Oct 2012 11:45:53 +0530 Subject: [PATCH 029/364] [IMP] Click on openerp element then close resolution dialog. bzr revid: bth@tinyerp.com-20121022061553-icx3zjy0n678bemm --- addons/web/static/src/js/chrome.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index a039433f09b..41039749528 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -986,6 +986,10 @@ instance.web.WebClient = instance.web.Client.extend({ self.$el.on('contextmenu','.oe_logo',function(e) { instance.web.dialog($(QWeb.render('Resolution')),{ title: "OpenERP Resolution" }); + + $(self.$el).click(function(){ + $('.resolution').dialog('close'); + }) $('.resolution a').click(function() { self.$el.find('.oe_logo').css('width', $(this).attr('awidth')+"px"); self.$el.find('.oe_logo').css('height', $(this).attr('aheight')+"px"); From 0e82e9aa172b7464681d66c5dd5f8025d0a14118 Mon Sep 17 00:00:00 2001 From: "Anand Patel (OpenERP)" Date: Mon, 22 Oct 2012 18:48:42 +0530 Subject: [PATCH 030/364] Improved code for red_button_bounce effect bzr revid: pan@tinyerp.com-20121022131842-35qifgzyqkpviy4l --- addons/web/static/src/js/view_form.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 57620a9856f..5d7bf68920d 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -207,13 +207,17 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } }); //bounce effect on red button when click on statusbar. - $(".oe_highlight:not(.oe_form_invisible)").wrap(""); - $(".oe_form_field_status:not(.oe_form_status_clickable)").on('click',function (e) { - var $button = $(".oe_highlight:not(.oe_form_invisible)"); - $button.effect('bounce', {distance:18, times: 5}, 150); - e.stopPropagation(); - }); + this.on('load_record',this,function(){ + self.$el.find(".oe_form_field_status:not(.oe_form_status_clickable)").on('click',function (e) { + if(self.get("actual_mode") == "view") { + var $button = $(".oe_button.oe_form_button.oe_highlight:not(.oe_form_invisible)").wrap(""); + $button.effect('bounce', {distance:18, times: 5}, 150); + e.stopImmediatePropagation(); + } + }); + }) this.trigger('form_view_loaded', data); + return $.when(); }, widgetFocused: function() { From 17ce4c93b70b7e07059e306f57600dd2464d628f Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Mon, 22 Oct 2012 18:52:17 +0530 Subject: [PATCH 031/364] [IMP] css changes with sass. bzr revid: bth@tinyerp.com-20121022132217-13oz992sx88ouumn --- addons/web/static/src/css/base.css | 9 +++++---- addons/web/static/src/css/base.sass | 5 +++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 4dad3505d4b..b7952810c37 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2925,10 +2925,11 @@ div.ui-widget-overlay { -webkit-border-radius: 3px; border-radius: 3px; } + .resolution table { - width: 100%; - line-height: 20px; + width: 100%; + line-height: 20px; } .resolution table td { - valign: middle; -} \ No newline at end of file + valign: middle; +} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index a128fcec24b..f1176b3de40 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2313,5 +2313,10 @@ div.ui-widget-overlay .ui-corner-all @include radius(3px) +.resolution table + width: 100% + line-height: 20px + td + valign: middle // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: From 9121cb71b66c10b4cc15974417102efe065cbf3d Mon Sep 17 00:00:00 2001 From: Vishmita Date: Mon, 22 Oct 2012 18:59:25 +0530 Subject: [PATCH 032/364] [FIX]CSS changes with SASS bzr revid: vja@tinyerp.com-20121022132925-pijuxtt5z2icgrtj --- addons/web/static/src/css/base.sass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index a128fcec24b..871d23d084e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -431,6 +431,10 @@ $sheet-max-width: 860px .oe_image_medium > img max-width: 180px max-height: 180px + .oe_view_manager_current .accessactive + text-decoration: underline + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2) + font-weight: bold .oe_button.oe_link @include reset() img From 8351473832502b236f2232e6c7d2bc2a5c663a8f Mon Sep 17 00:00:00 2001 From: "Anand Patel (OpenERP)" Date: Tue, 23 Oct 2012 12:32:06 +0530 Subject: [PATCH 033/364] [IMP]Improved code for red_button bounce effecct on statusbar click bzr revid: pan@tinyerp.com-20121023070206-a5xbxbyut3ytgrs5 --- addons/web/static/src/js/view_form.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 30415be507f..7bb25d8bc4d 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -206,10 +206,10 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } }); //bounce effect on red button when click on statusbar. - this.on('load_record',this,function(){ + this.on('load_record',this,function(){ + var $button = self.$el.find(".oe_button.oe_form_button.oe_highlight:not(.oe_form_invisible)").css({'margin-left':'2px','float':'left','white-space':'nowrap'}); self.$el.find(".oe_form_field_status:not(.oe_form_status_clickable)").on('click',function (e) { if(self.get("actual_mode") == "view") { - var $button = $(".oe_button.oe_form_button.oe_highlight:not(.oe_form_invisible)").wrap(""); $button.effect('bounce', {distance:18, times: 5}, 150); e.stopImmediatePropagation(); } From 731ca3aaa3738c75f8ba724d816d7840f0f381ea Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Tue, 23 Oct 2012 14:08:56 +0530 Subject: [PATCH 034/364] [IMP]testing for chrome this code from runbot. bzr revid: vme@tinyerp.com-20121023083856-5jgq3dtdmp3e1m40 --- addons/web/static/src/js/chrome.js | 52 ++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 62f55c439cf..fd3434e2105 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -242,6 +242,58 @@ instance.web.Loading = instance.web.Widget.extend({ this.session.on("request", this, this.request_call); this.session.on("response", this, this.response_call); this.session.on("response_failed", this, this.response_call); + this.draw_favicon(50); + }, + draw_favicon: function(percentage){ + var self = this; + var canvas = this.get_canvas(); + var faviconImage = new Image(); + var context = canvas.getContext("2d"); + faviconImage.onload = function() { + console.log("Image Loaded"); + if (context) { + context.clearRect(0, 0, 16, 16); + // Draw shadow + context.beginPath(); + context.moveTo(canvas.width / 2, canvas.height / 2); + context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2), 0, Math.PI * 2, false); + context.fillStyle = "red"; + context.fill(); + // Draw background + context.beginPath(); + context.moveTo(canvas.width / 2, canvas.height / 2); + context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) - 2, 0, Math.PI * 2, false); + context.fillStyle = "yellow"; + context.fill(); + // Draw pie + if (percentage > 0) { + context.beginPath(); + context.moveTo(canvas.width / 2, canvas.height / 2); + context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) - 2, (-0.5) * Math.PI, (-0.5 + 2 * percentage / 100) * Math.PI, false); + context.lineTo(canvas.width / 2, canvas.height / 2); + context.fillStyle = "white"; + context.fill(); + } + var link = document.createElement('link'); + link.type = 'image/x-icon'; + link.rel = 'icon'; + link.href = canvas.toDataURL(); + var src = $('link[type="image/x-icon"]').attr("href"); + if (!src.match(/^data/)) { + faviconImage.crossOrigin = 'anonymous'; + } + document.getElementsByTagName('head')[0].appendChild(link); + console.log("canvas to url",canvas.toDataURL()); + } + } + faviconImage.src = $('link[type="image/x-icon"]').attr("href"); + console.log("favicon",faviconImage); + }, + get_canvas: function(){ + canvas = document.createElement("canvas"); + canvas.width = 16; + canvas.height = 16; + return canvas; }, destroy: function() { this.on_rpc_event(-this.count); From 790b07a83a3e88888853e7b42276b3e47a38ad4b Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 23 Oct 2012 14:40:01 +0530 Subject: [PATCH 035/364] [IMP] improved code bzr revid: tpa@tinyerp.com-20121023091001-a5z5utrnxv3tcbsk --- openerp/workflow/wkf_expr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/workflow/wkf_expr.py b/openerp/workflow/wkf_expr.py index bf9e99f00a4..16b186c904d 100644 --- a/openerp/workflow/wkf_expr.py +++ b/openerp/workflow/wkf_expr.py @@ -44,7 +44,7 @@ class Env(dict): def _eval_expr(cr, ident, workitem, action): ret=False assert action, 'You used a NULL action in a workflow, use dummy node instead.' - for line in filter(lambda action: action != "", action.split('\n')): + for line in filter(None, action.split('\n')): line = line.strip() uid=ident[0] model=ident[1] From 1ac38618d629c5af391909eca4a725ffcc992f1c Mon Sep 17 00:00:00 2001 From: Vishmita Date: Tue, 23 Oct 2012 14:59:45 +0530 Subject: [PATCH 036/364] [FIX]Improve code bzr revid: vja@tinyerp.com-20121023092945-4krp469jm3u5kzcy --- addons/web/static/src/css/base.css | 4 ++++ addons/web/static/src/css/base.sass | 2 +- addons/web/static/src/js/view_form.js | 4 ++-- addons/web/static/src/xml/base.xml | 8 ++++---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 9384a3ed8f6..eb70b150d76 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -394,6 +394,10 @@ .openerp .oe_image_medium > img { max-width: 180px; max-height: 180px; } + .openerp .oe_view_manager_current .accessactive:first-letter{ + text-decoration:underline; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + font-weight:bold; } .openerp .oe_button.oe_link { border: none; padding: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0beaaf901cc..70a9898022c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -434,7 +434,7 @@ $sheet-max-width: 860px .oe_image_medium > img max-width: 180px max-height: 180px - .oe_view_manager_current .accessactive + .oe_view_manager_current .accessactive:first-letter text-decoration: underline text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2) font-weight: bold diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 61cf6c8f02e..4c74b55206c 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -220,11 +220,11 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM widgetAccesskey:function(){ $(document).keydown(function(e){ if(e.keyCode === $.ui.keyCode.ALT) { - $("[accesskey] span").addClass('accessactive'); + $("[accesskey]").addClass('accessactive'); } e.stopPropagation(); }).keyup(function(e){ - $("[accesskey] span").removeClass('accessactive'); + $("[accesskey]").removeClass('accessactive'); }); }, widgetFocused: function() { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 11f04e93d8b..caba50416ad 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -751,15 +751,15 @@
      - +
      + type="button" class="oe_button oe_form_button_create" accesskey="C">Create       - + or - Discard + Discard
From 72f59ff45e937fa24895069c0b68c6ad9cfbe228 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Thu, 25 Oct 2012 15:01:11 +0200 Subject: [PATCH 037/364] [FIX] modules: avoid to have the docutils' warnings rendered inline. The html rendering of the __openerp__.py description is done using docutils. This patch removes the warnings that docutils inserts in the resulting document and log them. Docutils still generates spurious output on stderr though. (An alternative is to use the `report_level` option but in that case it seems we can never witness the warnings being created.) bzr revid: vmt@openerp.com-20121025130111-7l157hexh6ew9w34 --- openerp/addons/base/module/module.py | 31 +++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index 3484b40cee9..42b57b7c661 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -20,7 +20,10 @@ ############################################################################## import base64 +from docutils import io, nodes from docutils.core import publish_string +from docutils.transforms import Transform, writer_aux +from docutils.writers.html4css1 import Writer import imp import logging import re @@ -80,6 +83,32 @@ class module_category(osv.osv): 'visible' : 1, } +class MyFilterMessages(Transform): + """ + Custom docutils transform to remove `system message` for a document and + generate warnings. + + (The standard filter removes them based on some `report_level` passed in + the `settings_override` dictionary, but if we use it, we can't see them + and generate warnings.) + """ + + default_priority = 870 + + def apply(self): + for node in self.document.traverse(nodes.system_message): + _logger.warning("docutils' system message present: %s", str(node)) + node.parent.remove(node) + +class MyWriter(Writer): + """ + Custom docutils html4ccs1 writer that doesn't add the warnings to the + output document. + """ + + def get_transforms(self): + return [MyFilterMessages, writer_aux.Admonitions] + class module(osv.osv): _name = "ir.module.module" _rec_name = "shortdesc" @@ -100,7 +129,7 @@ class module(osv.osv): res = dict.fromkeys(ids, '') for module in self.browse(cr, uid, ids, context=context): overrides = dict(embed_stylesheet=False, doctitle_xform=False, output_encoding='unicode') - output = publish_string(source=module.description, writer_name='html', settings_overrides=overrides) + output = publish_string(source=module.description, settings_overrides=overrides, writer=MyWriter()) res[module.id] = output return res From e242773cac11363c1671c8a65de42a95d5cedc15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Grand-Guillaume?= Date: Thu, 25 Oct 2012 15:38:51 +0200 Subject: [PATCH 038/364] [IMP] For legal reason (forbiden to modify journal entries which belongs to a closed fy or period) : Forbid to modify the code of an account if journal entries have been already posted on this account. This cannot be simply 'configurable' since it can lead to a lack of confidence in OpenERP and this is what we want to change. bzr revid: joel.grandguillaume@camptocamp.com-20121025133851-3mnvsy9ltavys94k --- addons/account/account.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/addons/account/account.py b/addons/account/account.py index c9dd1950347..ebc5aa8af93 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -648,8 +648,19 @@ class account_account(osv.osv): raise osv.except_osv(_('Warning!'), _("You cannot change the type of account from '%s' to '%s' type as it contains journal items!") % (old_type,new_type,)) return True - def write(self, cr, uid, ids, vals, context=None): + # For legal reason (forbiden to modify journal entries which belongs to a closed fy or period), Forbid to modify + # the code of an account if journal entries have been already posted on this account. This cannot be simply + # 'configurable' since it can lead to a lack of confidence in OpenERP and this is what we want to change. + def _check_allow_code_change(self, cr, uid, ids, context=None): + line_obj = self.pool.get('account.move.line') + for account in self.browse(cr, uid, ids, context=context): + account_ids = self.search(cr, uid, [('id', 'child_of', [account.id])]) + if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]): + raise osv.except_osv(_('Warning !'), _("You cannot change the code of account which contains journal items!")) + return True + + def write(self, cr, uid, ids, vals, context=None): if context is None: context = {} if not ids: @@ -669,6 +680,8 @@ class account_account(osv.osv): self._check_moves(cr, uid, ids, "write", context=context) if 'type' in vals.keys(): self._check_allow_type_change(cr, uid, ids, vals['type'], context=context) + if 'code' in vals.keys(): + self._check_allow_code_change(cr, uid, ids, context=context) return super(account_account, self).write(cr, uid, ids, vals, context=context) def unlink(self, cr, uid, ids, context=None): From aef8541bc8e422dce8d718986f00f109c30ebc0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Grand-Guillaume?= Date: Thu, 25 Oct 2012 15:47:02 +0200 Subject: [PATCH 039/364] [IMP] Forbid to change type of account for 'consolidation' and 'view' if there is entries on it or his children. bzr revid: joel.grandguillaume@camptocamp.com-20121025134702-7px784iu3226qc0l --- addons/account/account.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index ebc5aa8af93..33150274bdf 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -633,8 +633,7 @@ class account_account(osv.osv): return True def _check_allow_type_change(self, cr, uid, ids, new_type, context=None): - group1 = ['payable', 'receivable', 'other'] - group2 = ['consolidation','view'] + group_dest = ['consolidation','view'] line_obj = self.pool.get('account.move.line') for account in self.browse(cr, uid, ids, context=context): old_type = account.type @@ -642,12 +641,12 @@ class account_account(osv.osv): if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]): #Check for 'Closed' type if old_type == 'closed' and new_type !='closed': - raise osv.except_osv(_('Warning!'), _("You cannot change the type of account from 'Closed' to any other type which contains journal items!")) - #Check for change From group1 to group2 and vice versa - if (old_type in group1 and new_type in group2) or (old_type in group2 and new_type in group1): - raise osv.except_osv(_('Warning!'), _("You cannot change the type of account from '%s' to '%s' type as it contains journal items!") % (old_type,new_type,)) - return True + raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from 'Closed' to any other type which contains journal items!")) + # Forbid to change an account type for group_dest if move are on it (or his children) + if (new_type in group_dest): + raise osv.except_osv(_('Warning !'), _("You cannot change the type of account for '%s' type as it contains journal items!") % (new_type,)) + return True # For legal reason (forbiden to modify journal entries which belongs to a closed fy or period), Forbid to modify # the code of an account if journal entries have been already posted on this account. This cannot be simply From 8132259454bf6b19b9f740510a21cf087a112dff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Grand-Guillaume?= Date: Fri, 26 Oct 2012 10:49:58 +0200 Subject: [PATCH 040/364] [IMP] Add a constraints on reconcile object to forbid the reconciliation between different partner [IMP] Add a constraint on account move: you cannot pickup a date that is not in the fiscal year of the concerned period bzr revid: joel.grandguillaume@camptocamp.com-20121026084958-nlcoqlav00l42gwr --- addons/account/account.py | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/addons/account/account.py b/addons/account/account.py index 33150274bdf..f3ba38fee8d 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1313,6 +1313,14 @@ class account_move(osv.osv): 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id, } + def _check_fiscal_year(self, cursor, user, ids): + for move in self.browse(cursor, user, ids): + date_start = move.period_id.fiscalyear_id.date_start + date_stop = move.period_id.fiscalyear_id.date_stop + if move.date < date_start or move.date > date_stop: + return False + return True + def _check_centralisation(self, cursor, user, ids, context=None): for move in self.browse(cursor, user, ids, context=context): if move.journal_id.centralisation: @@ -1328,6 +1336,9 @@ class account_move(osv.osv): (_check_centralisation, 'You cannot create more than one move per period on a centralized journal.', ['journal_id']), + (_check_fiscal_year, + 'You cannot create entries with date not in the fiscal year of the chosen period', + ['line_id','']), ] def post(self, cr, uid, ids, context=None): @@ -1686,7 +1697,25 @@ class account_move_reconcile(osv.osv): _defaults = { 'name': lambda self,cr,uid,ctx=None: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile', context=ctx) or '/', } + + # Look in the line_id and line_partial_ids to ensure the partner is the same or empty + # on all lines + def _check_same_partner(self, cr, uid, ids, context=None): + for reconcile in self.browse(cr, uid, ids, context=context): + if reconcile.line_id: + first_partner = reconcile.line_id[0].partner_id.id + move_lines = reconcile.line_id + elif reconcile.line_partial_ids: + first_partner = reconcile.line_partial_ids[0].partner_id.id + move_lines = reconcile.line_partial_ids + if any([line.partner_id.id != first_partner for line in move_lines]): + return False + return True + _constraints = [ + (_check_same_partner, 'You can only reconcile moves where the partner (we mean ID) is the same or empty on all entries.', ['line_id']), + ] + def reconcile_partial_check(self, cr, uid, ids, type='auto', context=None): total = 0.0 for rec in self.browse(cr, uid, ids, context=context): From eaf53213da2ba6bb0e620d8eadc58e33016e2aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Grand-Guillaume?= Date: Fri, 26 Oct 2012 11:12:42 +0200 Subject: [PATCH 041/364] [IMP] Forbid the user to delete any move linked to an invoice. Cancelling invoice still work obviously bzr revid: joel.grandguillaume@camptocamp.com-20121026091242-9fu2a4do0ra50fqu --- addons/account/account.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/account/account.py b/addons/account/account.py index f3ba38fee8d..330e3f2d742 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1485,6 +1485,11 @@ class account_move(osv.osv): raise osv.except_osv(_('User Error!'), _('You cannot delete a posted journal entry "%s".') % \ move['name']) + for line in move.line_id: + if line.invoice: + raise osv.except_osv(_('User Error!'), + _("Move cannot be deleted if linked to an invoice: %s : Move ID:%s.") % \ + (line.invoice.number,move.name)) line_ids = map(lambda x: x.id, move.line_id) context['journal_id'] = move.journal_id.id context['period_id'] = move.period_id.id From 87be45dcd659384b6f63c7dc2e15a2efc5730d13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Grand-Guillaume?= Date: Fri, 26 Oct 2012 12:51:32 +0200 Subject: [PATCH 042/364] [IMP] For manual entries when multicurrency : a - Validation on the use of the 'Currency' and 'Currency Amount' fields as it is possible to enter one without the other b - Validation to prevent a Credit amount with a positive 'Currency Amount', or a Debit with a negative 'Currency Amount' bzr revid: joel.grandguillaume@camptocamp.com-20121026105132-6x0zh3gc823h3b68 --- addons/account/account_move_line.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 67a55d8f451..ffb9bb3ef0c 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -613,12 +613,27 @@ class account_move_line(osv.osv): return False return True + def _check_currency_and_amount(self, cr, uid, ids, context=None): + for l in self.browse(cr, uid, ids, context=context): + if (l.currency_id and not l.amount_currency) or (not l.currency_id and l.amount_currency): + return False + return True + + def _check_currency_amount(self, cr, uid, ids, context=None): + for l in self.browse(cr, uid, ids, context=context): + if l.amount_currency: + if (l.amount_currency > 0.0 and l.credit > 0.0) or (l.amount_currency < 0.0 and l.debit > 0.0): + return False + return True + _constraints = [ (_check_no_view, 'You cannot create journal items on an account of type view.', ['account_id']), (_check_no_closed, 'You cannot create journal items on closed account.', ['account_id']), (_check_company_id, 'Account and Period must belong to the same company.', ['company_id']), (_check_date, 'The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal.', ['date']), (_check_currency, 'The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal.', ['currency_id']), + (_check_currency_and_amount, "You cannot create journal items with a secondary currency without recording both 'currency' and 'amount currency' field.", ['currency_id','amount_currency']), + (_check_currency_amount, 'The amount expressed in the secondary currency must be positif when journal item are debit and negatif when journal item are credit.', ['amount_currency']), ] #TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id From 72805c8ad407f7d1904233dd03fe8bcf943f4a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Grand-Guillaume?= Date: Fri, 26 Oct 2012 13:06:31 +0200 Subject: [PATCH 043/364] [IMP] Add a check on entries that user cannot provide a secondary currency if the same than the company one. bzr revid: joel.grandguillaume@camptocamp.com-20121026110631-vz7vx4ae0axabh14 --- addons/account/account_move_line.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index ffb9bb3ef0c..147fe7f76a4 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -626,6 +626,12 @@ class account_move_line(osv.osv): return False return True + def _check_currency_company(self, cr, uid, ids, context=None): + for l in self.browse(cr, uid, ids, context=context): + if l.currency_id.id == l.company_id.currency_id.id: + return False + return True + _constraints = [ (_check_no_view, 'You cannot create journal items on an account of type view.', ['account_id']), (_check_no_closed, 'You cannot create journal items on closed account.', ['account_id']), @@ -634,6 +640,7 @@ class account_move_line(osv.osv): (_check_currency, 'The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal.', ['currency_id']), (_check_currency_and_amount, "You cannot create journal items with a secondary currency without recording both 'currency' and 'amount currency' field.", ['currency_id','amount_currency']), (_check_currency_amount, 'The amount expressed in the secondary currency must be positif when journal item are debit and negatif when journal item are credit.', ['amount_currency']), + (_check_currency_company, "You can't provide a secondary currency if the same than the company one." , ['currency_id']), ] #TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id From 9527a10ba50520bade31e8be081aa200bf0dcced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Grand-Guillaume?= Date: Fri, 26 Oct 2012 13:16:41 +0200 Subject: [PATCH 044/364] [IMP] Forbid to change the journal of a bank statement if you already have a line in it. This is done in the voucher, cause this is the case that break : when voucher is created and you change the journal, it'll result in having entries generated on various journal which is not consistent. bzr revid: joel.grandguillaume@camptocamp.com-20121026111641-a0lg5h1mcyh1tit7 --- addons/account_voucher/account_voucher.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index f25318727df..3e9fe15d3d1 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -1532,7 +1532,17 @@ class account_bank_statement(osv.osv): }) return move_line_obj.write(cr, uid, [x.id for x in v.move_ids], {'statement_id': st_line.statement_id.id}, context=context) - return super(account_bank_statement, self).create_move_from_st_line(cr, uid, st_line.id, company_currency_id, next_number, context=context) + + def write(self, cr, uid, ids, vals, context=None): + # We should not be able to change the journal if we already have + # bank statement line generated in case we use the voucher. This is because + # the import feature will write the current used journal. That lead to crap + # cause we should not be able to do that... A bank statement is by definition linked + # to one journal ! + for bk_st in self.browse(cr, uid, ids, context=context): + if vals.get('journal_id', False) and bk_st.line_ids: + raise osv.except_osv(_('Unable to change journal !'), _('You can not change the journal if you already generated lines !')) + return super(account_bank_statement, self).write(cr, uid, ids, vals, context=context) account_bank_statement() From 6ef3db0a864612cc54be4a4dec2c9247ef5d7157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Grand-Guillaume?= Date: Fri, 26 Oct 2012 13:35:02 +0200 Subject: [PATCH 045/364] [FIX] Do not provide a secondary currency when posting entries from bank statment if the same than the company to respect the new constraints. bzr revid: joel.grandguillaume@camptocamp.com-20121026113502-jsxdf5swqfizfcen --- addons/account/account_bank_statement.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 48082451f35..68d1f3279f3 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -311,7 +311,7 @@ class account_bank_statement(osv.osv): 'statement_id': st_line.statement_id.id, 'journal_id': st_line.statement_id.journal_id.id, 'period_id': st_line.statement_id.period_id.id, - 'currency_id': cur_id, + 'currency_id': amount_currency and cur_id, 'amount_currency': amount_currency, 'analytic_account_id': analytic_id, } From 19e1d840c4264f96e99e424260f44a701a7564b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Grand-Guillaume?= Date: Fri, 26 Oct 2012 14:29:21 +0200 Subject: [PATCH 046/364] [IMP] Add contraint for Payment Order : If a invoice is imported in a payment order, forbid to reset invoice to cancel or draft bzr revid: joel.grandguillaume@camptocamp.com-20121026122921-fdlrothxta992cd3 --- addons/account_payment/account_invoice.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/addons/account_payment/account_invoice.py b/addons/account_payment/account_invoice.py index 7138540fa3b..60085a890c7 100644 --- a/addons/account_payment/account_invoice.py +++ b/addons/account_payment/account_invoice.py @@ -20,12 +20,29 @@ ############################################################################## from datetime import datetime - +from tools.translate import _ from osv import fields, osv class Invoice(osv.osv): _inherit = 'account.invoice' + # Forbid to cancel an invoice if the related move lines have already been + # used in a payment order. The risk is that importing the payment line + # in the bank statement will result in a crash cause no more move will + # be found in the payment line + def action_cancel(self, cr, uid, ids, *args): + payment_line_obj = self.pool.get('payment.line') + invoices = self.browse(cr, uid, ids) + for inv in invoices: + inv_mv_lines = map(lambda x: x.id, inv.move_id.line_id) + pl_line_ids = payment_line_obj.search(cr, uid, [('move_line_id','in',inv_mv_lines)]) + if pl_line_ids: + pay_line = payment_line_obj.browse(cr,uid,pl_line_ids) + payment_order_name = ','.join(map(lambda x: x.order_id.reference, pay_line)) + raise osv.except_osv(_('Error!'), _("You cannot cancel an invoice which has already been imported in a payment order. Remove it from the following payment order : %s."%(payment_order_name))) + result = super(Invoice, self).action_cancel(cr, uid, ids, *args) + return result + def _amount_to_pay(self, cursor, user, ids, name, args, context=None): '''Return the amount still to pay regarding all the payment orders''' if not ids: From 227738dedb586128eac1753795bc85d806ee127d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Grand-Guillaume?= Date: Fri, 26 Oct 2012 15:54:15 +0200 Subject: [PATCH 047/364] [IMP] Forbid to remove the reconcile on opening entries, we introduce a new boolean field to identify the reconciliation made by the closing process from others. bzr revid: joel.grandguillaume@camptocamp.com-20121026135415-k1q0yq5zxngmfm5k --- addons/account/account.py | 31 +++++++++++++------ addons/account/account_move_line.py | 4 ++- .../wizard/account_fiscalyear_close.py | 4 +-- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 330e3f2d742..2e60c47d758 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1698,23 +1698,36 @@ class account_move_reconcile(osv.osv): 'line_id': fields.one2many('account.move.line', 'reconcile_id', 'Entry Lines'), 'line_partial_ids': fields.one2many('account.move.line', 'reconcile_partial_id', 'Partial Entry lines'), 'create_date': fields.date('Creation date', readonly=True), + 'opening_reconcile': fields.boolean('Opening entries reconciliation', help="Is this reconciliation produced by the opening of a new fiscal year ?."), } _defaults = { 'name': lambda self,cr,uid,ctx=None: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile', context=ctx) or '/', + 'opening_reconcile': 0, } + # You cannot unlink a reconciliation if it is a opening_reconcile one, + # you should use the generate opening entries wizard for that + def unlink(self, cr, uid, ids, context=None): + for move_rec in self.browse(cr, uid, ids): + if move_rec.opening_reconcile: + raise osv.except_osv(_('Error!'), _('You cannot unreconcile journal items if they has been generated by the \ + opening/closing fiscal year process.')) + return super(account_move_reconcile, self).unlink(cr, uid, ids, context=context) + # Look in the line_id and line_partial_ids to ensure the partner is the same or empty - # on all lines + # on all lines. We allow that only for opening/closing period def _check_same_partner(self, cr, uid, ids, context=None): for reconcile in self.browse(cr, uid, ids, context=context): - if reconcile.line_id: - first_partner = reconcile.line_id[0].partner_id.id - move_lines = reconcile.line_id - elif reconcile.line_partial_ids: - first_partner = reconcile.line_partial_ids[0].partner_id.id - move_lines = reconcile.line_partial_ids - if any([line.partner_id.id != first_partner for line in move_lines]): - return False + move_lines = [] + if not reconcile.opening_reconcile: + if reconcile.line_id: + first_partner = reconcile.line_id[0].partner_id.id + move_lines = reconcile.line_id + elif reconcile.line_partial_ids: + first_partner = reconcile.line_partial_ids[0].partner_id.id + move_lines = reconcile.line_partial_ids + if any([line.partner_id.id != first_partner for line in move_lines]): + return False return True _constraints = [ diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 147fe7f76a4..ed6b9caf9a8 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -1126,7 +1126,7 @@ class account_move_line(osv.osv): 'has been confirmed.') % res[2]) return res - def _remove_move_reconcile(self, cr, uid, move_ids=None, context=None): + def _remove_move_reconcile(self, cr, uid, move_ids=None, opening_reconcile=False, context=None): # Function remove move rencocile ids related with moves obj_move_line = self.pool.get('account.move.line') obj_move_rec = self.pool.get('account.move.reconcile') @@ -1141,6 +1141,8 @@ class account_move_line(osv.osv): unlink_ids += rec_ids unlink_ids += part_rec_ids if unlink_ids: + if opening_reconcile: + obj_move_rec.write(cr, uid, unlink_ids, {'opening_reconcile':False}) obj_move_rec.unlink(cr, uid, unlink_ids) return True diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py index 196c14d3792..60a2e486948 100644 --- a/addons/account/wizard/account_fiscalyear_close.py +++ b/addons/account/wizard/account_fiscalyear_close.py @@ -60,7 +60,7 @@ class account_fiscalyear_close(osv.osv_memory): cr.execute('select distinct(company_id) from account_move_line where id in %s',(tuple(ids),)) if len(cr.fetchall()) > 1: raise osv.except_osv(_('Warning!'), _('The entries to reconcile should belong to the same company.')) - r_id = self.pool.get('account.move.reconcile').create(cr, uid, {'type': 'auto'}) + r_id = self.pool.get('account.move.reconcile').create(cr, uid, {'type': 'auto', 'opening_reconcile':True}) cr.execute('update account_move_line set reconcile_id = %s where id in %s',(r_id, tuple(ids),)) return r_id @@ -107,7 +107,7 @@ class account_fiscalyear_close(osv.osv_memory): ('journal_id', '=', new_journal.id), ('period_id', '=', period.id)]) if move_ids: move_line_ids = obj_acc_move_line.search(cr, uid, [('move_id', 'in', move_ids)]) - obj_acc_move_line._remove_move_reconcile(cr, uid, move_line_ids, context=context) + obj_acc_move_line._remove_move_reconcile(cr, uid, move_line_ids, opening_reconcile=True, context=context) obj_acc_move_line.unlink(cr, uid, move_line_ids, context=context) obj_acc_move.unlink(cr, uid, move_ids, context=context) From d31003fc4c96df3104b2e414d29870bda60d39fa Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Mon, 29 Oct 2012 10:44:36 +0530 Subject: [PATCH 048/364] [IMP]Improved code for image set in old password and new password field bzr revid: ggh@tinyerp.com-20121029051436-r2j03sdzwg155beb --- addons/web/static/src/css/base.css | 12 ++++++++++-- addons/web/static/src/css/base.sass | 7 +++++++ addons/web/static/src/js/chrome.js | 2 ++ addons/web/static/src/xml/base.xml | 16 ++++++++-------- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index cbbd8e37f6c..5311a844f2f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -25,7 +25,6 @@ display: none !important; } } - .openerp.openerp_webclient_container { height: 100%; } @@ -45,7 +44,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -527,6 +526,15 @@ .openerp .oe_grey { color: #aaaaaa; } +.openerp .oe_placeImage_old input { + background: url(/web/static/src/img/old_key.png) no-repeat 4px; +} +.openerp .oe_placeImage_new input { + background: url(/web/static/src/img/new_key.png) no-repeat 4px; +} +.openerp .oe_padding_left input { + padding-left: 22px; +} .openerp .oe_tag { border: 1px solid #afafb6; font-size: 11px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2ef9a8a451d..3b91693ba8c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -462,6 +462,13 @@ $sheet-max-width: 860px // }}} + .oe_placeImage_old input + background: url(/web/static/src/img/old_key.png) no-repeat 4px + .oe_placeImage_new input + background: url(/web/static/src/img/new_key.png) no-repeat 4px + .oe_padding_left input + padding-left: 22px + // Tags (for many2many tags, among others) {{{ .oe_tag border: 1px solid $tag-border diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 6cf35a14e92..48a95e98f1a 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -329,6 +329,8 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ self.$el.find("form[name=drop_db_form]").validate({ submitHandler: self.do_drop }); self.$el.find("form[name=backup_db_form]").validate({ submitHandler: self.do_backup }); self.$el.find("form[name=restore_db_form]").validate({ submitHandler: self.do_restore }); + self.$el.find("form td input[name=old_pwd]").css('background','url(/web/static/src/img/old_key.png) no-repeat 4px'); + self.$el.find("form td input[name=new_pwd]").css('background','url(/web/static/src/img/new_key.png) no-repeat 4px'); self.$el.find("form[name=change_pwd_form]").validate({ messages: { old_pwd: "Please enter your previous password", diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 9880abd20f7..530365a800f 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -255,15 +255,15 @@ - + - + - +
@@ -291,17 +291,17 @@ - + - + - From 0243d319ea1f535bb84f7370fbc288829d5382e5 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Mon, 29 Oct 2012 10:51:24 +0530 Subject: [PATCH 049/364] Add Images of old/new password key bzr revid: ggh@tinyerp.com-20121029052124-qumygdrw2eqqb8z2 --- addons/web/static/src/img/new_key.png | Bin 0 -> 392 bytes addons/web/static/src/img/old_key.png | Bin 0 -> 504 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 addons/web/static/src/img/new_key.png create mode 100644 addons/web/static/src/img/old_key.png diff --git a/addons/web/static/src/img/new_key.png b/addons/web/static/src/img/new_key.png new file mode 100644 index 0000000000000000000000000000000000000000..9e167c3d54af7df5dad4576e0cd399ac15c07419 GIT binary patch literal 392 zcmV;30eAk1P)DcNCQc$E+;F3dg5WGpIymZqvru<8!NpMr5B~r+(aEn-H^D{haHTa(ny;o! zdTr%a*H{sy_O7-1gANHi&-=c8V;B{|crZzb*l`>vOw-iG4`Y6ZakOmI1;U_R21}A_ zrPNfVz_#I#K&ezG$?Nx-F?m_pKE|R`7BCj-I8J}ujTGdqwI~aZ>qe**BuUa{EIR$S zAPC|)O2hj)uxCS`b9GSh57Z(;0jU#s9zBnubbbi7ENdJ>yjBMTfS-hj&8q#cxGr(Z zP`7*X=KH~!=aDUh*aGL-%m|n+xh}paf|N#w`M&o#m%CvYuM(0>S5yvX0U$?3IDg8I zS(Z&0O@a{JE5fb|#YZ)*_1Ld)-um_nz`ZXxpY_J`*hZtuN)1~1O0Ej4!W+-@2r@K6-6P!5@N9!B9RC} zp%A>@U0hz~(d+fh0psx)4-b#9+wIK3Xf#Hn(LgX5gw19{CX+$G-~S(=>m$_b_gG!E zqgt&pN3+=snx-)~KHnbl`NIDI!!XclwU~qR^BlAM38CaU!DU7gLjn6B6fCs;P`ECR(fOI+o zerp>Wn;uxLR^)OQh{sQnOeU90q1k-K*;xV}4~Lr@k=bvzUqH{70vN`Ww5rQKO(3vO ugiSUFG?q%?b8uu?fhdY(mlwYJeSHAz7piCmUZ1%D0000 Date: Mon, 29 Oct 2012 13:35:46 +0530 Subject: [PATCH 050/364] [Imp] improved code bzr revid: ggh@tinyerp.com-20121029080546-mwi5wdcs6n1scol5 --- addons/web/static/src/css/base.css | 7 +++---- addons/web/static/src/css/base.sass | 6 +++--- addons/web/static/src/xml/base.xml | 14 +++++++------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 5311a844f2f..a96ce317276 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -526,13 +526,12 @@ .openerp .oe_grey { color: #aaaaaa; } -.openerp .oe_placeImage_old input { +.openerp .oe_keyImage_old_pwd input { background: url(/web/static/src/img/old_key.png) no-repeat 4px; + padding-left: 22px; } -.openerp .oe_placeImage_new input { +.openerp .oe_keyImage_new_pwd input { background: url(/web/static/src/img/new_key.png) no-repeat 4px; -} -.openerp .oe_padding_left input { padding-left: 22px; } .openerp .oe_tag { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3b91693ba8c..22289f088c6 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -462,11 +462,11 @@ $sheet-max-width: 860px // }}} - .oe_placeImage_old input + .oe_keyImage_old_pwd input background: url(/web/static/src/img/old_key.png) no-repeat 4px - .oe_placeImage_new input + padding-left: 22px + .oe_keyImage_new_pwd input background: url(/web/static/src/img/new_key.png) no-repeat 4px - .oe_padding_left input padding-left: 22px // Tags (for many2many tags, among others) {{{ diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 530365a800f..536c794c58d 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -255,15 +255,15 @@
- + - + - +
@@ -291,18 +291,18 @@ - - - + From 5d6e4af5294ba96772a10a21ac4f1c5a2d15ed80 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 29 Oct 2012 15:59:01 +0530 Subject: [PATCH 051/364] [IMP]implement favicon basis on percentage of request and response. bzr revid: vme@tinyerp.com-20121029102901-e3j6bmgbko94z0mz --- addons/web/static/src/js/chrome.js | 161 +++++++++++++++++------------ 1 file changed, 95 insertions(+), 66 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index fd3434e2105..39b93e0937a 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -229,71 +229,18 @@ instance.web.CrashManager = instance.web.CallbackEnabled.extend({ }); }, }); - instance.web.Loading = instance.web.Widget.extend({ template: 'Loading', init: function(parent) { this._super(parent); + var self = this; this.count = 0; this.blocked_ui = false; - this.old_title = document.title; this.request_count = 0; this.response_count = 0; this.session.on("request", this, this.request_call); this.session.on("response", this, this.response_call); this.session.on("response_failed", this, this.response_call); - this.draw_favicon(50); - }, - draw_favicon: function(percentage){ - var self = this; - var canvas = this.get_canvas(); - var faviconImage = new Image(); - var context = canvas.getContext("2d"); - faviconImage.onload = function() { - console.log("Image Loaded"); - if (context) { - context.clearRect(0, 0, 16, 16); - // Draw shadow - context.beginPath(); - context.moveTo(canvas.width / 2, canvas.height / 2); - context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2), 0, Math.PI * 2, false); - context.fillStyle = "red"; - context.fill(); - // Draw background - context.beginPath(); - context.moveTo(canvas.width / 2, canvas.height / 2); - context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) - 2, 0, Math.PI * 2, false); - context.fillStyle = "yellow"; - context.fill(); - // Draw pie - if (percentage > 0) { - context.beginPath(); - context.moveTo(canvas.width / 2, canvas.height / 2); - context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) - 2, (-0.5) * Math.PI, (-0.5 + 2 * percentage / 100) * Math.PI, false); - context.lineTo(canvas.width / 2, canvas.height / 2); - context.fillStyle = "white"; - context.fill(); - } - var link = document.createElement('link'); - link.type = 'image/x-icon'; - link.rel = 'icon'; - link.href = canvas.toDataURL(); - var src = $('link[type="image/x-icon"]').attr("href"); - if (!src.match(/^data/)) { - faviconImage.crossOrigin = 'anonymous'; - } - document.getElementsByTagName('head')[0].appendChild(link); - console.log("canvas to url",canvas.toDataURL()); - } - } - faviconImage.src = $('link[type="image/x-icon"]').attr("href"); - console.log("favicon",faviconImage); - }, - get_canvas: function(){ - canvas = document.createElement("canvas"); - canvas.width = 16; - canvas.height = 16; - return canvas; }, destroy: function() { this.on_rpc_event(-this.count); @@ -307,12 +254,8 @@ instance.web.Loading = instance.web.Widget.extend({ this.response_count += 1; this.on_rpc_event(-1); }, - loading_title:function(percentage){ - document.title = percentage + "% processed |" + this.old_title; - }, on_rpc_event : function(increment) { var self = this; - this.loading_title(parseInt(this.response_count * 100 / this.request_count)) if (!this.count && increment === 1) { // Block UI after 3s this.long_running_timer = setTimeout(function () { @@ -323,16 +266,10 @@ instance.web.Loading = instance.web.Widget.extend({ this.count += increment; if (this.count > 0) { - if (instance.session.debug) { - this.$el.text(_.str.sprintf( _t("Loading (%d)"), this.count)); - } else { - this.$el.text(_t("Loading")); - } - this.$el.show(); + this.draw_favicon(parseInt(this.response_count * 100 / this.request_count)); this.getParent().$el.addClass('oe_wait'); } else { this.count = 0; - document.title = this.old_title; clearTimeout(this.long_running_timer); // Don't unblock if blocked by somebody else if (self.blocked_ui) { @@ -341,10 +278,102 @@ instance.web.Loading = instance.web.Widget.extend({ } this.$el.fadeOut(); this.getParent().$el.removeClass('oe_wait'); + this.stop_favicon(); } } }); - +instance.web.favicon = instance.web.Loading.include({ + init: function(parent){ + this._super(parent); + var self = this; + this.original_favi = $('link[type="image/x-icon"]'); + this.canvas = null; + this.link = null; + this.interval = null; + this.old_title = document.title; + this.local_counter = 0; + this.options = { + 'border':"white", + 'background' :"gray", + 'inner_circle':"white", + 'fill_color':"red", + 'width': 5 + } + }, + start_favicon: function(second, options){ + var count = 0; + var self = this; + this.interval = setInterval(function(){ + if (++count > 100) {self.stop_favicon(); return false;} + self.draw_favicon(count, options); + }, second || 1); + }, + stop_favicon: function(){ + if(this.interval) + clearInterval(this.interval); + $('link[type="image/x-icon"]').attr('href', this.original_favi.attr("href")); + $('head').append(this.original_favi); + document.title = this.old_title; + }, + loading_title:function(percentage){ + document.title = percentage + "% processed |" + this.old_title; + }, + draw_favicon: function(percentage, options){ + var self = this; + var options = _.extend(this.options, options || {}); + var get_canvas = function(){ + if(!this.canvas){ + this.canvas = document.createElement("canvas"); + this.canvas.width = 16; + this.canvas.height = 16; + } + return this.canvas; + }; + var get_link = function(canvas_url){ + if(!this.link) + this.link = $('').attr({ type : 'image/x-icon',rel : 'icon'}); + $(this.link).attr('href',canvas_url); + return this.link; + }; + var canvas = get_canvas(); + var src = self.original_favi.attr("href"); + var faviconImage = new Image(); + var context = canvas.getContext("2d"); + var draw_context = function(context, x, y, r, sAngle, eAngle, counterclockwise ,color){ + context.beginPath(); + context.moveTo(canvas.width / 2, canvas.height / 2); + context.arc(x, y, r, sAngle, eAngle, counterclockwise); + context.fillStyle = color ; + context.fill(); + return context + } + faviconImage.onload = function() { + if (context) { + context.clearRect(0, 0, 16, 16); + // Draw shadow + draw_context(context,canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) + 2, 0, Math.PI * 2, false ,options.border) + // Draw background + draw_context(context, canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) , 0, Math.PI * 2, false,options.background) + // Draw pie + if (percentage > 0) { + draw_context(context, canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) , (-0.5) * Math.PI, (-0.5 + 2 * percentage / 100) * Math.PI, false,options.fill_color); + context.lineTo(canvas.width / 2, canvas.height / 2) + } + //Inner Circle + draw_context(context, canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) - options.width, 0, Math.PI * 2, false, options.inner_circle) + if (!src.match(/^data/)) { + faviconImage.crossOrigin = 'anonymous'; + } + if(self.count > 0 ){ + $('link[type="image/x-icon"]').remove(); + $('head').append(get_link(canvas.toDataURL())); + } + } + } + this.loading_title(percentage); + faviconImage.src = self.original_favi.attr("href"); + }, +}); instance.web.DatabaseManager = instance.web.Widget.extend({ init: function(parent) { this._super(parent); From a5505925bd63ea7885b3221b282401a495deaf56 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 29 Oct 2012 17:27:10 +0530 Subject: [PATCH 052/364] [IMP]minor change. bzr revid: vme@tinyerp.com-20121029115710-kpcfose7n8q749tm --- addons/web/static/src/js/chrome.js | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 0b2ac1db7c7..2478ae954e6 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -266,8 +266,8 @@ instance.web.Loading = instance.web.Widget.extend({ this.count += increment; if (this.count > 0) { + this.favicon_drawable = true; this.draw_favicon(parseInt(this.response_count * 100 / this.request_count)); - this.getParent().$el.addClass('oe_wait'); } else { this.count = 0; clearTimeout(this.long_running_timer); @@ -276,8 +276,6 @@ instance.web.Loading = instance.web.Widget.extend({ this.blocked_ui = false; instance.web.unblockUI(); } - this.$el.fadeOut(); - this.getParent().$el.removeClass('oe_wait'); this.stop_favicon(); } } @@ -292,32 +290,40 @@ instance.web.favicon = instance.web.Loading.include({ this.interval = null; this.old_title = document.title; this.local_counter = 0; + this.favicon_drawable = true; this.options = { - 'border':"white", - 'background' :"gray", - 'inner_circle':"white", - 'fill_color':"red", - 'width': 5 + 'border':"white",//border of favicon + 'background' :"gray",//main color of circle + 'inner_circle':"white",//innter circle color + 'fill_color':"red",//fill color + 'width': 5 //width of circle } }, + + //when time interval is known than start favicon can be used. start_favicon: function(second, options){ var count = 0; var self = this; this.interval = setInterval(function(){ if (++count > 100) {self.stop_favicon(); return false;} + self.favicon_drawable = true; self.draw_favicon(count, options); }, second || 1); }, + stop_favicon: function(){ if(this.interval) clearInterval(this.interval); + this.favicon_drawable = false; $('link[type="image/x-icon"]').attr('href', this.original_favi.attr("href")); $('head').append(this.original_favi); document.title = this.old_title; }, + loading_title:function(percentage){ document.title = percentage + "% processed |" + this.old_title; }, + draw_favicon: function(percentage, options){ var self = this; var options = _.extend(this.options, options || {}); @@ -364,7 +370,7 @@ instance.web.favicon = instance.web.Loading.include({ if (!src.match(/^data/)) { faviconImage.crossOrigin = 'anonymous'; } - if(self.count > 0 ){ + if(self.favicon_drawable){ $('link[type="image/x-icon"]').remove(); $('head').append(get_link(canvas.toDataURL())); } @@ -372,7 +378,7 @@ instance.web.favicon = instance.web.Loading.include({ } this.loading_title(percentage); faviconImage.src = self.original_favi.attr("href"); - }, + } }); instance.web.DatabaseManager = instance.web.Widget.extend({ init: function(parent) { From 5e4b67c1a3d8799c9d7a32b97039e6823b4936a8 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 29 Oct 2012 17:32:13 +0530 Subject: [PATCH 053/364] [IMP]check if interval presents then first stop that. bzr revid: vme@tinyerp.com-20121029120213-61uy6frqo0ormdc6 --- addons/web/static/src/js/chrome.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 2478ae954e6..821ed2d0fa6 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -302,6 +302,8 @@ instance.web.favicon = instance.web.Loading.include({ //when time interval is known than start favicon can be used. start_favicon: function(second, options){ + if(!this.interval) + this.stop_favicon(); var count = 0; var self = this; this.interval = setInterval(function(){ @@ -318,6 +320,7 @@ instance.web.favicon = instance.web.Loading.include({ $('link[type="image/x-icon"]').attr('href', this.original_favi.attr("href")); $('head').append(this.original_favi); document.title = this.old_title; + this.interval = null; }, loading_title:function(percentage){ From a7bee43a5b13b92267707c1514cc610bb5fa2fd3 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 29 Oct 2012 17:43:13 +0530 Subject: [PATCH 054/364] [IMP] bzr revid: vme@tinyerp.com-20121029121313-v12kb501m6vzi9c2 --- addons/web/static/src/js/chrome.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 821ed2d0fa6..6cc416f448e 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -270,6 +270,8 @@ instance.web.Loading = instance.web.Widget.extend({ this.draw_favicon(parseInt(this.response_count * 100 / this.request_count)); } else { this.count = 0; + this.request_count = 0; + this.response_count = 0; clearTimeout(this.long_running_timer); // Don't unblock if blocked by somebody else if (self.blocked_ui) { From 5ea001c82c519e8b8ddbb75d8ea2a53756ba3779 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 29 Oct 2012 17:52:18 +0530 Subject: [PATCH 055/364] [REM]unused variable. bzr revid: vme@tinyerp.com-20121029122218-yuv3o313upbkfkuq --- addons/web/static/src/js/chrome.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 6cc416f448e..1255e61e7dc 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -233,7 +233,6 @@ instance.web.Loading = instance.web.Widget.extend({ template: 'Loading', init: function(parent) { this._super(parent); - var self = this; this.count = 0; this.blocked_ui = false; this.request_count = 0; @@ -291,7 +290,6 @@ instance.web.favicon = instance.web.Loading.include({ this.link = null; this.interval = null; this.old_title = document.title; - this.local_counter = 0; this.favicon_drawable = true; this.options = { 'border':"white",//border of favicon From 4fa267f1fc39b70c58f81341292d2976c9aa9303 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Tue, 30 Oct 2012 11:22:02 +0530 Subject: [PATCH 056/364] [IMP] add code for confirm pwd image bzr revid: ggh@tinyerp.com-20121030055202-epuold0yrsoukw3f --- addons/web/static/src/img/new_key.png | Bin 392 -> 266 bytes addons/web/static/src/img/old_key.png | Bin 504 -> 666 bytes addons/web/static/src/js/chrome.js | 1 + addons/web/static/src/xml/base.xml | 10 +++++----- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/web/static/src/img/new_key.png b/addons/web/static/src/img/new_key.png index 9e167c3d54af7df5dad4576e0cd399ac15c07419..ac7c7807bd52257ba0c03d26e7092645471976eb 100644 GIT binary patch delta 239 zcmVs#7KULUlXLFAZQCOV zfI7-I;6-_N+cw{;0nO1&W1iZ}XpE&*-Zen5OXIFlei(`Yn5A-$o9*`sn4UC-` pPhHnE@xL<1aZCWV`S`nXy*tXc@$Rz`yMq7#002ovPDHLkV1iSCX@~#- delta 366 zcmV-!0g?WS0*C{UBYy!;NklDcNCQc$E+;F3dg5WGpIymZqvru<8 z!NpMr5B~r+(aEn-H^D{haHTa(ny;o!dTr%a*H{sy_O7-1gANHi&-=c8V;B{|crZzb z*l`>vOw-iG4`Y6ZakOmI1;U_R21}A_rPNfVz_#I#K&ezG$$#tjnK5};**?aiQx-55 z>Nrk++>I3Et+gl%kLyOL6(mX0W-L1Ww;%}OIZDI(I&74Q4$}U6324=!F8}}l M07*qoM6N<$f{qKXeE$U#Sft6f$~X=S>uYI{ekSX?iLhWg=eAZnr9)-XPi$I)YLAi@L4?i zMa1S0p!j^N1 zQn`~CFAJEOdWxl`@2W@Ki}N2pU{_=hwl;+jiN~BxsEb@YBwDpr@^$2y!Vz68(dI~B z&ceSY0ODJX?cru4!W+-@2r@K6-6P!5@N9!B9RC}p%A>@U0hz~(d+fh0e|E17!MDRu-om-!Duu_ zqtQSx7=+DcLnf0!zu*5Kpz9;l>-Sh)wWC_CGDox744S4fH$LAU^7+F50K+iQYPFby z^Ya|D{0X7(gM&jP5()Dfbh}+R91d747DS^bczS9wC{5+)=or~-_HO_ctE!6I+Zs5I zgWK(9;c~g)bbmV8E(lj7o#Af)wJ6Ifip3Imo=2ziipgX`iaLQLDa1jCz%_Da{Okf1 z(ohtQv@MQsI7}`Mh?|+&sC)rv(IiQQ-|t5%l_nr{4qXVKJ+9XqBwrra*JZrDNef?| z0|tY4l*=M^c6{LYZLF=Wlj$om=u&`mIs<-d8ylM*SXixA5?$4`+=CYMX0*?h*? zSppsphnpLb*>AUBK+l%~7{-*es>?o2Ah1t_O*RKKmP+AsaAaA5D2im47ry#^eE{qi Vs%QpYpSb`4002ovPDHLkV1f-N+ - +
@@ -295,14 +295,14 @@ minlength="1" placeholder=" Password..." autofocus="autofocus"/> - - + - + From f1493bb606093de18062d8543db198963c7945e6 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Tue, 30 Oct 2012 15:00:59 +0530 Subject: [PATCH 057/364] [IMP] code for password field bzr revid: ggh@tinyerp.com-20121030093059-xiuoh4ph03ytz88t --- addons/web/static/src/css/base.css | 5 ++--- addons/web/static/src/css/base.sass | 5 ++--- addons/web/static/src/js/chrome.js | 3 --- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index a96ce317276..75ca1270238 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,3 @@ -@charset "utf-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -527,11 +526,11 @@ color: #aaaaaa; } .openerp .oe_keyImage_old_pwd input { - background: url(/web/static/src/img/old_key.png) no-repeat 4px; + background: url(/web/static/src/img/old_key.png) no-repeat 4px !important; padding-left: 22px; } .openerp .oe_keyImage_new_pwd input { - background: url(/web/static/src/img/new_key.png) no-repeat 4px; + background: url(/web/static/src/img/new_key.png) no-repeat 4px !important; padding-left: 22px; } .openerp .oe_tag { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 22289f088c6..93deeec6398 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1,4 +1,3 @@ -@charset "utf-8" // Variables {{{ $facets-border: #afafb6 @@ -463,10 +462,10 @@ $sheet-max-width: 860px // }}} .oe_keyImage_old_pwd input - background: url(/web/static/src/img/old_key.png) no-repeat 4px + background: url(/web/static/src/img/old_key.png) no-repeat 4px !important padding-left: 22px .oe_keyImage_new_pwd input - background: url(/web/static/src/img/new_key.png) no-repeat 4px + background: url(/web/static/src/img/new_key.png) no-repeat 4px !important padding-left: 22px // Tags (for many2many tags, among others) {{{ diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index c47e7066726..6cf35a14e92 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -329,9 +329,6 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ self.$el.find("form[name=drop_db_form]").validate({ submitHandler: self.do_drop }); self.$el.find("form[name=backup_db_form]").validate({ submitHandler: self.do_backup }); self.$el.find("form[name=restore_db_form]").validate({ submitHandler: self.do_restore }); - self.$el.find("form td input[name=old_pwd]").css('background','url(/web/static/src/img/old_key.png) no-repeat 4px'); - self.$el.find("form td input[name=new_pwd]").css('background','url(/web/static/src/img/new_key.png) no-repeat 4px'); - self.$el.find("form td input[name=confirm_pwd]").css('background','url(/web/static/src/img/new_key.png) no-repeat 4px'); self.$el.find("form[name=change_pwd_form]").validate({ messages: { old_pwd: "Please enter your previous password", From 9c1f3a394b04503d20dbd9ae3f44cca2f1828e13 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Tue, 30 Oct 2012 15:04:51 +0530 Subject: [PATCH 058/364] add code for remove line bzr revid: ggh@tinyerp.com-20121030093451-u77xm5fx9krcmo5w --- addons/web/static/src/css/base.css | 1 + addons/web/static/src/css/base.sass | 1 + 2 files changed, 2 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 75ca1270238..90c7603c097 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,3 +1,4 @@ +@charset "utf-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 93deeec6398..b4be8931f87 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1,3 +1,4 @@ +@charset "utf-8" // Variables {{{ $facets-border: #afafb6 From 516e8697dd50123917f6b3d650628c15d2525c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Grand-Guillaume?= Date: Wed, 31 Oct 2012 13:50:03 +0100 Subject: [PATCH 059/364] [FIX] Re-add the call to super in create_move_from_st_line in the voucher module. I removed it by mistake... Thanks to Stefan bzr revid: joel.grandguillaume@camptocamp.com-20121031125003-0oe3d4ncvmblmc8p --- addons/account_voucher/account_voucher.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 6ad3212892c..cca9daeaa8f 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -1532,6 +1532,7 @@ class account_bank_statement(osv.osv): }) return move_line_obj.write(cr, uid, [x.id for x in v.move_ids], {'statement_id': st_line.statement_id.id}, context=context) + return super(account_bank_statement, self).create_move_from_st_line(cr, uid, st_line.id, company_currency_id, next_number, context=context) def write(self, cr, uid, ids, vals, context=None): # We should not be able to change the journal if we already have From 49dd95bf51ac8c6434bd42ea8620723b90cfe3c9 Mon Sep 17 00:00:00 2001 From: "ajay javiya (OpenERP)" Date: Fri, 2 Nov 2012 16:50:02 +0530 Subject: [PATCH 060/364] [FIX]: Password field should not allows to setdefault bzr revid: aja@tinyerp.com-20121102112002-awvp6juu2mvdndz2 --- addons/web/static/src/js/view_form.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index e0727b99259..4e6a8bcf437 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -990,7 +990,8 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM || field.get("readonly") || field.field.type === 'one2many' || field.field.type === 'many2many' - || field.field.type === 'binary') { + || field.field.type === 'binary' + || field.password) { return false; } From c470df6de059f7ebe267fdae8bae3b638c721212 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Mon, 5 Nov 2012 11:23:20 +0530 Subject: [PATCH 061/364] [FIX]Improve code bzr revid: vja@tinyerp.com-20121105055320-jrplij0m8y6y2m3e --- addons/web/static/src/css/base.css | 4 ++++ addons/web/static/src/css/base.sass | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 059b51b183e..91793947836 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -475,6 +475,10 @@ max-width: 180px; max-height: 180px; } +.openerp .oe_view_manager_current a.accessactive { + display:inline-block; + text-decoration:none; +} .openerp .oe_view_manager_current .accessactive:first-letter{ text-decoration:underline; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b96321a78f4..0c17735cf7b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -437,10 +437,14 @@ $sheet-padding: 16px .oe_image_medium > img max-width: 180px max-height: 180px - .oe_view_manager_current .accessactive:first-letter - text-decoration: underline - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2) - font-weight: bold + .openerp .oe_view_manager_current + a.accessactive + display: inline-block + text-decoration: none + .accessactive:first-letter + text-decoration: underline + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2) + font-weight: bold .oe_button.oe_link @include reset() img From b2965827dc6a43e292e18ec68a18ea5f10824921 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Mon, 5 Nov 2012 12:05:18 +0530 Subject: [PATCH 062/364] [FIX]shortcut should highlight when press SHIFT + ALT. bzr revid: vja@tinyerp.com-20121105063518-ng3qk7ljjxmbtuvi --- addons/web/static/src/js/view_form.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index ed088e50d96..f67ab33d6e8 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -222,8 +222,10 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM }, widgetAccesskey:function(){ $(document).keydown(function(e){ - if(e.keyCode === $.ui.keyCode.ALT) { + if(e.keyCode === $.ui.keyCode.ALT || e.keyCode === $.ui.keyCode.SHIFT && e.altKey) { $("[accesskey]").addClass('accessactive'); + }else { + $("[accesskey]").removeClass('accessactive'); } e.stopPropagation(); }).keyup(function(e){ From 9e56b3b6a8a761e02099146b338225d29dbc8c8a Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Mon, 5 Nov 2012 09:41:52 +0100 Subject: [PATCH 063/364] [ADD]QuickAdd Move Line View bzr revid: dle@openerp.com-20121105084152-35bvurqkvuv4k0ow --- addons/account/__openerp__.py | 2 + addons/account/account_move_line.py | 8 +++ addons/account/account_view.xml | 40 ++++++++++++ .../src/js/account_move_reconciliation.js | 61 +++++++++++++++++++ 4 files changed, 111 insertions(+) diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index c538614fd0f..39feb2cd546 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -128,9 +128,11 @@ for a particular financial year and for preparation of vouchers there is a modul ], 'js': [ 'static/src/js/account_move_reconciliation.js', + ], 'qweb' : [ "static/src/xml/account_move_reconciliation.xml", + "static/src/xml/account_move_line_quickadd.xml", ], 'css':['static/src/css/account_move_reconciliation.css' ], diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 67a55d8f451..373f8e89c29 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -1383,6 +1383,14 @@ class account_move_line(osv.osv): move_obj.button_validate(cr,uid, [vals['move_id']], context) return result + def list_periods(self, cr, uid, context=None): + ids = self.pool.get('account.period').search(cr,uid,[]) + return self.pool.get('account.period').name_get(cr, uid, ids, context=context) + + def list_journals(self, cr, uid, context=None): + ids = self.pool.get('account.journal').search(cr,uid,[]) + return self.pool.get('account.journal').name_get(cr, uid, ids, context=context) + account_move_line() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 63d7e891437..a639228aeea 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1055,6 +1055,30 @@ + + account.move.line + + + + + + + + + + + + + + + + + + + + + + account.move.line.tree account.move.line @@ -1549,6 +1573,22 @@

+ + + {'search_default_unreconciled': 1,'view_mode':True} + Quick Journal Items + account.move.line + + tree_account_move_line_quickadd + + + + Date: Mon, 5 Nov 2012 15:16:02 +0530 Subject: [PATCH 064/364] [IMP] Selection field with placeholder feature. bzr revid: tta@openerp.com-20121105094602-v2a4z4m4mighxgqw --- addons/web/static/src/xml/base.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 275d31a9fde..d4b8674430e 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -993,6 +993,7 @@ + From 58c07c690a28d583a450387f9d7a7c7d2f38dd5d Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Tue, 6 Nov 2012 13:24:31 +0530 Subject: [PATCH 065/364] [IMP] Improve code for infinity to replace image. bzr revid: jra@tinyerp.com-20121106075431-0qbwinkpzvkn1d36 --- addons/web_kanban/static/src/xml/web_kanban.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index 091f30bfa11..a73dc5b904c 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -48,7 +48,7 @@
- + ∞
From 7fb4bdf6efebcde477ec358be9bef9e9bd6076da Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Tue, 6 Nov 2012 13:25:48 +0530 Subject: [PATCH 066/364] [REM] Remove image of infinity. bzr revid: jra@tinyerp.com-20121106075548-y94mlem8oh97k3f6 --- addons/web/static/src/img/infinity.png | Bin 2816 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 addons/web/static/src/img/infinity.png diff --git a/addons/web/static/src/img/infinity.png b/addons/web/static/src/img/infinity.png deleted file mode 100644 index 5424b856735eef58ef2049cf4a9a9df39008eed2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2816 zcmZ{mXHXO97KRfbK&YXGD!oV&Ab@TNhNe=5&>@i+LkU$#=m{t#G{H~=M5KxfDy2mk;OcXT-I zai~FueOy@ZaI%ruUm_TA#{M+m;8)#ze7oe(0aG3Du>fFu*slf#Q|)$snF&;zkVE}1 z575pwSwHk%I-a)iqD_xgB^UXSj|^Jvu{e*qJJeA?kd!}JxGR@gRP2)NBN!;(&x#%i zeu@|zVcys8rr%&ytOk~y3O0Fdd*t|YW0rfkCb!h#s_lYmp6DtImC*a+Yci2$R=xgY zscI``cJ3)9+kb8e-TP%dIjVQY)81*~ZmI;|0N_P>7$=N#`le#2fM6PyWV8nBP^5uh zfxh!iHpty_t`9WR1+1sVrlC2qIjvF(%kNhNr_)zBqnx?44Gvr)#E~Y=p1PYLlNOua zz#)*Nkz$QT;}-#DV#~l9p&CF9-$US!DK93ft|GmkV?qKW6+@lIz12F@UI}CPT7c7O z>3IuRqpL|3JSaEVrrlbH+DoeBB{S#@8yJ29X9hV2o;9Ko#@#g~)LbihK3p*rQI4N_ zi+7LF%1Ac>uF=`N-?;VrD0pTAw!?bOk2^2I8;Y&unMS=C$r$t;z(?tBctg^vZXIaQ zC|$l+*swO4>DA zq<7;svru?51Ypft{}{r!8y0f?Hq!^?d5<&i%8C%!$nBu1TOw!%fe?O%kbq1vtiSIo zlzUI{-O#$m>n>?mebvkBpc4@Q>zY&}1vOuN)dEw2&*9cTZ+cj^nW2zE3&*&-N)XJ@ z*2r620PI~5x58v}9Nw+T?oMARJ{MoIxqhC@>HzzE;Rj{|P=NK43$Z{YK$6N?_9bf2@ZN|%WRwHv~oZ?JdXb>27W==n13^E?;z=EBL*DWkJv|Z%yQU}eBhIG z{BC8xvFKxof)^7pB)Q<|!3H8JM`jx&L^7fdfeoLojEgY`5c7&0giw(7R|~Atv)jRQY9EsW zKeVW=m9O#y6KXDa3Z%l+`^>pV&ugFtAxT7?Yf^mmj%y$;moFx=j9#mURxE)9mhhHg zE-ZRpf=&GBexiN4d<=Y9y65rP5n(`6qF<0kA@>~POTF7bYLFncKbr2eQ-15&M>Ua8 zkgBH8J3X$!pM1R)f$C_kJ%}P(elFUO&r+?lE4w*+^n{jLe$mHTMy{}r?D+Kb@5z34 z@6*Jj3ANvt!r!F0FH0wfeN|P2Eg{CUD~v?-PK%Rk#Mk+HB~wy-f7n3rh~s9PHv>9J zu*-oh%M97l2iJh&lUAW|QXx!U7~> zcR@{}qo&QE`AbS7gbezbl5s3A;igsupny2INCh>bzd$8D^gce!$}3{4{5^=7aI8F# zozV>^GvWhx2sYtE{>DY>8>Bn+WuXF83+QKulger5t;df34iWzwXn*pjI%2#OO~3Qb z<3g5p9TAbhf=8$T!__Zpd|&LCg4A={+*`-vc;37+Z_iI; z+I}<9VVh@@{HB9Vr0qC<=kLQk!q?1lN=_-#YIjPt_RNO2& z#@To3B6y2n>79S{b2j4X`Pk^Mg^g-f>I$AXiBQ@Agc1zgu<8CPQjr=?39Tq9* zn(k{cuBUB~`BB_0>%Ml`P^3DpK|1_+p73M0wU?z!ec@eyst&fYw&Uu4yTq^;xZ<6z zTwW4b#H$u5ln|unS2_>IkAEsl(P+TDKSn&f$ZF!Oi_NY2*S=EN-cmd=tR_SkfA&)~ zQ5;r7JTStyTzVB}3akrh|JEQ(YlNeSA3e#}W@3rjA zp5J^QtMB+!{EX)aqQCpTSKeF^UB)TN`lfqA7BjZp2$cv<(HzAg?7d|e!zK|=CUato zze(Kaa;td!&ie2MAzn3(U@$TRGoaccZ@X(*mM=*V}rBhf$>`ajD z+xN5D5ixW787-_%6?i~5!ZS5$!T{!-z}&O8K+2dtDtnY#sGSnoiR_C|?ts!DcfdwF zH+p1o04yMwUp`l26JV7Aa7{XiU`3RG2KvGbC# zm?%Erp?AXg%oFkC1aq050Lq2(5~Ga6Fu>6kd%Eo; GiSZwO9{M2w From a5cb0866244438fd6afef399b03a097e8267c9f2 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Tue, 6 Nov 2012 15:16:04 +0530 Subject: [PATCH 067/364] [IMP]Improve code for keyboard shortcuts. bzr revid: vja@tinyerp.com-20121106094604-q2aiwv655vajdebj --- addons/web/static/src/css/base.css | 4 ++++ addons/web/static/src/css/base.sass | 12 ++++++++---- addons/web/static/src/js/view_form.js | 4 +++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 059b51b183e..91793947836 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -475,6 +475,10 @@ max-width: 180px; max-height: 180px; } +.openerp .oe_view_manager_current a.accessactive { + display:inline-block; + text-decoration:none; +} .openerp .oe_view_manager_current .accessactive:first-letter{ text-decoration:underline; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b96321a78f4..a1bb16d6856 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -437,10 +437,14 @@ $sheet-padding: 16px .oe_image_medium > img max-width: 180px max-height: 180px - .oe_view_manager_current .accessactive:first-letter - text-decoration: underline - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2) - font-weight: bold + .oe_view_manager_current + a.accessactive + display: inline-block + text-decoration: none + .accessactive:first-letter + text-decoration: underline + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2) + font-weight: bold .oe_button.oe_link @include reset() img diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index cea026397ea..67dbc4b0acf 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -222,8 +222,10 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM }, widgetAccesskey:function(){ $(document).keydown(function(e){ - if(e.keyCode === $.ui.keyCode.ALT) { + if(e.keyCode === $.ui.keyCode.ALT || e.keyCode === $.ui.keyCode.SHIFT && e.altKey) { $("[accesskey]").addClass('accessactive'); + }else { + $("[accesskey]").removeClass('accessactive'); } e.stopPropagation(); }).keyup(function(e){ From e4effd65856a4f336753103ea05127f7066b97f2 Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Wed, 7 Nov 2012 12:08:10 +0530 Subject: [PATCH 068/364] [IMP] Remove traceback with a warning/constraint message for float field. bzr revid: tta@openerp.com-20121107063810-ulei1bq8aw1xctyl --- addons/web/static/src/js/view_form.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 07c237ae0d8..90335c269df 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2179,7 +2179,9 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we var self = this; var $input = this.$el.find('input'); $input.change(function() { - self.internal_set_value(self.parse_value($input.val())); + if(self.is_syntax_valid()){ + self.internal_set_value(self.parse_value($input.val())); + } }); this.setupFocus($input); }, From 909285bb7d4bdad5ea94665f3e413497cd853c13 Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Wed, 7 Nov 2012 12:16:23 +0530 Subject: [PATCH 069/364] [IMP] Listview.buttons template corrected for import button and future support to append buttons inside 'oe_list_buttons' section. bzr revid: tta@openerp.com-20121107064623-q9oggrypyil1207w --- addons/web/static/src/xml/base.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index d4b8674430e..99af729d04f 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -648,13 +648,15 @@ -
+ +
-
+
+
From 1a9f93fc85ea9bce1265b14f53cafd3eb1e5f99e Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Wed, 7 Nov 2012 17:02:56 +0530 Subject: [PATCH 070/364] [fix] on model form tags issue fixed.. bzr revid: tta@openerp.com-20121107113256-ac6znf9m5ibzoovl --- addons/web/static/src/js/view_form.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 69feb2757d0..23101465849 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3920,6 +3920,8 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in return this.get("value"); }, render_value: function() { + if (this.get("effective_readonly")) + return; var self = this; var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.build_context()); var values = self.get("value") From d65ab4c01404c0d5ae7d3fede7f3bf7f2e7ff564 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Wed, 7 Nov 2012 18:58:52 +0530 Subject: [PATCH 071/364] [IMP]Improve Code. bzr revid: vja@tinyerp.com-20121107132852-nq4uflsfc1l9o72g --- addons/web/static/src/css/base.css | 7 +++---- addons/web/static/src/css/base.sass | 9 ++++----- addons/web/static/src/js/view_form.js | 20 +++++++++++--------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 91793947836..a14d0002492 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -475,11 +475,10 @@ max-width: 180px; max-height: 180px; } -.openerp .oe_view_manager_current a.accessactive { - display:inline-block; - text-decoration:none; +.openerp .oe_form_buttons [accesskey] > p { + display:inline; } -.openerp .oe_view_manager_current .accessactive:first-letter{ +.openerp .oe_form_buttons .accessactive { text-decoration:underline; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); font-weight:bold; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index a1bb16d6856..6b768c43f04 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -437,11 +437,10 @@ $sheet-padding: 16px .oe_image_medium > img max-width: 180px max-height: 180px - .oe_view_manager_current - a.accessactive - display: inline-block - text-decoration: none - .accessactive:first-letter + .oe_form_buttons + [accesskey] > p + display: inline + .accessactive text-decoration: underline text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2) font-weight: bold diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 67dbc4b0acf..f9c71e0b316 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -221,16 +221,18 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM return $.when(); }, widgetAccesskey:function(){ - $(document).keydown(function(e){ - if(e.keyCode === $.ui.keyCode.ALT || e.keyCode === $.ui.keyCode.SHIFT && e.altKey) { - $("[accesskey]").addClass('accessactive'); - }else { - $("[accesskey]").removeClass('accessactive'); - } - e.stopPropagation(); - }).keyup(function(e){ - $("[accesskey]").removeClass('accessactive'); + var self = this; + self.$buttons.find("[accesskey]").html(function(i, html){ + return html.replace(/^[^a-zA-Z]*([a-zA-Z])/g, '

$1

'); }); + $(document).keydown(function(e){ + self.$buttons.find("[accesskey] >p").removeClass("accessactive"); + if (e.keyCode === $.ui.keyCode.ALT || e.keyCode === $.ui.keyCode.SHIFT && e.altKey) { + self.$buttons.find("[accesskey] >p").addClass("accessactive"); + } + }).keyup(function(){ + self.$buttons.find("[accesskey] > p").removeClass("accessactive"); + }) }, widgetFocused: function() { // Clear click flag if used to focus a widget From f72442feb0e6ba4046306a9a776aa99486938c47 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Thu, 8 Nov 2012 12:24:07 +0530 Subject: [PATCH 072/364] [IMP] Improve code for right click logo resolution. bzr revid: bth@tinyerp.com-20121108065407-zl8zldfsnb9go03e --- addons/web/static/src/css/base.css | 29 ++++ .../src/img/OpenERP_Vector_Logo_2011.svg | 125 ++++++++++++++++++ addons/web/static/src/img/logo1.png | Bin 0 -> 3981 bytes addons/web/static/src/img/openerp_big.png | Bin 0 -> 17045 bytes .../static/src/img/openerp_partner_gold.png | Bin 0 -> 30071 bytes .../static/src/img/openerp_partner_gold.svg | 97 ++++++++++++++ .../static/src/img/openerp_partner_ready.png | Bin 0 -> 30005 bytes .../static/src/img/openerp_partner_silver.png | Bin 0 -> 28331 bytes addons/web/static/src/js/chrome.js | 58 ++++++-- addons/web/static/src/xml/base.xml | 43 +++--- 10 files changed, 323 insertions(+), 29 deletions(-) create mode 100644 addons/web/static/src/img/OpenERP_Vector_Logo_2011.svg create mode 100644 addons/web/static/src/img/logo1.png create mode 100644 addons/web/static/src/img/openerp_big.png create mode 100644 addons/web/static/src/img/openerp_partner_gold.png create mode 100644 addons/web/static/src/img/openerp_partner_gold.svg create mode 100644 addons/web/static/src/img/openerp_partner_ready.png create mode 100644 addons/web/static/src/img/openerp_partner_silver.png diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 91793947836..0a1d4b410fb 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3023,6 +3023,35 @@ div.ui-widget-overlay { width: 100%; line-height: 20px; } +.resolution { + width: 300px; + background-color: white; + margin-bottom: 15px; + margin-left: 5px; +} +.resolution .res { + display: table; + width:100%; + border:1px solid; +} +.resolution .res > div { + border-bottom: 1px solid; + height: 70px; + clear: both; +} + +.resolution .res div div { + display: inline; +} +.res img { + width: 100px; + height: 40px; + padding-top: 20px; +} +.res span a { + font-size:10px; + padding-left: 5px; +} .resolution table td { valign: middle; } diff --git a/addons/web/static/src/img/OpenERP_Vector_Logo_2011.svg b/addons/web/static/src/img/OpenERP_Vector_Logo_2011.svg new file mode 100644 index 00000000000..ed10906240f --- /dev/null +++ b/addons/web/static/src/img/OpenERP_Vector_Logo_2011.svg @@ -0,0 +1,125 @@ + + + +image/svg+xmlSource Business Applications + + + + \ No newline at end of file diff --git a/addons/web/static/src/img/logo1.png b/addons/web/static/src/img/logo1.png new file mode 100644 index 0000000000000000000000000000000000000000..d6dbd9d83d1f3c3c2568e7ccac4e031e0f5b3806 GIT binary patch literal 3981 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 literal 0 HcmV?d00001 diff --git a/addons/web/static/src/img/openerp_big.png b/addons/web/static/src/img/openerp_big.png new file mode 100644 index 0000000000000000000000000000000000000000..aa2d6c697113dc73ad2a7f11edf24678a8132f1a GIT binary patch literal 17045 zcmY+s1z1#F*abSlfHVk5gQ7@xHz=UeHH4&662c52Edz)&h=4Sxlnf0DLyyu3%qK|K z(9$Jc_u&8k&%M{@QE+o+pMBoF_uA`S>pev2={zDQVIl#6K;%yzs~UhnP;TJ+v>SxL zzmy~WjKCKH&j(M8ZUBD*Z`efw|0hN~HuD6oAHDtye!!jS3p6r%shN5ix;uFJJoB&z z`S|zFh{9-L{4zE9uvZ}pv+Q+*{*H}~4JB^y zqJ2eOrJsjh(+z!nuSSalwq!n|8Ej+Ivm#>&Zh@9zR*=pwYmS@Qa2M4@e*7~$t-uMn zwW=h{L13SykW=)J{@D~W+Fz~lzGPZtY1o;MLyIsq15p!YlhhyFQR8Ow7haA%PWXX)9U=Gtxdpz}3FEr!Y$XXkQbgR{@r1LQ9LSsB;g|%|I|N@) zR>q-QtmaSH2tEk91TG8*p&JYuxkQvz%ZWx@j^rEqA}}$1J|VQe`OCX+(1%Okq9gf9 zmI9~V>`X&p#PIwN#sANrAI|XsZ{ipzGLSi5>!{=rrmQ7JuQcO%TEru8) z8JSdj4vG^wiR|XU)*)1SGO$wu6uY-8qtUMy1KboNyXCRASbhmzC0J=08kg#&L#o%% z6%6<8c%}Os1>>FxBDoic{B%Nv&}IeeJ5yXO~tKFoxY){i8`*8H&o;uWt0@)ce`~n$Y-xuDPF8c137@JSm&}3#y zWES!H$AMHUf)V{;uE6Y)K1UtA-jwBh<@cXfKc}E6_(PjIB}oxEm}9jd=0w)z@&#^64Z7Ema5TYwZjC z#PPl&f^+NX(pxKSBAP^fY&!PA%N&ggCdw%ksd2gS@KF%?)Gx3`ZGxSN4JDorcqq1Q zs0rv10dh~Pk;_&~i7GK1b%Dx8p7r(CzD3U{wg(a%vAyC?Dl{iwF~s}hz2MD-Da29T z-q_Q&rVRxf8hCSAN|kw5*C(vLeVjXqpE5l4<cqP!>)HUepm|n21pgQwR5qQo zD=;ap#AL3`GueezLbVx5@W`4zBII_WEq~j%U&|>B&n#MK^TkVHMO3l^|J&+e7>ZG~ zQ^XrhX}IL2go%o4?f0Tl+2nzBc$rHm%NKNBM8K!W(m3B=>>7mO8yhl&H%_iiRCpoS(D5)^ldcOKzyz=PzrZ?n2sq zT}(zIt{gfY6B3ZcI!AL`z47jC=OfTd!al2m`VdDW@5JxA(cQl>f1|V&vLA))hXlb7 zvi*gq5_wQpA}0ZVh_GbjofiaS`fwrFor4Fei#j$bqMefA^7-f%C70%#i6toQ31Fyy ztL#pTP||4&^6#2yeW!4V5*Er8@sEcy4+b{x}~*$(wK`!cTB}-x;GVs z&M-GZf|p~+S2n58YlhI^o~=u(sL8AONl)x6v_B3n6xmIIl?ltyL2Q?CLF6PEJUJ@s z(EhD$+#IPO^E0+l+QUe+;PBQHGBs75u7XDyhZxG^D)h|wRunBKhvB?iA-ul9EsItf zGu)#2l3Z_)+kz=IwfWiiPi#;@m>c01`TSziXHRB+KF7ctZVNdT%1aP@mrB-Oi-Dq5 zD~{@$h}-2FR==EOadU!cIDPo`S*7Z|AF%VGQ?^F6GxXXveqXy~bRJFqVad>f{ev~R zeB!3JUucgMe)}VO#lB*k>X=5@It)pvKfDmAW2E|;bYtC9YoQ|#-CzemAT71b&11F3 zm1oix@C0E0N8d~w4UxH?f>(l-C1^?SxS0>vc$bdw*?(0qW{G2vX2F!AlZ$UcQXE6P z!=#@m#M*1Qafs3(?jfiyw?%mnd~P($Wr~EfiPRW;KFy$!Rmb!TGlshSW>dA5W~$>5 zbUb}xTu2E~&;^f8)kORdhbU?JpiSP_66=z+?=APaIf_7MXG}QX{WP@TuYYl+AffYLAFZ7r$mM#Ms_b0N+}< zF~4|nTj!9#xXUt`_8S%A5mPv8quH;&iqvM1x~wb1UO#Ipi{jbfm~II(#;MPeMPi{e z2yM1)BEh@{Ji*i%zMn%>ZYNLHTB%S{8rt0Ir6PU;(5br|4`=#H7Tby(hV6Ruq@o;-j*eGWx^< z)UZannGf1$Xhrv7fvue%b{4ARvh$ubWWUCsr|`%W^?c8i4O4>e=d^8sO!08=iTkS* zU!UIZ)#pB8%Db%vg?|fRNmR1r*Bl)#?Six=i*_Rd`3eaIwet`@l(vjw_o#^xd>L`Q zIOAtbcsu+pYO{~w3nRQvip|dm0G)!63T$!}Pc739f91E4Ndr@}*r`6fK7+UAU);C7H?Kj7#_;YcRn8Q!P z4wZ%|opPo+nVm0@t}^W|O-HhOcuN~g3%n1vUfpDXTFYGyfmyuXa17$iU`?Xdk{KiD z^1!Jf7sg%q#VN$I`u%n%E%I$-VDTYw#r52+<2@!Ed8B`bdpUU)-qy*1)qc9P>^2sN zS>JyiOV6=KZo%24BSnNrkIWL{s2MpqeFWEi!N3m9M6ZRRPeagbVSIO9^Ov9646DD} zZ+-|D>U{aGqK>475V3%#yg8J@-|_Q!humVD-!?jpUHaQ0v3nfT5Vr;8F_GJl3$+i( zg$OCya$GvW755`ABsYM;nPaE_w$9d$@P}1fv!1bEUWaQ>6x`5(s0VhTlQ z(%OKV4~swQ+mdCO%pdn>+)Aro-YrlG&P^Pk;8ubxI~Sf<$-)2og5<+5-|S)^5Xa1B zPjqQ{=adBXg_BaqcDzTQa-&lB5}jz>B6AH2cq;wsh`7>eLYk58f@)getW5Q}L6t18 zze=x%c3(d}f^mUr7L1{nx~guFLXKde0#TM<+yJD6qS<4*pI|a?DSgaPRzq3OD~g*J zqE{R^-(K}Dt}6eW%Wx|n>UB7OZxNHr8{O<6YjM!0hTwZ1CdSO)L7HPQyfCQ{HD@By~EuiK2h~1`f_G^^UpM z2PyS8y5b)b*zuWCdq}-KuR*K?M`Xn(rkE=B4j~+gkb~sKGKEn4%z@l|U##nWZ&+nP z?T&f|TyK({Uiibs{xO;9W4Lv<94c~yB1`9jbfPQdo6$kaop_-D*pe=~!7*yVr@2(P zQw9_53bisC)@ksRO(!wdD>oYM*JNoGH5)&MBLccd3Qs|Q)!~*E^PaW&p>)aQMhB-i zyDC&aysWw}XgYS2p2cKIX3Fuyt*4?|c?duJ&1fPnkkWbq{+=hVph8DPHn9JChD-~u zvQRKC`!vQebc*5~^l1i~E!4%xn`+0vEU9f%jmN0k0)7>1PG0UPf|sOT{X;taI<;VC zGmT>3lyk zRUPWY`b<_m_^in=4U(Rw5tQJUv2N2C{rHnJ%8Ypaf+Gid0Z;cNdQGMi>kD)#-avhY{q-sz{|$Nj7HvfrpVJz5W}Ufz8Ca2p?(t0vioYN zz8=?TrGjUFL_4C_ZekkYnV?7Wie!Pw{JEJ=3ZY-MhA!dU&fxmTOomTb>P<=2m-2@ z?v1h>Ex5JGa4>r98M+|^JrK`l(gbr;npEmZy;-XnZ@bpNeZzwB*#B1h%d9%D3W@?W z4$6#&jAT#BvjP!QAgx;|bLBJ3Fu_gIV+t2N`zT7MJW#-C6>=Q&zUx2sAjQiiWU0as z_g6XVLNk~D{8$&vcV*o;=X|hW%y4)If-dS-n}qrl%x5S+b}hIOoDkLhZWvd6zHN(K z)d|LK3dsz05mbA{@fjVYq8p;n14Mnqr4c2s_Ec%w0>`^7MCBF+J=V<_=<~e{QX~u? z!rk?Tga7_;uo{wwD=;5>!iuVmaBPL>T=3*v`RvcHHk#Lv90Tq0&BD$ADZ(FQlg^Tu zvKfJozJr!n!=~WsIwotiIiv&bUGB>H%o?sBVQ%UB06yDu*~DYsGe+lw47}MPx!+7| z5j(kkplPAe=ZaCdRYK`giEjCX4oHF-av1csRBgyhIdB@#cS%G9y@-5x-&g*q3+sS! z<~!hjumHbht97J+P8~uKm`g2LX&A`u*=a1k&CqTNAvzj5A zYIZbuz5BY~n>+SptgjhmBSL$T&|F*fL+|9hL579gYo58^eX5n*4oSX55DI4doxbnP ztxKUxhKA6|=bVqSb*;SsqS}|g#2Pcf9rs`|*7L%EqbmmejDsqRN5tsC@I5`7xM z@xABv
TYYBR`-`K|3V7LOkCXbf&>0jVOH`v$8?ql(I0%f>6v?Y9!CD@g8{}}cT zL?8W_lXVe(;0(7UuIqiuOlxWOqn@op;6REOa`RNNNTjf`I+N!qYLKY z72vKBQpr7oVWN;$@L6OxTAM8olRU;*eEc>RJ@aOrBoMNLLC@$9`jx|UTz8g6d!>s+ z?kmBAZu;i88v^@RY4B#3n?G!c?7V;roJHFnHA`WWjca5?&2X5J!EPc3hy}UC)CBE{jE?7UduJv0uUp99c+(P=y zejsdxfpRKhGOLAJ@U|Ho9{dSihjwO6`Nnj@S$Pxj3GF{gtEddm1rKx-2ughWoK-f@ zl74Xjp?3PcQ7Mi-wdz?24lUV`E?-_ftLguHedh;JwmALyvBH{Uzc`TqF+T2y0L4`& zl`JE_UxPe>6(9K%)jw5)!V0CP-_Bx9L%NVMeE|!H`Tfb8+tPaQikA-1dUuZMkCDJ; z+6R}XJu-`LEBnlHkK;_-uTKrzhH*$Qitf%;%P&%FulbrN5n>Wjg;m+iP84ytVQ;+W zU)Nrx?U-KBUNy@idX3j&=Y==p@-hUIv;WxR7PO;&zLY8~cRhGc^z>@_?1ssM!&VG! zK`z(@ELP&2EWvdihK?7sE%2rb5Gjqnjl>PaDGyX!OO|;ES z4BMuVyK`PzvBAs56xpC%10X5f=F{^B^VkY9o)`i&1=kDCZEqEvCYBJR19ex6o zirYIuHjgZ7BnPm%@gh@FtQ}ESZll;fo{nqQdoSbm1%EH@2PbMX_vuCn-~8*N<+cJ-{#^Ar zf0Zm#-MhA0DZNwOZeR^|D(dgku6&voAWm}ynZEs=nRW@=brXC3;@al-CQRXXk<50% zpunUjnfMS=5;uU%tlZYQG@fhvfIWCIMlkB0m%~`oHHAfE^_^(9nA&?fhWn}mooELl zCz&e+D=8ix6{dkxKi8NZ9$BK2hPcm(5HF~>>_5=D_87(l9ne_R3|7n?w*4ll=`zMH zV`g>h<-@VtaX(^E+eAo%PHi&VSjIjGt>N#}o@1)3nZF{&LdV0eN;vzSG%a3V&9l9g z6O8*2Oo*Is+%LXUAqe6sAd)9 z%hM9lzV*?L=Z?9r;;%`pKu*_&q8>9M#g5W`K(2pBmW*u~2TI{q1lNP^hKbJ3)KSBK^i$u}CmX#YxsI z{%9>n_b=Oy5YF~hUb(pn0K?39uXArw0hW(;{SS4!;4{3FZ@u)cSz$6pDl*K;EoGk^ zuVTTtB!%E~yKAvj@|k{QXkoDYm4Nhs-5@thxTgDVRYIpr)S@^^QAgQC3i57IvJK8l z5>S|YXueoVF>3`&)0h~v@YAerYm_NGQdP&3Y_Y_ZbUzK(MU;pqZQdONU;R2z*hGsC zKWn(J+~aS5PLV3R`11|Ng*dQYVaEbH3c-d+hc%^IRoXT#2{ERDBk ztpH3xaDKvlKUnN`X%r_3rfu&zgLQt%9*xBkW7ce2W+K@3#0RkCS*;7LO20v*dV6MS zsv5dde_aV}D5hFlYg1#Snl)7&I;VHWn-&c%(dd+08zM_oi4}8CA8mm840l)E^@pp3 z{ZIy-LOau(vE$yM(kJ|J4?2QDf4u7j;(iPxN(f0$S?If`K_YQKV5rQV3?<_i@zFS` z^io_O4pBnac2TMXp#WGv?qM@GA5EYpQ}|EN%Di#(UK(2+d%@1zdU29b!prD&^7)}K zMM7X&9$KWkT9-r}#PT3FtZMHa1oSfujjGzg@Xu{Nk?8oi!d8TH>{rb-p?nL6hUHok ztwM1Yk~{3VM1Z_L@b+qk3*?g`>`-?~dvy|EWvo}-xb_HiMHIUuvV6OK%g%Ah+`VwB zU{&40y-h|bRU%V9VtK2w5PJ(ys|GiYRkE5=)aN>}hKrP!B=EnF^AOH>X^Vr;q8@pq zFmAJy@-_tcd3yb%4Ig(W1Es2+y~VT4mtP!kSS9$u9Ld1YssnW*?;tKh6e`TOYM2%A^Xh>h z7haGB2XkZl)0Jqcw-sMfzPJz|fOW;Xuyr~=WePuoat&D=pzA^o_6WEn2EM1f8!!}D zFY(h!Q=iMhTy=eJe)v`t>?@B8F{7&r#w+fW2+Kw$4W52uu=Nj%)CxJXumG77o06NR zd~#n*S-lVcX7t+d_W|1f*(S|5aCCxbb(op|D1Gk)!qU#YD;f(ww)B3Hze)!%=u{#% ztiVHxSFCQiYNE%a0HP7;XyzfT@I`)HvfV63v>)wORa?IwFgT4+sARRP4KTOmE; zgr9xngO8Z*lcCL0eED@l;$3SlC5|gzNYk#jxN03NQzuqSB}lnAPmyO%ba{>2x>=}% zpCCgX7bV{dCLODvP7=1?u?h;_{S3g<&y`A&QIdFcU*IzL)=p&brAh! z)(vn40dmkNYEGQQ1Y8bl5&xr!gPsAWj5kf&IbcjJ=fmp3;qN{i<=PF;mlGMY%-d7q71LV7TM5%|ePl3frVHVlP>2#N zz*3-3pEq(nZLN+l4DLjH_Z^!@MHKydHCRCD3_#=z76qK}TPdS|Rob5oA;_WVI_5*E+}?q?n0gn|tGZYzNu2!rkAmUV)e~cfL*D!38MHq7zGGO$q+1r@xeoqiIZ_D=C;@Z%<-ebc zEyEVc_1|jVb)zNt*~_E^(fIpb7=|j%rBnCINWZ-)pMk!~=w8 zClk9(q;PR_Yks$hP(}IYaNSeZyDlgno+LspcF3eeqqD)Ix$=YbQH3}|fD6hEoxV=5 z!VK0aE|Kf8v9868zrFJR-eZob9x0L<<1+Xf+*8s&a~tTF4`VR${iDz{bc411NgGHm zGO4vd-&eH5c;eC!Z)zJ`JUIR5&S$y*s|6rK>N{yAu@Q|J44W`D+uZIbi3KgC-|XCQ zurK}i^;F@K+S=&i^oB`2583=;mO3BpxaGoUrJrX^L3iSQI3eQv9LoJpAKK(Wz7u0e zbQF`XSO?<+GbOE154{#YRO|d4K!jRc`~p{`HPzmC}={zr}@ur@)+( z9!mj>=Mkucj4tapw}A?|>s6FUp_~ONV0*VH1#1QSkugXZAt1t{lUe5KH1ec+_lFPZ zXj@E&8wjMogb#johmzL$mV<>TYE&-8@#_-7>=C3o(KGO^KOj!hzJa_0XMSB!@Q%{m zTR3E&3+Co9ISl#UZuM!v!t3ozp~$3Xq;i02ZpIXD+td2#a%9fx9elmv!;|1TE>I)z zgSuM-DJ8!>)I%moS=?hq;L`MC9mYCZDwGSxIx{R=08M8vxBt6R3E~8ZX>zh*Z{09x zNe@4DTZheM7sJ6xel__A$R@T3HlFVPCc?f|$vVc^>{EXX4Am^+ZBtw%eVVX8EiKxp z$KDkBU#wUL&jNrliU0%7%ENWxpA(lch+_LMwJ)=uFlRKw0vl6iTlp1S3oXRF*eC&u zNXpqZ)`Cg$0S}zC){xg97XI7CEQhqbR9AFT*Qo%1kGs$+7zvVTLx<56&KB2t}coiO&A^T*@ca?cuu6k4!*ME7~QgLmc zN7EUttr41ht`gE96xom{Q3P3m&69T&{Wa@m)MNqeu~43oQS+tQFpd(C6T2 zk;0^@5OWD949QC^8Y{@5;qcFW3SpRVOzTOYn-*iSh^1@D&CaHlHzHg~1#NxV`#W}s z;0S{0>i%n45i+?;tS=f2JfjxE(NmJ}XE+CsNn|l1GvZm*s<$~pwov0=_w)p^p z;zpSz{%3U>piw3vo^)m^ezK7?jfu9gs{~Te^^&!oipuy=z@F6#$H!k!|~9aDJ8d}!4K_Mq~%&OnbJTQx~!%#s4zWbpG? zrwZMW7^LM~%wdk`g(fnc)DaSF0vD1J{z;sUV}G5ixv!2OMNF*u^cK@#tbABAD&OkN+!5&l#sEMP0%Yko+243t|CWT3#gjdLj-*I32UFMy0Mw)cV)(QxMW&2F< z9bZztb6*uW-xEK9u*h>3pDGMslt1^MAjR;$ONG|e8EE&U^#x!rFwGrOP$@Ke`|mj} zrowzGb064kT6|us+T?>|v8#dJgZF?kew^Jw>|g`M9(yMkXBv zX>qtv`GL#e)N(wLNzjPkbQ7y9)Cqv$`_y#lS=LKVa?3Sah!gE=Moj2(*fJ8My-0s59b5w> zA@PB&KJI!$D}XI`%HN7c$3jdal zxG3ta%|*}XefNvqXSX1E&6RnhDPgkja)2th#b|l$u~;vO-VAWpptd8D-f2LFV+1WX z-v|&q+s9!yByhP*?N6Eq+h%}#F!VfR8060W6i9v|8|5-a``MN&IRvFoJdz^hL-<t^oD)|7wbk2i&H@?a;RV^o!6g&}k zjOjK&pQ`t)hz#sbXSq!{?GT2x%&TipPtC`>8FI%UW&ve;N#JK4(|Ki-x_{wK{o z-)nZ}EGvn|@79JsCv2oNWjApukL`V1SOW-j8uhT7%bjrJiTrj?2E*t?jJ8k><qAfKJn5st1T9{JQU6 zdjwNCM_DEepXqiQ6s4-O0h2(^ zZ)Fo{aV_4uKz)8$AokdH?%Iq~+|apgjoKsJF*O$0tO#p4yn)b|Gqac9P+EPnT_sZ3 zZ**W_adJ_e&CQ{v7!g}M^|+V#z9K)M<1ET4%LE;#`U2j@i9Hn;djN|&x0;FG)?d?S zrQK`9Um30~NR^DP(D8JMmZ)_N#o_l@V(cYnZWn_Pu;w$S zV<&$$_#XgrVmL}hf&8fEwhk|kN$O@}BnidBdgv<&n@dPn0^8a^u<@H`toR7*TkTjW z!cpOUUBIo-v$3*&Dz<{efmbN~w*>I`=R?IVMj^JdodsEpwqzi*e{vB3)c1?j`FpR_() z19mLN#x7<9H`n{7HD>aSAKRAWuhqDQJpyj`h29zpD?gdBBa*~~3ogqYG2u?5ZRIKQ zqHs+`oSE6`vl3cI*@?$f%LcQBz}^O8_+vPvB7kKtR5Cg6;M-MxtlZc`o(2zZM=Gv` z<~{;r0pIf}GtUkugwJLj7N*cvpchZ%)(+z|@jJibfis00zTXaz^vqt^A{gM6FYYOO zP<6p&Y&FIp#t6SqR(;i8fLdOK4wuRxReIG&%x1i*6MuVI9e$ZL(L3Ci{s7tJru=hP zxt=33Y0BQi)A|0e6StM1bB#ly+SXU-#yf?KU2(yP6My_HVAb1xil*x^`Or8Maq^n8 z%qW)Ew`o&Jr1N(H+9$I6iMTbBVg)&3l&9!JAe*fRbCe71qWSD~HQxYkk=Z*2BOjR* zp%5=sT1t8(%Jx>aw~av?KwLMQamd41nBcy6HYcOv1v)YzBzPh8{d%bM6HR#&_}-Qh z<3&i2hp@ z-^)mnt0u;&tE24{TO6fQP2(H?T+(Q6i*}M}!r7@3^H6s+6^G}sPcT;eonFZyau*5n zQp!AyBx*&cg2I4ftq7$!5;rc1-cmXNVY<6iGg4kwS``6f4xj)U8og)~`Qwrp?F0Bn!vTFU1aTCaxPD}mt8nFukUN3yf2_;#yA}TFYDcEw zbD6pnEAs3#j6c4FcA299#%MO8wM&E%U9y+cQ4RdcAY52ELFm|GsL`_I*A$-&-`evI z2_QnCimLVis_pSD)$FUoB&2JGwLNNkhIXG;zGW7Y{CO4dT>jW{JY<05#}Y!$?xS)P};gNhg3Zzt+^L0YIT&`fJV?Z=F*( zl+2%k$b~#S|2=Bq-1m>iJ@pKr;u7*rf5JMh9Z5$*hSUX0$OHSk(mt!&F;S<>1dO$W z2?BKwU=uh3-GNHFp4W$`^2$BD>I$pK4gKa8N}veR9tBk(lOQxz(){L9RAILw0 z*fpaw{=4Fx1jKKdOD5rrKzeLNRTNlKAgg_0^*YnI=hN@GK&k#2ns;4*pyu|fWm0f) zh=E;(UdnOiP%GM(X(#A#O?4~Vv26hnh*Q(hb z8#QRM#x^Z5|FLj&wF4EDlT1!qaRCf7f`lVF6@;B_}q|qUg|OIj$`^kjLQrx&rpdVSjGXQo#>$T#t+Ty+i%+uVJs+FHpg6$~AuNZ;!|S(97NS z9%2AhI|O!-`%gfUw`wSN3}7o}q)JX3onK3>b`S(R3N}oX3ph$wn8o6=QXLOjz5Lz| zRs0#iFdIGvUgI@6zn)E`T$pt6Mi}4?-7r<^`m_+Tsj(qu3)V;iIA7v(&U7VMIRM$} zAM(ap4;}?-w~LFXMD|T>J@NXIh~2=b2fBa)z%>;9aWHO6b@(iGVs;2Kuk^GCher*1 zLZhCD3<&FkcM?fAPQqd!>C*J%MIKeM&2c!i8w$B5!e_rG{_3^WwqKumu zJ=G8JVRQ^WO;OU9vKO@w;-ipldje>S0DPJQ8=G&ZB(&`uIGkqB(h?jkYpwv^A%iRl zER*GmOd1NrIlik`i2bF1otDOHmVT z&cJdv)XnyuN!nJb3h&6SstJy`A1_0c=op@JRGLt6b@^w!cUOZXBb8GEoDK^Qsw;x? zGa5^26k~+RILpiEU2c7 zW8K-W7t69#vx^}auqFG?7Y4&i9Z&vkdJX7i0Zb(xKo)%?tLwknicebD&4A;)RiBuJNVGevm2y<)Xfk0q<}(Ng_ntQ3I}Fd3%(6`ZTV~Ul7nL( z?j<<1!eoVTWbK#gupYt~0@sfXnWg|z2svJK@5uQWG{zm7R2?8eTSeO;37Oq=;n0>& z?~(GOSOSvn-akHr-3+=5=eHZftc!svRv`9>sqCvVqM#F@N2-Jl4TossU-$1h}W(88D4{CA^WQNd${{U!EetwN#_?~ zHewma?_T~O!}^(pwUq-&s0U^_WoVgYp4_Hi2R$;Z{EK`qD%FhaZsUuy*GWRTH(02E zT%1#Go8{DH)PrdU{HfN2_<0;jKX#gbx@>|WwE-OtR{rj)ZXspUwan&b~_tz zhk;^8YGsm*&U_fu;RxYo`&LXJUSet{$!Rc5j4`U<6=hV{*GaOqy)WWQ3m6PRn5iIk z_va;`>;@v+n`VrY>mlhL6e3KfKsx;E(gB|FnR!vuT|8ZV?ki?*px>8y6tw^QX3_6% zh6LM9phl|!2nBE4k01oIfG$>I1${tL2^0k=9_52eEq9K2CA%ZoI=@Ut0R`A)h!Ue# zyFHs7tB*tI^Yj_J5-x=YaQ60ZQD1%}av0<*C5yBIl7i+AyG&2sR7ChIS~RW82bp0_0+H>!CSTdqJG?azuPR?Vge zUD)Gw^LE04LiE2PKzYah+@K`o$6efogbfa;LYP~~@}||^Zm8S%Oa=^6yQ;GQdf01h zoBKUzmieV{HfRGl2Wm>*bROG)HGmfiaH@7(_-A|DnJ-6Nu?HO0)#w)Ey?QNnXIbT* zbC8Kx^LP;G;W&&we}kz#szPp{zCiz2!h+=2m#l~KP}kgocJHLmC0vG(*-pBfI{*?- zqaH^1jTd1T|#mvAD*Rr9L-`gb7K)KCmt?(L)1>kbA~Co)X0` z{7vZ87;k+trRf0=L72(*Ggd;%8h4u8yp%}w{A1CIi4usZiqIhe0*kvGc}Cwh3hN7T zUui!QAVt~60J*yh5%471*kg>zR3Yw1E}&kje6R8VHnH(kA-?&Af(;ZXq7y~<5>3_P z@?M}I<&Qdr_^6U)@6|zPf??6Vyk=7QnKWCB5f$lfv?~Ssi0ASlz=0IL&-~+1+D6*Ua z&KN)q^wDeTnYD3oOuzvpHjuhtJM}56;_>Q7C3Gu_od@!=lH0fvHBG1|t+Z80fPB9_ zxBZH7@QrhbbV1Ufh35OCi{a#oArrmm!#hkmzt&UZ^U>~6-4$QTxqqEvt<~(L;AQz- zPjwE@eye%FxIqAl09ht47LE;NTNWkp?e`8UJtG(^=r3U*_TDoLJazWf zzQaff|0wh zrwwBWF~4KhgqKdm_Yx)W$mcE7X>a?B@~P_8iVC6KJ7FWZWZ!rlg9--JDp~gBiG*&? z0?usjc=Ip)ly~oMx@`AHHZbaOL%4gzpDb;fL>ZKmhN8C6l_DH4Od$YL-UYn48y4}o zjU9K9B}|ir`p2LhO1u(Q!OVaB9RN^-M{f_8WP=5Dt3DD~9DE!?WcQR{9`jD##K`T~ zr!l1lT=`uFF@L79eO(?Mq-~ntX0QJR?0cEoN zFDw!ma^vVT;o{209L=OQuEe%2(DQqdNn)A|jd!EElWBuzC6-qIf;t`veg4!Z#9{dA z*z(H4=s=sgK5U-nTUjLPDzZBr`yD;;Wb_HViPGCrY){9STNw;EIC0`6kHB(s8q`ur z+cU8hj+6)OVbDEH;$o*2UJ|{$zJiVcB-!O>8yL%VwR*|$?teh zDWk+DCls}j{62y3x)M5{a;q5_phayoI1B6aDJz&mf*?^i2zVJpWiku2{e2E<`> z6nda)@ggyROtII|&t0L+f?~57zc2Rpp?7Y&we348_&@t45cgs0`{se)*J&CjHK4u- z@LoYa`j!>A$8amC4&)M;J&feQ-OmRKqG9lFq4Vnlvn3epqKEE+H#zk<%tX1}t32L9 zr6)8AE$FICmq-k}%&NA+XZc~ki?HMHj7~xh@yhtnR~H^s&6-4&Sd5Uu)qTNxc|uGg zyV(HK6}GbO^m*+{-I*y|Y{5TjLwA?-Jz5*PSt3J&smeS`BLimC5n&IJ8`i|w9Gwe3 zl}OiO3fG(;q${zy45B`k*h$s-BAlu|7mpo>z4awZ`xZSL4iKmCNxt`^MVO;^xj;G) zpKIm~yvIZ~Mp2hqYG_QMZL3@C{78I~CJ~0xuI`det_gPMKAKZJt1uXT#H;A@j6;;X zQU+kh3i8vaLpulpf`~;^WR_beN5*2yM%>@Hgy|hPZcF2t0NI=gE^yZ#vyyW2BN)h-Ny+O0h0E9fx z;O+*XZi98eIz4+hlTH}lI$pAjelzcVDufa&<&YqkG5%)O*4X`sV2vTd-09e_$UW2@ z4rIW9s>oO#Jw<)o+IW6zN7rI?$t6^JwS8*O{_V*rAC?B2gjo(3nh$+LkA&kD1%3Rj zfo;++PJ#m;zSw(5j5Wg|n-3dZ{GZ|+ZZOz3nA>Zj#=GUV4k*ktNeJ>mO+)tJ z44a2-!`>ZVn0u|!_~IiV+&UupOs)vrHkXt|G_@P<@f9>H>_De_pXbCcv4cgnW`|O+ z*_Q9(rN!LBpOFbt`N;>!gXP(P!i>$#rwy{7JXhS@)o|bp@a7i6^EirQcwvOx)MYu>O@W%Nn z_2vZh`Gku^G>nU6YR*aUx>2MvZ~!RjHuAdavAxh+?fchcgu8AMSFZ2>$q!rsv@rs8 z-->{H>xK1zMO-Vg*Pl%O0bEvdQ`r8yh})3}^>q`2Eny9);Hp%A=U6;4DYdz;{oj>o zDgd)qx)zfEjgg;J@ANTHY8B#6%hEa6`0sOCPQWEXKOsZ(EN#Ym|DPtcp++l``9(${ zv40~GDWm{C9dj)vUU$aY4-5>bH3pT?u`E*nInTe=LTcceM+AMwh}f&sw8;NyjJvMR z2C{8!5Zm7Wjh3kjR1gd(S8T-dcA=^1|Axmf1iULlv|UUB&VXwFzsSVX;2WKxvk^8ZXr9|Gv`B_H%IN&K@_%m3+86zEdY z<-ZsI`fG@WaX0sO5&Dt-Z}9C^;gbqPhM@q*fy}@Pd4&7MZtFN4h;#l=hi~oqxSL&I zz*+)b?f+jmGwi_{+j~`4i^P<+{~Jqj;OSBmKuc!-zZN|}V*-`Czx`S@lp|Qg>L~+uH4o5f5X-WNuKdy vuaw`BPa?dh3$WR$Y#OnDKXc%|qKv03-yok%j|P5)1n7yHj%xV>o6!FUB;2tV literal 0 HcmV?d00001 diff --git a/addons/web/static/src/img/openerp_partner_gold.png b/addons/web/static/src/img/openerp_partner_gold.png new file mode 100644 index 0000000000000000000000000000000000000000..098f5f6c8969442bdb0cb13ff167b35b7c32ec1a GIT binary patch literal 30071 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 EKl-B(j{pDw literal 0 HcmV?d00001 diff --git a/addons/web/static/src/img/openerp_partner_gold.svg b/addons/web/static/src/img/openerp_partner_gold.svg new file mode 100644 index 00000000000..48b400a1122 --- /dev/null +++ b/addons/web/static/src/img/openerp_partner_gold.svg @@ -0,0 +1,97 @@ + + + + +Created by potrace 1.10, written by Peter Selinger 2001-2011 + + + + + + + + + + + diff --git a/addons/web/static/src/img/openerp_partner_ready.png b/addons/web/static/src/img/openerp_partner_ready.png new file mode 100644 index 0000000000000000000000000000000000000000..36d520371437e7a209cc5674ee0c1ff3ddb56b15 GIT binary patch literal 30005 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 TD@}njO<@#e)nqE9%tHPjJcf=b literal 0 HcmV?d00001 diff --git a/addons/web/static/src/img/openerp_partner_silver.png b/addons/web/static/src/img/openerp_partner_silver.png new file mode 100644 index 0000000000000000000000000000000000000000..aa25083e35926a6809e8ddeb49406a9cb637ed89 GIT binary patch literal 28331 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 eZ{j_;LdTo

- - - - - - - - - - - - - - - - -
150 x 60250 x 90
290 x 90320 x 100
Original
+ + Looking for openerp logo?
+ Thank you for using and promoting the OpenERP brand.Select the logo that fits your need. + +
+
+ Test + +
+
+ Test +
Official Ready Partners Only
+ Low Res |High Res |Vectorial
+
+
+ Test +
Official Silver Partners Only
+ Low Res |High Res |Vectorial
+
+
+ Test +
Official Golden Partners Only
+ Low Res |High Res |Vectorial
+
+
From 4833726717f515b129273fc04bea515e1dbb5d24 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Thu, 8 Nov 2012 15:52:42 +0530 Subject: [PATCH 073/364] [IMP] Improve css. bzr revid: bth@tinyerp.com-20121108102242-0u95m8s6yexa33vq --- addons/web/static/src/css/base.css | 18 +++++++++++++++--- addons/web/static/src/xml/base.xml | 10 ++++++---- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 0a1d4b410fb..9b8dbfa8c3a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3024,7 +3024,7 @@ div.ui-widget-overlay { line-height: 20px; } .resolution { - width: 300px; + width: 350px; background-color: white; margin-bottom: 15px; margin-left: 5px; @@ -3032,7 +3032,18 @@ div.ui-widget-overlay { .resolution .res { display: table; width:100%; - border:1px solid; +} +span.res { + border:1px solid; + padding-top: 10px; + border-bottom: 0px; +} +span.res span { + padding-left: 5px; +} +div.res { + border:1px solid; + border-top: 0px; } .resolution .res > div { border-bottom: 1px solid; @@ -3044,9 +3055,10 @@ div.ui-widget-overlay { display: inline; } .res img { - width: 100px; + width: 150px; height: 40px; padding-top: 20px; + padding-left: 5px; } .res span a { font-size:10px; diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index cff5a9ac20f..f5c4d550d7b 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -12,11 +12,13 @@
- - Looking for openerp logo?
- Thank you for using and promoting the OpenERP brand.Select the logo that fits your need. + + Looking for openerp logo?
 + Thank you for using and promoting the OpenERP brand.Select
+ the logo that fits your need. + -
+
Test
Free to Use
From ea14b219958be0a3728421d6cb602f62a95f6518 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Fri, 9 Nov 2012 11:37:30 +0530 Subject: [PATCH 074/364] [IMP] Improve css and structure. bzr revid: bth@tinyerp.com-20121109060730-c7fxdk1rwokw3npe --- addons/web/static/src/css/base.css | 20 ++++---------------- addons/web/static/src/xml/base.xml | 12 ++++++------ 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 9b8dbfa8c3a..c4d65367fac 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3019,10 +3019,6 @@ div.ui-widget-overlay { border-radius: 3px; } -.resolution table { - width: 100%; - line-height: 20px; -} .resolution { width: 350px; background-color: white; @@ -3033,24 +3029,19 @@ div.ui-widget-overlay { display: table; width:100%; } -span.res { - border:1px solid; - padding-top: 10px; +.res .simtext { border-bottom: 0px; -} -span.res span { - padding-left: 5px; + padding: 5px; + height: auto; } div.res { border:1px solid; - border-top: 0px; } .resolution .res > div { border-bottom: 1px solid; height: 70px; clear: both; } - .resolution .res div div { display: inline; } @@ -3062,10 +3053,7 @@ div.res { } .res span a { font-size:10px; - padding-left: 5px; -} -.resolution table td { - valign: middle; + padding-right: 5px; } @media print { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index f5c4d550d7b..b4f5a39e8d5 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -12,13 +12,13 @@
- - Looking for openerp logo?
 - Thank you for using and promoting the OpenERP brand.Select
- the logo that fits your need. - -
+
+ Looking for openerp logo?

+ Thank you for using and promoting the OpenERP brand.Select

+ the logo that fits your need. + +
Test
Free to Use
From 14f00d4e898259864cdd74b27012c0cf6bf51a20 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Fri, 9 Nov 2012 11:50:14 +0530 Subject: [PATCH 075/364] [IMP] Improve css. bzr revid: bth@tinyerp.com-20121109062014-uhbwcf1ztldz14m6 --- addons/web/static/src/css/base.css | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c4d65367fac..c4e0c66f223 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3024,24 +3024,25 @@ div.ui-widget-overlay { background-color: white; margin-bottom: 15px; margin-left: 5px; + position: relative; } .resolution .res { display: table; width:100%; } +div.res { + border:1px solid; +} +.resolution .res > div:not(.simtext) { + border-bottom: 1px solid; + height: 70px; + clear: both; +} .res .simtext { border-bottom: 0px; padding: 5px; height: auto; } -div.res { - border:1px solid; -} -.resolution .res > div { - border-bottom: 1px solid; - height: 70px; - clear: both; -} .resolution .res div div { display: inline; } From 94935e92a5805a1602ab7b990d2c825196204733 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Fri, 9 Nov 2012 12:25:46 +0530 Subject: [PATCH 076/364] [IMP] Add css class. bzr revid: bth@tinyerp.com-20121109065546-0k3rmulfy59kyl6g --- addons/web/static/src/css/base.css | 4 ++++ addons/web/static/src/xml/base.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c4e0c66f223..44ac85db98e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3043,6 +3043,10 @@ div.res { padding: 5px; height: auto; } +.simtext span { + font-size: 8px; + color:grey; +} .resolution .res div div { display: inline; } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index b4f5a39e8d5..9c065e6bb0b 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -15,7 +15,7 @@
Looking for openerp logo?

- Thank you for using and promoting the OpenERP brand.Select

+ Thank you for using and promoting the OpenERP brand.Select

the logo that fits your need.
From 0ffd487d182df5f10abf792463f1ad552478e303 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Fri, 9 Nov 2012 12:34:34 +0530 Subject: [PATCH 077/364] [IMP] Add css class and remove inline style. bzr revid: bth@tinyerp.com-20121109070434-00onkcty4js1lzbk --- addons/web/static/src/css/base.css | 3 +++ addons/web/static/src/xml/base.xml | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 44ac85db98e..09cf01f840e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3049,6 +3049,9 @@ div.res { } .resolution .res div div { display: inline; + position: absolute; + padding-top: 30px; + padding-left:10px; } .res img { width: 150px; diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 9c065e6bb0b..b1e2f0e6645 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -21,22 +21,22 @@
Test -
Free to Use
+
Test -
Official Ready Partners Only
+
Official Ready Partners Only
Low Res |High Res |Vectorial
Test -
Official Silver Partners Only
+
Official Silver Partners Only
Low Res |High Res |Vectorial
Test -
Official Golden Partners Only
+
Official Golden Partners Only
Low Res |High Res |Vectorial
From 4d24c3fbec90939fab24cf3d5f242b35b6dfb896 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Fri, 9 Nov 2012 16:21:20 +0530 Subject: [PATCH 078/364] [IMP] Add attribute on div. bzr revid: bth@tinyerp.com-20121109105120-iihflpk9h88uhism --- addons/web/static/src/css/base.css | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 09cf01f840e..82068b15fc7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3025,6 +3025,7 @@ div.ui-widget-overlay { margin-bottom: 15px; margin-left: 5px; position: relative; + z-index: 10; } .resolution .res { display: table; From 155cc738ee822df7c8911988a31171e24226022d Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Fri, 9 Nov 2012 16:32:43 +0530 Subject: [PATCH 079/364] [IMP] Improve text. bzr revid: bth@tinyerp.com-20121109110243-bhlnf0knx1zqmx38 --- addons/web/static/src/xml/base.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index b1e2f0e6645..37a911ff42a 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -14,7 +14,7 @@
- Looking for openerp logo?

+ Looking for the OpenERP logo?

Thank you for using and promoting the OpenERP brand.Select

the logo that fits your need. From d867a08f7cc3c33848611cca164c2eebc83c144b Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Fri, 9 Nov 2012 16:56:28 +0530 Subject: [PATCH 080/364] [IMP]Sass changes. bzr revid: bth@tinyerp.com-20121109112628-pikbl2bk9exg5qeb --- addons/web/static/src/css/base.css | 70 ++++++++++++++++------------- addons/web/static/src/css/base.sass | 49 +++++++++++++++++--- 2 files changed, 82 insertions(+), 37 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 82068b15fc7..025efab78a9 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -476,13 +476,13 @@ max-height: 180px; } .openerp .oe_view_manager_current a.accessactive { - display:inline-block; - text-decoration:none; + display: inline-block; + text-decoration: none; } -.openerp .oe_view_manager_current .accessactive:first-letter{ - text-decoration:underline; +.openerp .oe_view_manager_current .accessactive:first-letter { + text-decoration: underline; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - font-weight:bold; + font-weight: bold; } .openerp .oe_button.oe_link { border: none; @@ -3020,49 +3020,55 @@ div.ui-widget-overlay { } .resolution { - width: 350px; - background-color: white; - margin-bottom: 15px; - margin-left: 5px; - position: relative; - z-index: 10; + width: 350px; + background-color: white; + margin-bottom: 15px; + margin-left: 5px; + position: relative; + z-index: 10; } .resolution .res { - display: table; - width:100%; + display: table; + width: 100%; } + div.res { - border:1px solid; + border: 1px solid; } + .resolution .res > div:not(.simtext) { - border-bottom: 1px solid; - height: 70px; - clear: both; + border-bottom: 1px solid; + height: 70px; + clear: both; } + .res .simtext { - border-bottom: 0px; - padding: 5px; - height: auto; + border-bottom: 0px; + padding: 5px; + height: auto; } + .simtext span { - font-size: 8px; - color:grey; + font-size: 8px; + color: grey; } + .resolution .res div div { - display: inline; - position: absolute; - padding-top: 30px; - padding-left:10px; + display: inline; + position: absolute; + padding-top: 30px; + padding-left: 10px; } + .res img { - width: 150px; - height: 40px; - padding-top: 20px; - padding-left: 5px; + width: 150px; + height: 40px; + padding-top: 20px; + padding-left: 5px; } .res span a { - font-size:10px; - padding-right: 5px; + font-size: 10px; + padding-right: 5px; } @media print { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index a1bb16d6856..0c336d8ee83 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2395,11 +2395,50 @@ div.ui-widget-overlay .ui-corner-all @include radius(3px) -.resolution table - width: 100% - line-height: 20px - td - valign: middle +.resolution + width: 350px + background-color: white + margin-bottom: 15px + margin-left: 5px + position: relative + z-index: 10 + .res + display: table + width: 100% + +div.res + border: 1px solid + +.resolution .res > div:not(.simtext) + border-bottom: 1px solid + height: 70px + clear: both + +.res .simtext + border-bottom: 0px + padding: 5px + height: auto + +.simtext span + font-size: 8px + color: grey + +.resolution .res div div + display: inline + position: absolute + padding-top: 30px + padding-left: 10px + +.res + img + width: 150px + height: 40px + padding-top: 20px + padding-left: 5px + span a + font-size: 10px + padding-right: 5px + @media print .openerp From a6d97dccbd83a472aab48c148dacba5cc3f2bafd Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Fri, 9 Nov 2012 13:34:23 +0100 Subject: [PATCH 081/364] [ADD]Changes of context bzr revid: dle@openerp.com-20121109123423-3tkugord76afa2r9 --- addons/account/__openerp__.py | 1 + addons/account/account_view.xml | 4 +- .../src/js/account_move_reconciliation.js | 65 ------------------- 3 files changed, 3 insertions(+), 67 deletions(-) diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 39feb2cd546..2641367edb3 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -128,6 +128,7 @@ for a particular financial year and for preparation of vouchers there is a modul ], 'js': [ 'static/src/js/account_move_reconciliation.js', + 'static/src/js/account_move_line_quickadd.js', ], 'qweb' : [ diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 6dbab2cd5e9..73980aecbd9 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1059,9 +1059,9 @@ account.move.line - + - + diff --git a/addons/account/static/src/js/account_move_reconciliation.js b/addons/account/static/src/js/account_move_reconciliation.js index d1ad07b8a5f..eed56632808 100644 --- a/addons/account/static/src/js/account_move_reconciliation.js +++ b/addons/account/static/src/js/account_move_reconciliation.js @@ -125,69 +125,4 @@ openerp.account = function (instance) { this._super.apply(this, arguments); }, }); - - instance.web.views.add('tree_account_move_line_quickadd', 'instance.web.account.QuickAddListView'); - instance.web.account.QuickAddListView = instance.web.ListView.extend({ - init: function() { - var self = this; - this._super.apply(this, arguments); - this.journals = []; - this.periods = []; - this.current_journal = null; - this.current_period = null; - }, - load_list: function() { - var self = this; - var tmp = this._super.apply(this, arguments); - - this.$el.prepend(QWeb.render("AccountMoveLineQuickAdd", {widget: this})); - - this.$("#oe_account_select_journal").change(function() { - self.current_journal = parseInt(this.value); - self.do_search(self.last_domain, self.last_context, self.last_group_by); - }); - this.$("#oe_account_select_period").change(function() { - self.current_period = parseInt(this.value); - self.do_search(self.last_domain, self.last_context, self.last_group_by); - }); - - return tmp; - }, - do_search: function(domain, context, group_by) { - var self = this; - this.last_domain = domain; - this.last_context = context; - this.last_group_by = group_by; - this.old_search = _.bind(this._super, this); - var mod = new instance.web.Model("account.move.line", context, domain); - var getarray = []; - getarray.push(mod.call("list_journals", []).pipe(function(result) { - self.journals = result; - })); - getarray.push(mod.call("list_periods", []).pipe(function(result) { - self.periods = result; - })); - $.when.apply($, getarray).done(function () { - self.search_by_journal_period(); - }); - }, - search_by_journal_period: function() { - var self = this; - var fct = function() { - compoundDomain = new instance.web.CompoundDomain(self.last_domain, - [ - ["journal_id", "=", self.current_journal === null ? self.journals[0][0] : self.current_journal], - ["period_id", "=", self.current_period === null ? self.journals[0][0] :self.current_period] - ]); - return self.old_search(compoundDomain, self.last_context, self.last_group_by); - }; - return fct(); - }, - - do_select: function (ids, records) { - this.trigger('record_selected') - this._super.apply(this, arguments); - }, - }); - }; From 3f034c27a43ef6cd2560dcf2790494bda99e58d4 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Fri, 9 Nov 2012 13:38:08 +0100 Subject: [PATCH 082/364] [ADD]Missing files bzr revid: dle@openerp.com-20121109123808-9a6n4mn5dh6vidkb --- .../src/js/account_move_line_quickadd.js | 81 +++++++++++++++++++ .../src/xml/account_move_line_quickadd.xml | 34 ++++++++ 2 files changed, 115 insertions(+) create mode 100644 addons/account/static/src/js/account_move_line_quickadd.js create mode 100644 addons/account/static/src/xml/account_move_line_quickadd.xml diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js new file mode 100644 index 00000000000..91a725fce82 --- /dev/null +++ b/addons/account/static/src/js/account_move_line_quickadd.js @@ -0,0 +1,81 @@ +openerp.account = function (instance) { + var _t = instance.web._t, + _lt = instance.web._lt; + var QWeb = instance.web.qweb; + + instance.web.account = {}; + + instance.web.views.add('tree_account_move_line_quickadd', 'instance.web.account.QuickAddListView'); + instance.web.account.QuickAddListView = instance.web.ListView.extend({ + _template: 'ListView', + + init: function() { + var self = this; + this._super.apply(this, arguments); + this.journals = []; + this.periods = []; + this.current_journal = null; + this.current_period = null; + }, + load_list: function() { + var self = this; + var tmp = this._super.apply(this, arguments); + + this.$el.prepend(QWeb.render("AccountMoveLineQuickAdd", {widget: this})); + + this.$("#oe_account_select_journal").change(function() { + self.current_journal = parseInt(this.value); + self.do_search(self.last_domain, self.last_context, self.last_group_by); + }); + this.$("#oe_account_select_period").change(function() { + self.current_period = parseInt(this.value); + self.do_search(self.last_domain, self.last_context, self.last_group_by); + }); + return tmp; + }, + do_search: function(domain, context, group_by) { + var self = this; + this.last_domain = domain; + this.last_context = context; + this.last_group_by = group_by; + this.old_search = _.bind(this._super, this); + var mod = new instance.web.Model("account.move.line", context, domain); + var getarray = []; + getarray.push(mod.call("list_journals", []).then(function(result) { + self.journals = result; + })); + getarray.push(mod.call("list_periods", []).then(function(result) { + self.periods = result; + })); + $.when.apply($, getarray).done(function () { + self.current_journal = self.current_journal === null ? self.journals[0][0] : self.current_journal; + self.current_period = self.current_period === null ? self.periods[0][0] :self.current_period; + var tmp = self.search_by_journal_period(); + }); + }, + search_by_journal_period: function() { + var self = this; + + compoundDomain = new instance.web.CompoundDomain(self.last_domain, + [ + ["journal_id", "=", self.current_journal], + ["period_id", "=", self.current_period] + ]); + self.last_context["journal_id"] = self.current_journal; + self.last_context["period_id"] = self.current_period; + return self.old_search(compoundDomain, self.last_context, self.last_group_by); + }, + _next: function (next_record, options) { + next_record = next_record || 'succ'; + var self = this; + return this.save_edition().then(function (saveInfo) { + if (saveInfo.created || self.records.at(self.records.length-1).get("id") === saveInfo.record.get("id")) { + return self.start_edition(); + } + var record = self.records[next_record]( + saveInfo.record, {wraparound: true}); + return self.start_edition(record, options); + }); + }, + }); +}; diff --git a/addons/account/static/src/xml/account_move_line_quickadd.xml b/addons/account/static/src/xml/account_move_line_quickadd.xml new file mode 100644 index 00000000000..e43c3b4e76a --- /dev/null +++ b/addons/account/static/src/xml/account_move_line_quickadd.xml @@ -0,0 +1,34 @@ + + + + + + + + + From 4c7f0a9e060d2c14e3d448472163b4412941dc50 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 9 Nov 2012 13:56:18 +0100 Subject: [PATCH 083/364] Small corrections bzr revid: nicolas.vanhoren@openerp.com-20121109125618-kdj4w7dv88dmepi1 --- .../static/src/js/account_move_line_quickadd.js | 12 +++++------- .../static/src/xml/account_move_line_quickadd.xml | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js index 91a725fce82..cee3142d436 100644 --- a/addons/account/static/src/js/account_move_line_quickadd.js +++ b/addons/account/static/src/js/account_move_line_quickadd.js @@ -40,17 +40,15 @@ openerp.account = function (instance) { this.last_group_by = group_by; this.old_search = _.bind(this._super, this); var mod = new instance.web.Model("account.move.line", context, domain); - var getarray = []; - getarray.push(mod.call("list_journals", []).then(function(result) { + return new instance.web.Model("account.move.line", context, domain); + $.when(mod.call("list_journals", []).then(function(result) { self.journals = result; - })); - getarray.push(mod.call("list_periods", []).then(function(result) { + }),mod.call("list_periods", []).then(function(result) { self.periods = result; - })); - $.when.apply($, getarray).done(function () { + })).then(function () { self.current_journal = self.current_journal === null ? self.journals[0][0] : self.current_journal; self.current_period = self.current_period === null ? self.periods[0][0] :self.current_period; - var tmp = self.search_by_journal_period(); + return self.search_by_journal_period(); }); }, search_by_journal_period: function() { diff --git a/addons/account/static/src/xml/account_move_line_quickadd.xml b/addons/account/static/src/xml/account_move_line_quickadd.xml index e43c3b4e76a..8023ff42210 100644 --- a/addons/account/static/src/xml/account_move_line_quickadd.xml +++ b/addons/account/static/src/xml/account_move_line_quickadd.xml @@ -8,7 +8,7 @@ Journal : -
Test
Official Silver Partners Only
- Low Res |High Res |Vectorial
+ Low Res |High Res
Test
Official Golden Partners Only
- Low Res |High Res |Vectorial
+ Low Res |High Res
Test
Community Members Only
- Low Res |High Res |Vectorial
+ Low Res |High Res
From 75971d90d82430f700f7958025c986dc343bff5c Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Mon, 12 Nov 2012 15:10:00 +0100 Subject: [PATCH 089/364] [ADD]Default get journal_id and period_id bzr revid: dle@openerp.com-20121112141000-z26str1srei751of --- addons/account/account_move_line.py | 32 +++++++++++++++++-- addons/account/account_view.xml | 4 +-- .../src/js/account_move_line_quickadd.js | 11 +++++-- 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 373f8e89c29..58d6ce7a4e8 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -551,6 +551,34 @@ class account_move_line(osv.osv): cur = self.pool.get('account.journal').browse(cr, uid, context['journal_id']).currency return cur and cur.id or False + def _get_period(self, cr, uid, context=None): + """ + Return default account period value + """ + account_period_obj = self.pool.get('account.period') + ids = account_period_obj.find(cr, uid, context=context) + period_id = False + if ids: + period_id = ids[0] + return period_id + + def _get_journal(self, cr, uid, context=None): + """ + Return journal based on the journal type + """ + + journal_id = False + + journal_pool = self.pool.get('account.journal') + if context.get('journal_type', False): + jids = journal_pool.search(cr, uid, [('type','=', context.get('journal_type'))]) + if not jids: + raise osv.except_osv(_('Configuration Error!'), _('Cannot find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration/Journals/Journals.') % context.get('journal_type')) + journal_id = jids[0] + print context + return journal_id + + _defaults = { 'blocked': False, 'centralisation': 'normal', @@ -558,12 +586,12 @@ class account_move_line(osv.osv): 'date_created': fields.date.context_today, 'state': 'draft', 'currency_id': _get_currency, - 'journal_id': lambda self, cr, uid, c: c.get('journal_id', False), + 'journal_id': _get_journal, 'credit': 0.0, 'debit': 0.0, 'amount_currency': 0.0, 'account_id': lambda self, cr, uid, c: c.get('account_id', False), - 'period_id': lambda self, cr, uid, c: c.get('period_id', False), + 'period_id': _get_period, 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.move.line', context=c) } _order = "date desc, id desc" diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 354614e3598..32c545e8f6b 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1059,7 +1059,7 @@ account.move.line - + @@ -1575,7 +1575,7 @@ - {'view_mode':True} + {'view_mode':True,'journal_type':'bank'} Quick Journal Items account.move.line diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js index c12a2d856b0..612ee7c8aa2 100644 --- a/addons/account/static/src/js/account_move_line_quickadd.js +++ b/addons/account/static/src/js/account_move_line_quickadd.js @@ -17,6 +17,8 @@ openerp.account.quickadd = function (instance) { this.periods = []; this.current_journal = null; this.current_period = null; + this.default_period = null; + this.default_journal = null; }, load_list: function() { var self = this; @@ -45,9 +47,13 @@ openerp.account.quickadd = function (instance) { self.journals = result; }),mod.call("list_periods", []).then(function(result) { self.periods = result; + }),mod.call("default_get", [['journal_id','period_id'],self.last_context]).then(function(result) { + self.default_period = result['period_id']; + self.default_journal = result['journal_id']; + console.log(result); })).then(function () { - self.current_journal = self.current_journal === null ? self.journals[0][0] : self.current_journal; - self.current_period = self.current_period === null ? self.periods[0][0] :self.current_period; + self.current_journal = self.current_journal === null ? self.default_journal : self.current_journal; + self.current_period = self.current_period === null ? self.default_period :self.current_period; return self.search_by_journal_period(); }); }, @@ -79,6 +85,7 @@ openerp.account.quickadd = function (instance) { self.last_context["journal_id"] = self.current_journal; self.last_context["period_id"] = self.current_period; var compoundContext = self.last_context; + debugger; return self.old_search(compoundDomain, compoundContext, self.last_group_by); }, /*_next: function (next_record, options) { From 3c06af7a58e9688bd438814d09e34923b855a8db Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Mon, 12 Nov 2012 16:14:18 +0100 Subject: [PATCH 090/364] [IMP]Menuitem moved bzr revid: dle@openerp.com-20121112151418-ztaxxfbzpyw7s58i --- addons/account/account_move_line.py | 1 - addons/account/account_view.xml | 15 +++++++++++++-- .../static/src/js/account_move_line_quickadd.js | 1 - 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 58d6ce7a4e8..568d1f65312 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -575,7 +575,6 @@ class account_move_line(osv.osv): if not jids: raise osv.except_osv(_('Configuration Error!'), _('Cannot find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration/Journals/Journals.') % context.get('journal_type')) journal_id = jids[0] - print context return journal_id diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 32c545e8f6b..473584e3937 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1580,14 +1580,25 @@ account.move.line tree_account_move_line_quickadd + +

+ Click to register a new journal item. +

+ This view can be used by accountants in order to quickly record + entries in OpenERP. If you want to record a supplier invoice, + start by recording the line of the expense account. OpenERP + will propose to you automatically the Tax related to this + account and the counterpart "Account Payable". +

+ + sequence="2" + parent="account.menu_finance_entries"/> Date: Mon, 12 Nov 2012 16:43:18 +0100 Subject: [PATCH 091/364] [DEL]Journal items menuitem for supplier, customer and bank/cash bzr revid: dle@openerp.com-20121112154318-jt555uecspjxfj7f --- addons/account/__openerp__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 2641367edb3..614ffad5fd9 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -73,7 +73,6 @@ for a particular financial year and for preparation of vouchers there is a modul 'wizard/account_fiscalyear_close_state.xml', 'wizard/account_chart_view.xml', 'wizard/account_tax_chart_view.xml', - 'wizard/account_move_journal_view.xml', 'wizard/account_move_line_reconcile_select_view.xml', 'wizard/account_open_closed_fiscalyear_view.xml', 'wizard/account_move_line_unreconcile_select_view.xml', From cebd3c37b406a77966d65a3b61a8266745bc66d0 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Tue, 13 Nov 2012 12:17:38 +0100 Subject: [PATCH 092/364] [FIX]Readding wizard and journals items menuitem bzr revid: dle@openerp.com-20121113111738-rvvy3h3uox4odwyg --- addons/account/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 614ffad5fd9..68da4b1f8ba 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -73,6 +73,7 @@ for a particular financial year and for preparation of vouchers there is a modul 'wizard/account_fiscalyear_close_state.xml', 'wizard/account_chart_view.xml', 'wizard/account_tax_chart_view.xml', + 'wizard/account_move_journal_view.xml', 'wizard/account_move_line_reconcile_select_view.xml', 'wizard/account_open_closed_fiscalyear_view.xml', 'wizard/account_move_line_unreconcile_select_view.xml', @@ -128,7 +129,6 @@ for a particular financial year and for preparation of vouchers there is a modul 'js': [ 'static/src/js/account_move_reconciliation.js', 'static/src/js/account_move_line_quickadd.js', - ], 'qweb' : [ "static/src/xml/account_move_reconciliation.xml", From 87cab5ffa15d715f27a3658bf0c99d555ac9965c Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Tue, 13 Nov 2012 14:14:12 +0100 Subject: [PATCH 093/364] [DEL]Journal Items bzr revid: dle@openerp.com-20121113131412-6mm1pz8jhstr46pp --- addons/account/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 68da4b1f8ba..763cc723b8f 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -73,7 +73,7 @@ for a particular financial year and for preparation of vouchers there is a modul 'wizard/account_fiscalyear_close_state.xml', 'wizard/account_chart_view.xml', 'wizard/account_tax_chart_view.xml', - 'wizard/account_move_journal_view.xml', + #'wizard/account_move_journal_view.xml', 'wizard/account_move_line_reconcile_select_view.xml', 'wizard/account_open_closed_fiscalyear_view.xml', 'wizard/account_move_line_unreconcile_select_view.xml', From 796176711ade7a6955606e5de32951220cc0ddba Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Tue, 13 Nov 2012 14:41:48 +0100 Subject: [PATCH 094/364] [FIX]Failed unit test in account cause of menu item id changes bzr revid: dle@openerp.com-20121113134148-yfvlab39vn0gmeha --- addons/account/test/account_validate_account_move.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/account/test/account_validate_account_move.yml b/addons/account/test/account_validate_account_move.yml index df58da6dfea..f5dbbbc92db 100644 --- a/addons/account/test/account_validate_account_move.yml +++ b/addons/account/test/account_validate_account_move.yml @@ -32,8 +32,8 @@ import time date = self._get_date(cr, uid, {'lang': u'en_US', 'normal_view': False, 'active_model': 'ir.ui.menu', 'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'journal_id': 1, 'view_mode': False, - 'visible_id': 1, 'period_id': 6, 'tz': False, 'active_ids': [ref('menu_eaction_account_moves_sale')], - 'search_default_posted': 0, 'active_id': ref('menu_eaction_account_moves_sale')}) + 'visible_id': 1, 'period_id': 6, 'tz': False, 'active_ids': [ref('action_account_manual_account_move_line_quickadd')], + 'search_default_posted': 0, 'active_id': ref('action_account_manual_account_move_line_quickadd')}) partner = self.onchange_partner_id(cr, uid, [], False, ref('base.res_partner_12'), ref('account.cash'), debit=0, credit=2000, date=date, journal=False) account = self.onchange_account_id(cr, uid, [], account_id=ref('account.a_recv'), partner_id= ref('base.res_partner_12')) vals = { @@ -62,11 +62,11 @@ !python {model: account.move.line}: | ids = self._balance_search(cr, uid, self, 'balance', [('balance', '=', 2000.0)], None, {'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu', 'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'view_mode': False, 'visible_id': 1, - 'active_ids': [ref('menu_eaction_account_moves_sale')], 'search_default_posted': 0, 'active_id': ref('menu_eaction_account_moves_sale')}) + 'active_ids': [ref('action_account_manual_account_move_line_quickadd')], 'search_default_posted': 0, 'active_id': ref('action_account_manual_account_move_line_quickadd')}) bal = self._balance(cr, uid, ids[0][2], 'balance', None,{'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu', 'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'view_mode': False, - 'visible_id': 1, 'active_ids': [ref('menu_eaction_account_moves_sale')], 'search_default_posted': 0, - 'active_id': ref('menu_eaction_account_moves_sale')}) + 'visible_id': 1, 'active_ids': [ref('action_account_manual_account_move_line_quickadd')], 'search_default_posted': 0, + 'active_id': ref('action_account_manual_account_move_line_quickadd')}) assert bal, 'Balance has not been computed correctly' - I check that Initially account move state is "Draft" From d6ba13a3945b5829972031c49a6ab623742e040d Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Fri, 16 Nov 2012 08:53:05 +0100 Subject: [PATCH 095/364] [IMP] Minor improvements in portal views, such as contact and employees. Improved menus and string on empty views. Send the password when a partner is invited to portal via sidebar menu. bzr revid: vta@openerp.com-20121116075305-4d0olu5zlvwsxeq8 --- addons/portal/portal_view.xml | 29 +++++--- addons/portal/wizard/portal_wizard.py | 5 +- addons/portal_crm/wizard/contact.py | 9 ++- addons/portal_crm/wizard/contact_view.xml | 60 +++++++--------- addons/portal_event/portal_event_view.xml | 4 +- .../portal_hr_employees/hr_employee_view.xml | 69 +++++++++++-------- .../portal_project_issue_view.xml | 4 +- addons/portal_sale/portal_sale_view.xml | 31 +++------ 8 files changed, 105 insertions(+), 106 deletions(-) diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml index 5b39ea89525..45fa2a4dacb 100644 --- a/addons/portal/portal_view.xml +++ b/addons/portal/portal_view.xml @@ -8,18 +8,18 @@ groups="base.group_no_one,portal.group_portal" sequence="20"/> - - - + + + + - - - - - + + + + @@ -47,5 +47,12 @@ + + + + diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py index bf8353c92c1..545b771e762 100644 --- a/addons/portal/wizard/portal_wizard.py +++ b/addons/portal/wizard/portal_wizard.py @@ -39,6 +39,7 @@ You have been given access to %(portal)s. Your login account data is: Database: %(db)s Username: %(login)s +Password: %(password)s In order to complete the signin process, click on the following url: %(url)s @@ -210,6 +211,7 @@ class wizard_user(osv.osv_memory): 'name': user.name, 'login': user.login, 'url': user.signup_url, + 'password': user.password, } mail_mail = self.pool.get('mail.mail') mail_values = { @@ -219,6 +221,7 @@ class wizard_user(osv.osv_memory): 'body_html': '
%s
' % (_(WELCOME_EMAIL_BODY) % data), 'state': 'outgoing', } - return mail_mail.create(cr, uid, mail_values, context=this_context) + mail_id = mail_mail.create(cr, uid, mail_values, context=this_context) + return mail_mail.send(cr, uid, [mail_id], context=this_context) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/portal_crm/wizard/contact.py b/addons/portal_crm/wizard/contact.py index a0f0d952a66..65de0c96226 100644 --- a/addons/portal_crm/wizard/contact.py +++ b/addons/portal_crm/wizard/contact.py @@ -28,6 +28,8 @@ class crm_contact_us(osv.TransientModel): _description = 'Contact form for the portal' _inherit = 'crm.lead' _columns = { + 'subject' : fields.char('Subject', required=True), + 'body' : fields.text('Content', required=True), 'company_ids' : fields.many2many('res.company', string='Companies', readonly=True), } @@ -95,7 +97,10 @@ class crm_contact_us(osv.TransientModel): it is quite complicated to set proper rights for this object. Therefore, user SUPERUSER_ID will perform the creation. """ - values['contact_name'] = values['name'] + print values + values['name'] = values['subject'] + values['contact_name'] = values['partner_name'] + values['description'] = values['body'] crm_lead.create(cr, SUPERUSER_ID, dict(values,user_id=False), context) """ @@ -114,7 +119,7 @@ class crm_contact_us(osv.TransientModel): 'res_model': self._name, 'res_id': ids[0], 'view_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'portal_crm', 'wizard_contact_form_view_thanks')[1], - 'target': 'inline', + 'target': 'new', } def _needaction_domain_get(self, cr, uid, context=None): diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml index 778e7f9562e..70f87fe1ff8 100644 --- a/addons/portal_crm/wizard/contact_view.xml +++ b/addons/portal_crm/wizard/contact_view.xml @@ -2,31 +2,25 @@ - - + Wizard form view portal_crm.crm_contact_us
-
+

Contact us

- - - - - - - - -
-
- - - - - - + + + + + + + +
- 		-
- + + + @@ -59,18 +53,13 @@ -
-
-
- -
-
-
+ + + + +
@@ -88,15 +77,14 @@ otherwise the orm will try to select all the model's records and this will result in a permission denied error --> - + - - - Contact + + Contact Us portal_crm.crm_contact_us form inline @@ -104,7 +92,7 @@ + parent="portal.portal_company" action="action_contact_us" sequence="40"/> diff --git a/addons/portal_event/portal_event_view.xml b/addons/portal_event/portal_event_view.xml index 5d2397f6148..0a0f59d7857 100755 --- a/addons/portal_event/portal_event_view.xml +++ b/addons/portal_event/portal_event_view.xml @@ -10,14 +10,14 @@ Events ir.actions.act_window event.event - kanban,calendar,tree,form,graph + kanban,calendar,tree,form {"search_default_upcoming":1} There are no public events. + action="action_event_view" sequence="30"/> diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml index 4e133061da6..6af4abb7b7f 100644 --- a/addons/portal_hr_employees/hr_employee_view.xml +++ b/addons/portal_hr_employees/hr_employee_view.xml @@ -1,6 +1,6 @@ - + @@ -15,42 +15,51 @@ - - portal_hr_employees.employees_list + + portal_hr_employees_view portal_crm.crm_contact_us - - -

Meet the team

+
- - - - - -
-
- -
-
-

- () -

-
    -
    • -
  • Tel:
    • -
  • Mobile:
    • -
    • -
-
+ + + + +
+
+
- - - +
+

+ () +

+
    +
    • +
  • Tel:
    • +
  • Mobile:
    • +
    • +
+
+
+ + + - + + + Meet the team + portal_crm.crm_contact_us + + form + form + Here you can see our employees' public profile, if any + + + + diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml index 6502d92b4dc..5a88e54a00b 100644 --- a/addons/portal_project_issue/portal_project_issue_view.xml +++ b/addons/portal_project_issue/portal_project_issue_view.xml @@ -75,8 +75,8 @@

Click to create an issue.

- OpenERP's kanban view will help you track easily your current - pipeline of issues to fix. + You can track your claims from this menu and the action we + will take.

diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml index b46175f7feb..216cc828835 100644 --- a/addons/portal_sale/portal_sale_view.xml +++ b/addons/portal_sale/portal_sale_view.xml @@ -13,7 +13,7 @@ tree,form,calendar,graph {"search_default_draft":1} - You don't have any quotation. + We haven't sent you any quotation. @@ -23,7 +23,7 @@ tree,form,calendar,graph {"search_default_sales":1} - You don't have any sale order. + We haven't sent you any sale order. @@ -34,18 +34,7 @@ [('type','=','out')] {'default_type': 'out', 'contact_display': 'partner_address'} - You don't have any delivery order. - - - - Products - ir.actions.act_window - product.product - form - kanban,tree,form - - - There are no public products. + We haven't sent you any delivery order. @@ -55,7 +44,7 @@ [('type','=','out_invoice')] {'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'} - You don't have any invoice. + We haven't sent you any invoice. @@ -65,7 +54,7 @@ {'type':'receipt'} current - You don't have any refunds or payments. + We haven't sent you any credit note. - - - + + From e92a31e2bb365a1453d555bbf8d18069ed94299a Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Fri, 16 Nov 2012 08:57:44 +0100 Subject: [PATCH 096/364] [IMP] Now portal users can subscribe to public content. bzr revid: vta@openerp.com-20121116075744-tclpsjxi1ut6wvh8 --- addons/mail/mail_thread.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index ee1a015396b..4f7871ca961 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -796,11 +796,12 @@ class mail_thread(osv.AbstractModel): def message_subscribe(self, cr, uid, ids, partner_ids, subtype_ids=None, context=None): """ Add partners to the records followers. """ - self.write(cr, uid, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context) + self.check_access_rights(cr, uid, 'read') + self.write(cr, SUPERUSER_ID, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context) # if subtypes are not specified (and not set to a void list), fetch default ones if subtype_ids is None: subtype_obj = self.pool.get('mail.message.subtype') - subtype_ids = subtype_obj.search(cr, uid, [('default', '=', True), '|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context) + subtype_ids = subtype_obj.search(cr, SUPERUSER_ID, [('default', '=', True), '|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context) # update the subscriptions fol_obj = self.pool.get('mail.followers') fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('res_id', 'in', ids), ('partner_id', 'in', partner_ids)], context=context) From e3ca4012bce49cc375fb8a92cd01a81d79de93c1 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Fri, 16 Nov 2012 14:48:04 +0530 Subject: [PATCH 097/364] [FIX]Minor changes bzr revid: vja@tinyerp.com-20121116091804-3lalobfufyp6yyx4 --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/js/view_form.js | 39 ++++++++++++++++++++------- addons/web/static/src/xml/base.xml | 8 +++--- 3 files changed, 34 insertions(+), 15 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 5b40b818dc3..f6dfd9f606e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -471,7 +471,7 @@ .openerp .oe_form_buttons [accesskey] > p { display:inline; } -.openerp .oe_form_buttons .accessactive { +.openerp .oe_form_buttons span.access ,.oe_form_button span.access{ text-decoration:underline; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); font-weight:bold; diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index d732d66e0ba..3c0cd5cfb96 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -227,17 +227,36 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM }, widgetAccesskey:function(){ var self = this; - self.$buttons.find("[accesskey]").html(function(i, html){ - return html.replace(/^[^a-zA-Z]*([a-zA-Z])/g, '

$1

'); + $(document).bind('keydown',function(e){ + var list = $(document).find('.oe_form_buttons span button,.oe_form_buttons span a,.oe_application .oe_form_button, oe_list_content.oe_form_field_one2many_list_row_add a'); + list = _.reject(list,function(r){ return $(r).hasClass('oe_form_invisible')}) + var accesskey = _.map(list,function(r){ return $(r).attr('accesskey') }); + _.each(list,function(el,i){ + if (!$(el).attr("accesskey")) { + var text = $(el).text().trim().substr(0,1); + if (_.contains(accesskey.slice(0, i),text)){ + var index = $(el).text().trim().indexOf(text); + var str = $(el).text().trim().substr(index + 1, index + 1); + $(el).attr('accesskey',str); + accesskey[i] = str; + }else { + $(el).attr('accesskey',text); + accesskey[i] = text ; + } + } + }) + if (e.keyCode === e.which) { + _.each(list,function(rl,i){ + $(rl).html(function(i, html){ + return $(rl).text().replace($(rl).attr('accesskey'), '' + $(rl).attr('accesskey') + ''); + }) + }) + }}).keyup(function(){ + var accesskey_list = $(document).find('.oe_form_buttons span button,.oe_form_buttons span a,.oe_application .oe_form_button, oe_list_content.oe_form_field_one2many_list_row_add a'); + accesskey_list.each(function(){ + $(this).find('span.access').removeClass('access'); + }) }); - $(document).keydown(function(e){ - self.$buttons.find("[accesskey] >p").removeClass("accessactive"); - if (e.keyCode === $.ui.keyCode.ALT || e.keyCode === $.ui.keyCode.SHIFT && e.altKey) { - self.$buttons.find("[accesskey] >p").addClass("accessactive"); - } - }).keyup(function(){ - self.$buttons.find("[accesskey] > p").removeClass("accessactive"); - }) }, widgetFocused: function() { // Clear click flag if used to focus a widget diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 22ac56941d7..1c29d3181ef 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -776,15 +776,15 @@
- +
+ type="button" class="oe_button oe_form_button_create">Create - + or - Discard + Discard
From ed3c46aa6f973f65d6df0db295ec529789e927e4 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Fri, 16 Nov 2012 11:30:48 +0100 Subject: [PATCH 098/364] [FIX] Move required to the view. bzr revid: vta@openerp.com-20121116103048-0ervln9ekqly89qx --- addons/portal_crm/wizard/contact.py | 4 ++-- addons/portal_crm/wizard/contact_view.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/portal_crm/wizard/contact.py b/addons/portal_crm/wizard/contact.py index 65de0c96226..09605257a5a 100644 --- a/addons/portal_crm/wizard/contact.py +++ b/addons/portal_crm/wizard/contact.py @@ -28,8 +28,8 @@ class crm_contact_us(osv.TransientModel): _description = 'Contact form for the portal' _inherit = 'crm.lead' _columns = { - 'subject' : fields.char('Subject', required=True), - 'body' : fields.text('Content', required=True), + 'subject' : fields.char('Subject'), + 'body' : fields.text('Content'), 'company_ids' : fields.many2many('res.company', string='Companies', readonly=True), } diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml index 70f87fe1ff8..dce8e18a69b 100644 --- a/addons/portal_crm/wizard/contact_view.xml +++ b/addons/portal_crm/wizard/contact_view.xml @@ -15,8 +15,8 @@ - - + +
From 30ea1678309f9ee5f0c62c977634367209b5d881 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Mon, 19 Nov 2012 12:19:07 +0100 Subject: [PATCH 105/364] Select boxes disabled when editing : ) bzr revid: dle@openerp.com-20121119111907-x59ovkghvjpzh33n --- .../src/js/account_move_line_quickadd.js | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js index d36565d2ecf..1cc8942cb72 100644 --- a/addons/account/static/src/js/account_move_line_quickadd.js +++ b/addons/account/static/src/js/account_move_line_quickadd.js @@ -99,17 +99,27 @@ openerp.account.quickadd = function (instance) { var compoundContext = self.last_context; return self.old_search(compoundDomain, compoundContext, self.last_group_by); }, - /*_next: function (next_record, options) { - next_record = next_record || 'succ'; + start_edition: function (record, options) { + this.$el.parent().find('.oe_account_select_journal').attr('disabled', 'disabled'); + this.$el.parent().find('.oe_account_select_period').attr('disabled', 'disabled'); + return this._super.apply(this, arguments); + }, + cancel_edition: function (force) { + this.$el.parent().find('.oe_account_select_journal').removeAttr('disabled'); + this.$el.parent().find('.oe_account_select_period').removeAttr('disabled'); + return this._super.apply(this, arguments); + }, + save_edition: function () { + var tmp = this._super.apply(this, arguments); var self = this; - return this.save_edition().then(function (saveInfo) { - if (saveInfo.created || self.records.at(self.records.length-1).get("id") === saveInfo.record.get("id")) { - return self.start_edition(); + tmp.then(function (saveInfo){ + console.log(saveInfo); + if (saveInfo) { + self.$el.parent().find('.oe_account_select_journal').removeAttr('disabled'); + self.$el.parent().find('.oe_account_select_period').removeAttr('disabled'); } - var record = self.records[next_record]( - saveInfo.record, {wraparound: true}); - return self.start_edition(record, options); }); - },*/ + return tmp; + } }); }; From d831d5bd7c2c4b3cdd39394d5d40cde29c8960f7 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Mon, 19 Nov 2012 13:32:54 +0100 Subject: [PATCH 106/364] [FIX]Select boxes disabled when editing : ) : Better implement way bzr revid: dle@openerp.com-20121119123254-9rb4uxr97ux5iatv --- .../src/js/account_move_line_quickadd.js | 30 +++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js index 1cc8942cb72..5a66e311261 100644 --- a/addons/account/static/src/js/account_move_line_quickadd.js +++ b/addons/account/static/src/js/account_move_line_quickadd.js @@ -33,6 +33,14 @@ openerp.account.quickadd = function (instance) { self.current_period = parseInt(this.value); self.do_search(self.last_domain, self.last_context, self.last_group_by); }); + this.on('edit:after', this, function () { + self.$el.parent().find('.oe_account_select_journal').attr('disabled', 'disabled'); + self.$el.parent().find('.oe_account_select_period').attr('disabled', 'disabled'); + }); + this.on('save:after cancel:after', this, function () { + self.$el.parent().find('.oe_account_select_journal').removeAttr('disabled'); + self.$el.parent().find('.oe_account_select_period').removeAttr('disabled'); + }); return tmp; }, do_search: function(domain, context, group_by) { @@ -99,27 +107,5 @@ openerp.account.quickadd = function (instance) { var compoundContext = self.last_context; return self.old_search(compoundDomain, compoundContext, self.last_group_by); }, - start_edition: function (record, options) { - this.$el.parent().find('.oe_account_select_journal').attr('disabled', 'disabled'); - this.$el.parent().find('.oe_account_select_period').attr('disabled', 'disabled'); - return this._super.apply(this, arguments); - }, - cancel_edition: function (force) { - this.$el.parent().find('.oe_account_select_journal').removeAttr('disabled'); - this.$el.parent().find('.oe_account_select_period').removeAttr('disabled'); - return this._super.apply(this, arguments); - }, - save_edition: function () { - var tmp = this._super.apply(this, arguments); - var self = this; - tmp.then(function (saveInfo){ - console.log(saveInfo); - if (saveInfo) { - self.$el.parent().find('.oe_account_select_journal').removeAttr('disabled'); - self.$el.parent().find('.oe_account_select_period').removeAttr('disabled'); - } - }); - return tmp; - } }); }; From ad2c5376b0613f811141f7cc74730af5e5fd906a Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Mon, 19 Nov 2012 13:42:14 +0100 Subject: [PATCH 107/364] [ADD]Period and journal field in tree view with invisible = 1 bzr revid: dle@openerp.com-20121119124214-0hnx1gg5iksi2gpf --- addons/account/account_view.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index d3ec35cbea2..f5b21bfcdee 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1069,6 +1069,8 @@ + + From 203c5d0bf6834f7c1d034bdd59d985cffff8dba1 Mon Sep 17 00:00:00 2001 From: "Hiral Patel (OpenERP)" Date: Mon, 19 Nov 2012 18:51:42 +0530 Subject: [PATCH 108/364] [IMP] Change font color of Print and More to black bzr revid: hip@tinyerp.com-20121119132142-go7qw4nyn9248gdz --- addons/web/static/src/css/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index ab7b74f85fe..f0a9486716c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -652,7 +652,7 @@ cursor: pointer; } .openerp .oe_dropdown_toggle { - color: rgba(0, 0, 0, 0.3); + color: #4C4C4C; font-weight: normal; } .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened { From f80d9e61003428021b493691d5db2ef8193e58a5 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Mon, 19 Nov 2012 14:22:32 +0100 Subject: [PATCH 109/364] [ADD]On_change partner_id and remove useless comments bzr revid: dle@openerp.com-20121119132232-2ac4n7hodno1r7ju --- addons/account/account_view.xml | 4 ++-- .../static/src/js/account_move_line_quickadd.js | 17 ----------------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index f5b21bfcdee..34e7d3688c2 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1070,13 +1070,13 @@ - + - + diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js index 5a66e311261..a40774b346f 100644 --- a/addons/account/static/src/js/account_move_line_quickadd.js +++ b/addons/account/static/src/js/account_move_line_quickadd.js @@ -85,23 +85,6 @@ openerp.account.quickadd = function (instance) { ["journal_id", "=", self.current_journal], ["period_id", "=", self.current_period] ]); - //1 - /*var ncontext = { - "journal_id": self.current_journal, - "period_id" :self.current_period, - }; - var new instance.web.CompoundDomain(self.last_domain = new instance.web.CompoundContext(this.last_context, ncontext); - - _.extend(this.dataset.context, ncontext); - */ - //2 - /* - var compoundContext = new instance.web.CompoundContext(self.last_context,{ - "journal_id": self.current_journal, - "period_id" :self.current_period, - }); - */ - //3 self.last_context["journal_id"] = self.current_journal; self.last_context["period_id"] = self.current_period; var compoundContext = self.last_context; From a1544bffb429b85f5fd05b4c784489aab2090a7c Mon Sep 17 00:00:00 2001 From: Vishmita Date: Mon, 19 Nov 2012 19:11:24 +0530 Subject: [PATCH 110/364] [FIX]check if first character is special character bzr revid: vja@tinyerp.com-20121119134124-ejaqtquqr7nd9y6z --- addons/web/static/src/js/view_form.js | 31 ++++++++++++--------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index fc3370bd083..cddf6b30220 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -227,15 +227,13 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM return $.when(); }, widgetAccesskey:function(){ - var self = this; - $(document).bind('keydown',function(e){ - var list = $(document).find('.oe_form_buttons span:visible button,.oe_form_buttons span a,.oe_application .oe_form_button, .oe_list_content:visible .oe_form_field_one2many_list_row_add > a'); - list = _.reject(list,function(r){ return $(r).hasClass('oe_form_invisible')}) - var accesskey = _.map(list,function(r){ return $(r).attr('accesskey') }); - _.each(list,function(el,i){ + var list = $(document).find('.oe_form_buttons span:visible button,.oe_form_buttons span a,.oe_form_button, .oe_list_content:visible .oe_form_field_one2many_list_row_add > a'); + list = _.reject(list,function(r){ return $(r).hasClass('oe_form_invisible')}) + var accesskey = _.map(list,function(r){ return $(r).attr('accesskey')}); + _.each(list,function(el,i){ if (!$(el).attr("accesskey")) { var text = $(el).text().trim().substr(0,1); - if (_.contains(accesskey.slice(0, i),text)){ + if (_.contains(accesskey.slice(0, i),text)|| !(/^[a-z0-9\_]+$/i.test(text))){ var index = $(el).text().trim().indexOf(text); var str = $(el).text().trim().substr(index + 1, index + 1); $(el).attr('accesskey',str); @@ -245,18 +243,17 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM accesskey[i] = text ; } } - }) - if (e.keyCode === e.which) { + }); + $(document).keydown(function(e){ + if (e.keyCode === 18 || e.keycode === 16 && e.altkey) { + _.each(list,function(rl,i){ + $(rl).html(function(i, html){ + return $(rl).text().replace($(rl).attr('accesskey'), '' + $(rl).attr('accesskey') + ''); + })}) + }}).keyup(function(){ _.each(list,function(rl,i){ - $(rl).html(function(i, html){ - return $(rl).text().replace($(rl).attr('accesskey'), '' + $(rl).attr('accesskey') + ''); - }) + $(rl).find('.access').removeClass('access'); }) - }}).keyup(function(){ - var accesskey_list = $(document).find('.oe_form_buttons span:visible button,.oe_form_buttons span a,.oe_application .oe_form_button, .oe_list_content:visible .oe_form_field_one2many_list_row_add > a'); - accesskey_list.each(function(){ - $(this).find('.access').removeClass('access'); - }) }); }, widgetFocused: function() { From 14879e0802be735d173c1db0739bf3989454d6ec Mon Sep 17 00:00:00 2001 From: "Hiral Patel (OpenERP)" Date: Tue, 20 Nov 2012 12:21:18 +0530 Subject: [PATCH 111/364] [IMP] Set the height of text field bzr revid: hip@tinyerp.com-20121120065118-c9hc7n2u2txgn4w2 --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index c784b169d12..efe3d9e671e 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2539,7 +2539,7 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we initialize_content: function() { var self = this; this.$textarea = this.$el.find('textarea'); - this.default_height = this.$textarea.css('height'); + this.default_height = this.$textarea.css('height',0); if (!this.get("effective_readonly")) { this.$textarea.change(_.bind(function() { self.internal_set_value(instance.web.parse_value(self.$textarea.val(), self)); From 73750e33b943cb6167268bfff49116d0f7234176 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Tue, 20 Nov 2012 08:39:48 +0100 Subject: [PATCH 112/364] [FIX] Removed password from sent email. Fixed naming in order to pass runbot's test. bzr revid: vta@openerp.com-20121120073948-1ojettqx7mjb1k75 --- addons/portal/wizard/portal_wizard.py | 6 ------ addons/portal_crm/contact.py | 6 +++--- addons/portal_crm/contact_view.xml | 14 +++++++------- addons/portal_crm/test/contact_form.yml | 4 ++-- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py index 545b771e762..485aa941434 100644 --- a/addons/portal/wizard/portal_wizard.py +++ b/addons/portal/wizard/portal_wizard.py @@ -39,7 +39,6 @@ You have been given access to %(portal)s. Your login account data is: Database: %(db)s Username: %(login)s -Password: %(password)s In order to complete the signin process, click on the following url: %(url)s @@ -51,10 +50,6 @@ OpenERP - Open Source Business Applications http://www.openerp.com """) -def random_password(): - # temporary random stuff; user password is reset by signup process - chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789' - return ''.join(random.choice(chars) for i in xrange(12)) def extract_email(email): """ extract the email address from a user-friendly email address """ @@ -181,7 +176,6 @@ class wizard_user(osv.osv_memory): create_context = dict(context or {}, noshortcut=True) # to prevent shortcut creation values = { 'login': extract_email(wizard_user.email), - 'password': random_password(), 'partner_id': wizard_user.partner_id.id, 'groups_id': [(6, 0, [])], 'share': True, diff --git a/addons/portal_crm/contact.py b/addons/portal_crm/contact.py index 3beed3b3282..c4d4e1d7f8c 100644 --- a/addons/portal_crm/contact.py +++ b/addons/portal_crm/contact.py @@ -22,9 +22,9 @@ from openerp.osv import osv, fields from openerp import SUPERUSER_ID -class contact(osv.TransientModel): +class crm_contact_us(osv.TransientModel): """ Create new leads through the "contact us" form """ - _name = 'contact' + _name = 'portal_crm.crm_contact_us' _description = 'Contact form for the portal' _inherit = 'crm.lead' _columns = { @@ -104,7 +104,7 @@ class contact(osv.TransientModel): Since the 'name' field is mandatory, give an empty string to avoid an integrity error. """ empty_values = dict((k, False) if k != 'name' else (k, '') for k, v in values.iteritems()) - return super(contact, self).create(cr, uid, empty_values) + return super(crm_contact_us, self).create(cr, uid, empty_values) def submit(self, cr, uid, ids, context=None): """ When the form is submitted, redirect the user to a "Thanks" message """ diff --git a/addons/portal_crm/contact_view.xml b/addons/portal_crm/contact_view.xml index 25216d9ff29..0241259a82a 100644 --- a/addons/portal_crm/contact_view.xml +++ b/addons/portal_crm/contact_view.xml @@ -4,7 +4,7 @@ Contact form - contact + portal_crm.crm_contact_us
@@ -12,12 +12,11 @@ - - - + + + - -
-
- -
+ +
+ +
+
+ +
+ +
+

Followers

+ Invite others +
+
-
-

Followers

- Invite others -
-
- portal_hr_employees.employee.form + portal_hr_employees_form hr.employee @@ -17,7 +17,7 @@ portal_hr_employees_view - portal_crm.crm_contact_us + crm.team @@ -51,11 +51,11 @@ Meet the team - portal_crm.crm_contact_us + crm.team - form form - Here you can see our employees' public profile, if any + inline + Here you can see our employees' public profile, if any. Date: Tue, 20 Nov 2012 16:50:09 +0530 Subject: [PATCH 120/364] [IMP]add function for open timesheets from employee form view bzr revid: sgo@tinyerp.com-20121120112009-3a5k48dr1otlgs1v --- .../hr_timesheet_sheet/hr_timesheet_sheet.py | 27 ++++++++++++++++++- .../hr_timesheet_sheet_view.xml | 10 +------ 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index bf6790c6be3..af2f5f07179 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -220,9 +220,34 @@ class hr_timesheet_sheet(osv.osv): if employee_id: department_id = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).department_id.id return {'value': {'department_id': department_id}} - + hr_timesheet_sheet() +class hr_employee(osv.osv): + _inherit = "hr.employee" + + def open_timesheet(self, cr, uid, ids, context=None): + if context is None: + context = {} + employee = self.browse(cr, uid, ids[0], context) + view_context = { + 'search_default_employee_id' : [employee.id], + 'default_employee_id' : employee.id, + 'default_user_id': employee.user_id.id, + } + value = { + 'name': _('Timesheets'), + 'context': view_context, + 'view_type': 'form', + 'view_mode': 'tree,form', + 'res_model': 'hr_timesheet_sheet.sheet', + 'view_id': False, + 'type': 'ir.actions.act_window' + } + return value + +hr_employee() + class account_analytic_line(osv.osv): _inherit = "account.analytic.line" diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 6de6be6c08d..06779e73472 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -351,21 +351,13 @@ - - hr_timesheet_sheet.sheet - form - Timesheets - tree,form - {'search_default_employee_id': [active_id], 'default_employee_id': active_id} - - hr.timesheet.sheet.employee.extd_form hr.employee -
- + -
-
+
diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml index 9054445c8ad..198065bace4 100644 --- a/addons/portal_project_issue/portal_project_issue_view.xml +++ b/addons/portal_project_issue/portal_project_issue_view.xml @@ -55,6 +55,7 @@
+
From e9e80c80e8b0512a774cd12de991a5f00d2aef78 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Wed, 21 Nov 2012 08:47:58 +0100 Subject: [PATCH 137/364] [FIX] Hide message_followers widget in claims. bzr revid: vta@openerp.com-20121121074758-z0f7gy8jdlqqnv8f --- addons/crm_claim/crm_claim_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml index f56ee73f908..8b6217b97e1 100644 --- a/addons/crm_claim/crm_claim_view.xml +++ b/addons/crm_claim/crm_claim_view.xml @@ -167,7 +167,7 @@
- +
From c17e3edb958532f88eb0075274b61605c4fc3775 Mon Sep 17 00:00:00 2001 From: Jigar Amin Date: Wed, 21 Nov 2012 14:31:36 +0530 Subject: [PATCH 138/364] [FIX] in Project => Issues => Worklogs tab: analytic account field should not appear if 'Analytic Accounting' isn't checked bzr revid: jam@tinyerp.com-20121121090136-zl9936xlwecai0nu --- addons/project_issue_sheet/project_issue_sheet_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml index 4fc12ab0747..fb245a0510a 100644 --- a/addons/project_issue_sheet/project_issue_sheet_view.xml +++ b/addons/project_issue_sheet/project_issue_sheet_view.xml @@ -23,7 +23,7 @@ - + From 6dd29bcdff247fdb219861b40e575fae392878da Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Wed, 21 Nov 2012 10:05:21 +0100 Subject: [PATCH 139/364] [FIX] Fixed names and view modes. bzr revid: vta@openerp.com-20121121090521-z2a0e4mqo5k5ttl4 --- addons/portal_claim/security/portal_security.xml | 2 +- addons/portal_sale/portal_sale_view.xml | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/addons/portal_claim/security/portal_security.xml b/addons/portal_claim/security/portal_security.xml index 7227e6511ac..6a04ca9747e 100644 --- a/addons/portal_claim/security/portal_security.xml +++ b/addons/portal_claim/security/portal_security.xml @@ -2,7 +2,7 @@ - + Portal Personal Claims [('message_follower_ids','in', [user.partner_id.id])] diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml index 4c93d03f43e..e989282a1a8 100644 --- a/addons/portal_sale/portal_sale_view.xml +++ b/addons/portal_sale/portal_sale_view.xml @@ -10,7 +10,7 @@ Quotations ir.actions.act_window sale.order - tree,form,calendar,graph + tree,form {"search_default_draft":1} We haven't sent you any quotation. @@ -20,7 +20,7 @@ Sales Orders ir.actions.act_window sale.order - tree,form,calendar,graph + tree,form {"search_default_sales":1} We haven't sent you any sale order. @@ -29,16 +29,17 @@ Customer Invoices account.invoice - tree,form,calendar,graph + tree,form [('type','=','out_invoice')] {'type':'out_invoice', 'journal_type': 'sale'} We haven't sent you any invoice. - + Customer Refunds account.invoice + tree,form [('type','=','out_refund')] {'type':'out_refund'} @@ -52,7 +53,7 @@ + action="action_invoice_tree2" sequence="40"/> From 132f052e178f53d2e7cffefebf7a3f8ec7196208 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Wed, 21 Nov 2012 13:33:46 +0100 Subject: [PATCH 140/364] [FIX] Security rules, and conflicts after merging trunk. bzr revid: vta@openerp.com-20121121123346-5wi4ko1e5ny57ki0 --- addons/mail/static/src/xml/mail_followers.xml | 34 +++++++++---------- addons/portal/portal_view.xml | 4 --- .../portal_claim/security/portal_security.xml | 2 +- .../security/portal_security.xml | 2 +- addons/portal_sale/portal_sale_view.xml | 6 ++-- 5 files changed, 21 insertions(+), 27 deletions(-) diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml index 5fde087a660..11698c1fb62 100644 --- a/addons/mail/static/src/xml/mail_followers.xml +++ b/addons/mail/static/src/xml/mail_followers.xml @@ -5,25 +5,23 @@ followers main template Template used to display the followers, the actions and the subtypes in a record. --> -
- -
- -
-
- -
- -
-

Followers

- Invite others -
-
+
+
+ +
+
+ +
+
+

Followers

+ Invite others +
+
account.move.line.tree account.move.line - - - - + + - + + - - - - + + + - + + + + + @@ -1280,6 +1327,39 @@ groups="group_account_user" /> + + Journal Items + account.move.journal + form + {'journal_type':'sale'} + This view is used by accountants in order to record entries massively in OpenERP. If you want to record a customer invoice, select the journal and the period in the search toolbar. Then, start by recording the entry line of the income account. OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account receivable". + + + + + Journal Items + account.move.journal + form + {'journal_type':'purchase'} + This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account Payable". + + + + + Journal Items + account.move.journal + form + {'journal_type':'bank'} + This view is used by accountants in order to record entries massively in OpenERP. Journal items are created by OpenERP if you use Bank Statements, Cash Registers, or Customer/Supplier payments. + + + Lines to reconcile account.move.line From 7921e449957080b5327f6a5faee8f90ebf96a165 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 22 Nov 2012 09:38:37 +0100 Subject: [PATCH 144/364] [IMP] mail: break-word, css, help, button name bzr revid: chm@openerp.com-20121122083837-578ffj6wcu5hs0z4 --- addons/mail/static/src/css/mail.css | 2 ++ addons/mail/static/src/js/mail.js | 1 - addons/mail/static/src/xml/mail.xml | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 94a5c2d1f41..9785a9c1bc8 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -93,6 +93,8 @@ .openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body p { margin-bottom: 0px; + text-overflow:ellipsis; + word-wrap: break-word; } /* a) Indented Messages */ diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 44bb4e9ae09..ce7db3d101d 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -508,7 +508,6 @@ openerp.mail = function (session) { res_model: 'mail.compose.message', view_mode: 'form', view_type: 'form', - action_from: 'mail.ThreadComposeMessage', views: [[false, 'form']], target: 'new', context: context, diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index bb787c9a21b..ad78c993695 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -34,14 +34,14 @@ - +