[MERGE] latest trunk
bzr revid: odo@openerp.com-20110913144600-ve4vb5po9vi3edw4
This commit is contained in:
commit
6fa6d8369c
|
@ -215,7 +215,7 @@ def quit_on_signals():
|
|||
os.unlink(config['pidfile'])
|
||||
logger = logging.getLogger('server')
|
||||
logger.info("Initiating shutdown")
|
||||
logger.info("Hit CTRL-C again or send a second signal to force the sutdown.")
|
||||
logger.info("Hit CTRL-C again or send a second signal to force the shutdown.")
|
||||
logging.shutdown()
|
||||
|
||||
# manually join() all threads before calling sys.exit() to allow a second signal
|
||||
|
@ -240,6 +240,8 @@ if __name__ == "__main__":
|
|||
|
||||
config = openerp.tools.config
|
||||
|
||||
setup_signal_handlers()
|
||||
|
||||
if config["test_file"]:
|
||||
run_test_file(config['db_name'], config['test_file'])
|
||||
sys.exit(0)
|
||||
|
@ -265,7 +267,6 @@ if __name__ == "__main__":
|
|||
sys.exit(0)
|
||||
|
||||
setup_pid_file()
|
||||
setup_signal_handlers()
|
||||
logger = logging.getLogger('server')
|
||||
logger.info('OpenERP server is running, waiting for connections...')
|
||||
quit_on_signals()
|
||||
|
|
|
@ -622,7 +622,9 @@ class actions_server(osv.osv):
|
|||
context = {}
|
||||
user = self.pool.get('res.users').browse(cr, uid, uid)
|
||||
for action in self.browse(cr, uid, ids, context):
|
||||
obj = None
|
||||
obj_pool = self.pool.get(action.model_id.model)
|
||||
if context.get('active_model') == action.model_id.model and context.get('active_id'):
|
||||
obj = obj_pool.browse(cr, uid, context['active_id'], context=context)
|
||||
cxt = {
|
||||
'self': obj_pool,
|
||||
|
|
|
@ -194,7 +194,7 @@ class lang(osv.osv):
|
|||
trans_obj.unlink(cr, uid, trans_ids, context=context)
|
||||
return super(lang, self).unlink(cr, uid, ids, context=context)
|
||||
|
||||
def format(self, cr, uid, ids, percent, value, grouping=False, monetary=False):
|
||||
def format(self, cr, uid, ids, percent, value, grouping=False, monetary=False, context=None):
|
||||
""" Format() will return the language-specific output for float values"""
|
||||
|
||||
if percent[0] != '%':
|
||||
|
|
|
@ -113,6 +113,11 @@
|
|||
|
||||
<rng:define name="kanban">
|
||||
<rng:element name="kanban">
|
||||
<rng:optional>
|
||||
<!-- group-by field to apply in the kanban view when no other
|
||||
grouping is selected in the search view -->
|
||||
<rng:attribute name="default_group_by" />
|
||||
</rng:optional>
|
||||
<rng:zeroOrMore>
|
||||
<rng:ref name="field"/>
|
||||
</rng:zeroOrMore>
|
||||
|
|
Loading…
Reference in New Issue