Fabien Meghazi
fea8520889
[FIX] local_redirect() should forward code to redirect_with_hash()
...
bzr revid: fme@openerp.com-20140122104022-hal3xe6eywffly3u
2014-01-22 11:40:22 +01:00
Fabien Meghazi
5013315f57
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140122102358-te3vpyhblujbxkzt
2014-01-22 11:23:58 +01:00
Turkesh Patel (Open ERP)
5c97da019a
[IMP] improved code to post send mail in chatter also
...
bzr revid: tpa@tinyerp.com-20140122072603-wik5q5nw49mp562h
2014-01-22 12:56:03 +05:30
Launchpad Translations on behalf of openerp
0f2d7e4820
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122054041-3ebv0zxz43meid0v
2014-01-22 05:40:41 +00:00
Fabien Meghazi
f8281bce0b
[FIX] routing_map crossdb bug introduced in Rev: 5151 revid:fme@openerp.com-20140120153614-t8l7tfit686ehfn0
...
bzr revid: fme@openerp.com-20140121195348-mcdreqjo3kod0p7i
2014-01-21 20:53:48 +01:00
Fabien Meghazi
b5118e606e
[FIX] redirect_with_hash firefox bug
...
bzr revid: fme@openerp.com-20140121160158-qsy28zty51wg7ip4
2014-01-21 17:01:58 +01:00
Fabien Meghazi
646a7de17a
[MOV] move redirection headers from webclient to server
...
bzr revid: fme@openerp.com-20140121155403-nmnntq664j2d1qjz
2014-01-21 16:54:03 +01:00
Gery Debongnie
17e3c31992
[MERGE] merge trunk into local branch
...
bzr revid: ged@openerp.com-20140113142459-pjoiau7pp4knvvda
bzr revid: ged@openerp.com-20140116144304-d00alltpt7j1gzvh
bzr revid: ged@openerp.com-20140121142924-641cu8trhm4pdf1m
2014-01-21 15:29:24 +01:00
Turkesh Patel (Open ERP)
7ca3383659
[IMP] move demo data file in demo setion
...
bzr revid: tpa@tinyerp.com-20140121124716-ipot2wp280ltloqa
2014-01-21 18:17:16 +05:30
Antony Lesuisse
658ed76a84
[REM] preprocess of widget selection on m2o
...
As they are now directly supported by the webclient since commit
web 3863 nicolas.vanhoren@openerp.com-20131022131525-d0i61sbm0w6katfs
bzr revid: al@openerp.com-20140121112759-zavwqdyv8kdq4oys
2014-01-21 12:27:59 +01:00
Turkesh Patel (Open ERP)
3cfea8434f
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20140121102549-5xtvx4emv4nrylky
2014-01-21 15:55:49 +05:30
Turkesh Patel (Open ERP)
c651b3554c
[IMP] improved model given in template.
...
bzr revid: tpa@tinyerp.com-20140121100835-k65dkw05dom4xlfs
2014-01-21 15:38:35 +05:30
Turkesh Patel (Open ERP)
22a630fc57
[MRG] added new prodcut and templatre
...
bzr revid: tpa@tinyerp.com-20140121095700-9j9qxx2bpgdluizg
2014-01-21 15:27:00 +05:30
Turkesh Patel (Open ERP)
e8036b627c
[IMP] remove menu of product template
...
bzr revid: tpa@tinyerp.com-20140121094423-k17idc4cg9qy5n3j
2014-01-21 15:14:23 +05:30
Chirag Dodiya (OpenERP)
081be6181a
[ADD]Added demo data for product template
...
bzr revid: cod@tinyerp.com-20140121093854-18dxvjdx6co1amqp
2014-01-21 15:08:54 +05:30
Christophe Simonis
e516362da4
[IMP] calendar: tell orm to rename old select1 column
...
bzr revid: chs@openerp.com-20140120164054-ia6pw4svp3ylww5w
2014-01-20 17:40:54 +01:00
Fabien Meghazi
05e2942121
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140120161129-elnp1afn8ognyc6z
2014-01-20 17:11:29 +01:00
Christophe Simonis
9b31f30c29
[FIX] edi: /edi/import_edi_url route is a json route
...
bzr revid: chs@openerp.com-20140120154422-blccmtrql7mlwmvn
2014-01-20 16:44:22 +01:00
Fabien Meghazi
8702ef5d3b
[CHG] Allow @http.route() to use additional parameters and inherits them properly
...
bzr revid: fme@openerp.com-20140120153614-t8l7tfit686ehfn0
2014-01-20 16:36:14 +01:00
Xavier Morel
eebda715bb
[IMP] py26 compatibility
...
bzr revid: xmo@openerp.com-20140120135333-7b7qccr4quh2h1um
2014-01-20 14:53:33 +01:00
Raphael Collet
16028dedfd
[FIX] calendar: function field of type 'selection' must be given a selection parameter
...
bzr revid: rco@openerp.com-20140120125953-zk6iwkvye4reansl
2014-01-20 13:59:53 +01:00
Raphael Collet
77457bd8b2
[FIX] calendar: type of related field should be 'integer', not 'int'
...
bzr revid: rco@openerp.com-20140120114901-ryrqgu0drewsjx4y
2014-01-20 12:49:01 +01:00
Frédéric van der Essen
e055dc35b3
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140120103034-78rddwe668y2w2un
2014-01-20 11:30:34 +01:00
Jojo le bricolo
6a4ea0f9a4
QWeb cleanups
...
bzr revid: jojo_le_bricolo-20140119174437-kjrr9p1smpdxhd3u
2014-01-19 18:44:37 +01:00
Launchpad Translations on behalf of openerp
58907da3ee
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140116051828-hd2t5q9ysbk5wm3p
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119052609-764otsas6xg8r8a2
2014-01-19 05:26:09 +00:00
Frédéric van der Essen
b0abc338d2
[IMP] point_of_sale: better feedback on network and proxy connectivity + removed pos settings for obsolete features + improved proxy settings
...
bzr revid: fva@openerp.com-20140117175830-himux7xmaopw9yia
2014-01-17 18:58:30 +01:00
Christophe Matthieu
bd444b8a5e
[FIX] ir_ui_view: add method clear_cache called when user change user groups
...
bzr revid: chm@openerp.com-20140117143853-sy5ehfk9n2wrzq41
2014-01-17 15:38:53 +01:00
Christophe Matthieu
2f974012db
[FIX] ir_ui_view: write noupdate on ir_model_data with SUPERUSER when the user write
...
bzr revid: chm@openerp.com-20140117134916-w59ive0yiqchp57m
2014-01-17 14:49:16 +01:00
Christophe Matthieu
1b44ed492f
[FIX] base/account: auto install period's dates. Resolve: don't set country_id to res.partner
...
bzr revid: chm@openerp.com-20140117131733-23jrg3hlcqyalte9
2014-01-17 14:17:33 +01:00
Martin Trigaux
a75ebb628c
[IMP] search_read: avoid calling read if search only on id column (security rules already triggered with search)
...
bzr revid: mat@openerp.com-20140117120235-zdj7pjd8xnnrnqol
2014-01-17 13:02:35 +01:00
Martin Trigaux
4b7799c0c7
[IMP] search_read: use search_read from the orm instead of rewritting it
...
skip search_count when getting no result from search_read
remove useless test based on implementation details
bzr revid: mat@openerp.com-20140117120047-9b5emsrbtjauvegl
2014-01-17 13:00:47 +01:00
Fabien Meghazi
470d335766
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140117100513-b5lp4zutjbv38yld
2014-01-17 11:05:13 +01:00
Thibault Delavallée
382efffb58
[MERGE] [CLEAN] Part I of cleaning and improvements of the server branch of website-al, after review with our Masters. All Glory to Our Masters.
...
[CLEAN] res_config, res_users: cleaned call to imd.get_object() + code cleaning
- res_config: raise by default, no need to set the argument at True
- res_users: directly embedded get_user_groups_view code inside update_user_groups_view.
The try / except is still necessary, because when installing a new db, groups and users
are created before the user_groups_view view effectively exist. Due to some circular
references, the try / except is therefore necessary to install a new db.
[CLEAN] ir_qweb: simplified and cleaned QWebcontext implementation
- now using openerp.tools.safe_eval, instead of a custom eval with custom builtins
- removed undefined_handler, hardcoded to a lambda function that returns None for
a missing attribute
- cleaned code, removed now dead BUILTINS, removed commented code
- tools.safe_eval: added a parameter locals_builtins. This allows to copy the globals builtins in the locals. This modification is due to the fact that the locals always returns None, allowing to simplify templates. Otherwise we would have to test the existence of each variable before actually using it. However as the locals always return None for every key, the globals are never checked. Copying the builtins inside the local allows to have a complete locals, but slightly break the globals/locals separation.
[CLEAN] Misc
- setup.py: reverted website-al unnecessary change
- oe: reverted website-al unnecessary change
[DOC] renamed misc_qweb.rst file into ir_qweb.rst
bzr revid: tde@openerp.com-20140116184144-fd5h4a94we13mm72
2014-01-16 19:41:44 +01:00
Thibault Delavallée
f4bb798cb8
[CLEAN] ir_qweb: removed commented and now dead BUILTINS
...
bzr revid: tde@openerp.com-20140116183315-g5ootf670kwx1z1z
2014-01-16 19:33:15 +01:00
Thibault Delavallée
c76a3aba8f
[CLEAN] ir_qweb: simplified and cleaned QWebcontext implementation
...
- now using openerp.tools.safe_eval, instead of a custom eval with custom builtins
- removed undefined_handler, hardcoded to a lambda function that returns None for
a missing attribute
tools.safe_eval: added a parameter locals_builtins. This allows to copy the builtins
in the locals. This hack is due to the fact that the locals always returns None, allowing
to simplify templates. Otherwise we would have to test the existence of each variable
before actually using it.
However as the locals always return None for every key, the globals are never checked.
Copying the builtins inside the local allows to have a complete locals, but sligtly
break the globals/locals separation.
To be reviewed and approved.
bzr revid: tde@openerp.com-20140116182750-1rnw8iljt5a9gb4u
2014-01-16 19:27:50 +01:00
Frédéric van der Essen
1353e44bb3
[IMP] point_of_sale: less confusing synchronisation indicator
...
bzr revid: fva@openerp.com-20140116172846-7lyz50jr69crbxsn
2014-01-16 18:28:46 +01:00
Xavier Morel
ff51574fae
[FIX] somebody renamed classes without fixing the corresponding autodoc invocation
...
bzr revid: xmo@openerp.com-20140116144957-j2no6ls83vfxtgbk
2014-01-16 15:49:57 +01:00
Frédéric van der Essen
a865ea7792
[FIX] hw_scanner: capture barcodes in a separate thread to prevent misses
...
bzr revid: fva@openerp.com-20140116144915-o7eyz6kyl2d4dyds
2014-01-16 15:49:15 +01:00
Thibault Delavallée
8af1afb1a0
[CLEAN] [REM] ir_qweb: removed access rules on the various ir_web models
...
as those are abstract models. They should not have any access rules.
bzr revid: tde@openerp.com-20140116140621-6mjkp82oy0iyahi7
2014-01-16 15:06:21 +01:00
Fabien Meghazi
ca91c7e330
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140116135746-t4i5qxtdfnsn6xgo
2014-01-16 14:57:46 +01:00
Fabien Meghazi
2e43125353
[FIX] LazyResponse exceptions not properly managed in auth="none"
...
bzr revid: fme@openerp.com-20140116135650-c3gri2m1j80wcwca
2014-01-16 14:56:50 +01:00
Fabien Meghazi
cee6749395
[IMP] ir_http._handle_exception() raises last exception in order to keep original traceback
...
bzr revid: fme@openerp.com-20140116135426-x7q8l6ph2m1ln8ry
2014-01-16 14:54:26 +01:00
Thibault Delavallée
2c32d92ee5
[CLEAN] res_config, res_users: cleaned call to imd.get_object() + code cleaning
...
- res_config: raise by default, no need to set the argument at True
- res_users: directly embedded get_user_groups_view code inside update_user_groups_view.
The try / except is still necessary, because when installing a new db, groups and users
are created before the user_groups_view view effectively exist. Due to some circular
references, the try / except is therefore necessary to install a new db.
bzr revid: tde@openerp.com-20140116134056-nyiybx7zsr8rhkiv
2014-01-16 14:40:56 +01:00
Thibault Delavallée
051ef6d01f
[CLEAN] [DOC] renamed misc_qweb.rst file into ir_qweb.rst
...
bzr revid: tde@openerp.com-20140116125222-aag6zfjprbbnuhcu
2014-01-16 13:52:22 +01:00
Thibault Delavallée
c5262d8d94
[CLEAN] setup.py: reverted website-al unnecessary change
...
bzr revid: tde@openerp.com-20140116125001-1fkbbseyohukwcdg
2014-01-16 13:50:01 +01:00
Thibault Delavallée
e70f74b106
[CLEAN] or: reverted website-al unnecessary change
...
bzr revid: tde@openerp.com-20140116124948-15jqamtain0ie20c
2014-01-16 13:49:48 +01:00
Frédéric van der Essen
ff9e9e7c88
[IMP] point_of_sale: adding the icon fonts 'font-awesome'
...
bzr revid: fva@openerp.com-20140116112322-n538un8zobptg2cy
2014-01-16 12:23:22 +01:00
Frédéric van der Essen
fa22b31967
[FIX] hw_escpos: syntax error
...
bzr revid: fva@openerp.com-20140116101755-7rxbn895yyq7sdub
2014-01-16 11:17:55 +01:00
Frédéric van der Essen
873a26e59f
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140116100255-m35evr41zorwnl6y
2014-01-16 11:02:55 +01:00
Thibault Delavallée
ab5c23079a
[MERGE] Sync with trunk, solved conflicts.
...
bzr revid: tde@openerp.com-20140116091716-zk1n5ots94i65io5
2014-01-16 10:17:16 +01:00