pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,391 Commits 1 Branch 0 Tags
92b8aafe97d94deacb06b37503a05d80b25dbba8
Commit Graph
81391 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Pinckaers a128704b47 [IMP] demo data 
bzr revid: fp@openerp.com-20131013154839-4fscqfpzohhevww5
 2013-10-13 17:48:39 +02:00
Fabien Pinckaers e5d99353ad [IMP] quotes slider effect 
bzr revid: fp@openerp.com-20131013110156-xjaaezx140ym0v9j
 2013-10-13 13:01:56 +02:00
Fabien Pinckaers bb505593b3 [IMP] Quotes Slide: new effect snippet 
bzr revid: fp@openerp.com-20131013090335-qkev7tv2vlz6uqul
 2013-10-13 11:03:35 +02:00
Fabien Pinckaers 6fa6e24cf3 [IMP] Wording + fix on banner custom photo 
bzr revid: fp@openerp.com-20131013081131-4km84txnruapml0h
 2013-10-13 10:11:31 +02:00
Launchpad Translations on behalf of openerp 436a849b2e Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060157-qwah3z17ksnrmhzi
bzr revid: launchpad_translations_on_behalf_of_openerp-20130922053500-ovnczb82b49pg6f7
bzr revid: launchpad_translations_on_behalf_of_openerp-20130928055413-78fot6ftst9k7als
bzr revid: launchpad_translations_on_behalf_of_openerp-20131004054531-787wl7i8e8bqy44e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131013053846-rei6ary4wt43kqeq
 2013-10-13 05:38:46 +00:00
Antony Lesuisse 25a260068b [IMP] renamse files to conform to the future openerp module guidelines 
bzr revid: al@openerp.com-20131013030806-2236jpszm1morlg6
 2013-10-13 05:08:06 +02:00
Antony Lesuisse 8d7caa9817 [MERGE] trunk 
bzr revid: al@openerp.com-20131013022304-ebndbid3j4x0ouyg
 2013-10-13 04:23:04 +02:00
Antony Lesuisse d2eb959710 [FIX] ensure the use the registry signaling for registries loaded with -d 
bzr revid: al@openerp.com-20131013021322-5ej7ovpcrf7ilnn5
 2013-10-13 04:13:22 +02:00
Antony Lesuisse dbd1b3e7dd restore qwebcontext, comment out sandboxed eval till a proper (fast) 
implementation is ready

bzr revid: al@openerp.com-20131013000711-dwqgj803nfdjcz3d
 2013-10-13 02:07:11 +02:00
Fabien Pinckaers f5cee1def2 [IMP] Tutorial Wording 
bzr revid: fp@tinyerp.com-20131012165138-aayhdrniczbn8tij
 2013-10-12 18:51:38 +02:00
Fabien Pinckaers 22f49b873c [IMP] Snippets 
bzr revid: fp@openerp.com-20131012112541-z4uo1laeowe5q8cz
 2013-10-12 13:25:41 +02:00
Fabien Pinckaers 24ef31464c [IMP] empty zones: edit & drag 
bzr revid: fp@openerp.com-20131012111524-gcrhq2o3oosg7raz
 2013-10-12 13:15:24 +02:00
Fabien Pinckaers d95570bb40 [IMP] css align stuff 
bzr revid: fp@openerp.com-20131012092352-seprp8l827wxy2wy
 2013-10-12 11:23:52 +02:00
Fabien Pinckaers 6b0d005d44 [IMP] Align building blocks 
bzr revid: fp@openerp.com-20131012090748-vr7aqap73d9l4hqf
 2013-10-12 11:07:48 +02:00
Fabien Pinckaers 11c458d980 [IMP] drop on nearest droppable zone 
bzr revid: fp@openerp.com-20131012084452-gz85w0c5s13v5l1f
 2013-10-12 10:44:52 +02:00
Fabien Pinckaers 69b242cb4f [IMP] placeholder for page name format 
bzr revid: fp@openerp.com-20131012060552-b33khbi0cow0g31d
 2013-10-12 08:05:52 +02:00
Fabien Pinckaers 42b74bf9fd [REM] surprise 
bzr revid: fp@openerp.com-20131011205559-8moc6il07innu8dm
 2013-10-11 22:55:59 +02:00
Thibault Delavallée e4dcbbed57 [IMP] website_membership: added country management in website view 
- controllers: added management of country_id from post
- views: added option to display country list
- + various cleaning in display and controllers

bzr revid: tde@openerp.com-20131011161310-5dfz6vf4y5nc9mj9
 2013-10-11 18:13:10 +02:00
Xavier Morel 3e349a2bf7 [ADD] conversion back from HTML to monetary field 
bzr revid: xmo@openerp.com-20131011142528-oruyq6r7vf962lqn
 2013-10-11 16:25:28 +02:00
Xavier Morel 29d10fd8ea [REM] conversion in monetary widget, turns out to be a misunderstood need 
bzr revid: xmo@openerp.com-20131011142512-3j5vuik1o4k6q6jj
 2013-10-11 16:25:12 +02:00
Fabien Pinckaers 3e453c1156 [IMP] Tutorial for new installs, not for website menu 
bzr revid: fp@tinyerp.com-20131011142422-z43898v7mngqgns1
 2013-10-11 16:24:22 +02:00
ddm ba4f6d7ac2 [FIX] cf. Apr's review 
bzr revid: ddm@openerp.com-20131011142311-cf96vmchmtwkrmfs
 2013-10-11 16:23:11 +02:00
ddm 2d1720811c [MERGE] trunk-website-al 
bzr revid: ddm@openerp.com-20131011141759-uqo52ta0haqyn3z6
 2013-10-11 16:17:59 +02:00
Thibault Delavallée b2a546e0f8 [MOV] [FIX] website_event: module organization cleaning 
- moved model-related files in models directory
- moved data/demo files in data directory
- fixed wrong class import in tests

bzr revid: tde@openerp.com-20131011141210-0v3gy9292ymeo8vc
 2013-10-11 16:12:10 +02:00
niv-openerp fb230b98e7 [IMP] added timeout handling in jsonprpc2 and added more javascript tests about jsonrpc connections and sessions handling 
bzr revid: nicolas.vanhoren@openerp.com-20131011141156-po7fh1sc7gp64k9x
 2013-10-11 16:11:56 +02:00
ddm e5ef2e27e4 [IMP] Wait for DOM element if necessary 
bzr revid: ddm@openerp.com-20131011140044-2haoqqfsj0hwdn68
 2013-10-11 16:00:44 +02:00
Xavier Morel 8a10e6a688 [IMP] add a cke widget for monetary fields to make the currency symbol non-editable 
bzr revid: xmo@openerp.com-20131011135616-3zfvuhoxjzoce78q
 2013-10-11 15:56:16 +02:00
Xavier Morel 1ad6132624 [IMP] span[text-decoration] -> del 
bzr revid: xmo@openerp.com-20131011135550-q4s83cgbb7f8qgof
 2013-10-11 15:55:50 +02:00
Olivier Dony 7cb7405ffd [IMP] orm: _store_get_values: rename variables to make this horror slightly more readable 
We keep having to fight variable decay in that function, for some reason.

bzr revid: odo@openerp.com-20131011134501-7b5rflknjm1r9zfd
 2013-10-11 15:45:01 +02:00
Olivier Dony 8ac110c4dd [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5098 rev-id: odo@openerp.com-20131011123914-7zuvd9mch21yxgj8 
bzr revid: dle@openerp.com-20131009131902-a93nsbou4w8y0vlx
bzr revid: chs@openerp.com-20131009175454-j06y1ngylfbqyrpj
bzr revid: dle@openerp.com-20130918160049-fo88fl7uyhfoofkv
bzr revid: dle@openerp.com-20130924130544-kmkyr0d73cusvdav
bzr revid: odo@openerp.com-20131011134433-nyfjipvlql4xu127
 2013-10-11 15:44:33 +02:00
niv-openerp 6475f3225d Removed jsonprpc2 test because it fails in phantomjs 
bzr revid: nicolas.vanhoren@openerp.com-20131011133208-gjz0iprk63447qub
 2013-10-11 15:32:08 +02:00
niv-openerp 083d3fc91e Added tests about timeouts and implemented it in jsonprpc2 
bzr revid: nicolas.vanhoren@openerp.com-20131011133054-0dx3wxqcqbdocnlf
 2013-10-11 15:30:54 +02:00
ajay javiya (OpenERP) 085911cbab [REN]: Rename method from get_day to get_interval, add access rightsin portal_crm module 
bzr revid: aja@tinyerp.com-20131011132646-o8i43xa83ptuw5e7
 2013-10-11 18:56:46 +05:30
Xavier Morel 1208a5bcf5 [ADD] monetary widget use in website_sale 
bzr revid: xmo@openerp.com-20131011131147-plqmc1r5ok4tcrge
 2013-10-11 15:11:47 +02:00
Thibault Delavallée e14a26ee13 [IMP] website_mail: follow management is now inside a div 
because there were issues in blog display.

bzr revid: tde@openerp.com-20131011130126-b2yqz3yvcdwqgqne
 2013-10-11 15:01:26 +02:00
Thibault Delavallée fe40538aff [IMP] website_blog: website view and routes improvements 
- cleaning of routes: now having blog/cat/category_id, blog/blog_post_id to simplify
routes (previously: blog/category_id/blog_post_id, leading to issues when having routes
using sometimes category_id, sometimes blog_post_id as first argument).
- improved website templates: publish management, added duplication. misc cleaning
of the display.

bzr revid: tde@openerp.com-20131011130059-zum19mjvi336u9b4
 2013-10-11 15:00:59 +02:00
Thibault Delavallée c639b7aad6 [IMP] website_blog: updated models 
- removed template field from category. This field was coming from the old document_page module. However
it has been decided to not keep the template feature on categories. Previously there was an onchange
in the document_page form view, allowign to define a template on the page category that will be a default
value for the page content. It has been decided to drop that feature because of the complexity to manage
snippets / html in the category without adding a category editor in the website front-end.
- updated data/demo/views accordingly
- to replace the template feature, it will be possible to duplicate a blog post directly in the front-end.
This will come in a future patch. However the copy method of blog_post has already been fixed to avoid
duplicating website_message_ids, and to reset website_published (_datetime) fields.

bzr revid: tde@openerp.com-20131011125832-dou1ep9ey2ffwa7s
 2013-10-11 14:58:32 +02:00
Thibault Delavallée 9700084074 [IMP] website: publish improvements 
- added protection again writing/reading directly on website_published: now done only
if this is a valid column
- added management of website_published_datetime, set everytime published is set to
True; this is done to be able to track publish date on messages and blog posts
notably.

bzr revid: tde@openerp.com-20131011125429-4zvm8txz67ew8tho
 2013-10-11 14:54:29 +02:00
Paramjit Singh Sahota 7d0e4e5fed [IMP] Improved attrs. 
bzr revid: psa@tinyerp.com-20131011124816-xk990kd0vpg5tvtn
 2013-10-11 18:18:16 +05:30
Paramjit Singh Sahota 8ce6495216 [MERGE] Merged lp:openobject-addons. 
bzr revid: psa@tinyerp.com-20131011124642-zjw0e4qljksvcda8
 2013-10-11 18:16:42 +05:30
Turkesh Patel (Open ERP) 62ba3155a0 [IMP] remove type parameter from __get_bar_values and make base_currency_id alwas defined 
bzr revid: tpa@tinyerp.com-20131011124404-xoytwxfso8rg5lmb
 2013-10-11 18:14:04 +05:30
Martin Trigaux 9c14eb963d [MERGE] sync with trunk 
bzr revid: mat@openerp.com-20131011124320-3fz6d7evzuh7is51
 2013-10-11 14:43:20 +02:00
Olivier Dony 088cb0255d [FIX] registry: restore elif changed to if in previous commit, for better readability (no effect) 
This should have no effect because when the first `if`
is entered a new registry is instantiated with
the default value for base_cache_signaling_sequence
set to 1, preventing entering the next `if` even
without `elif`.

bzr revid: odo@openerp.com-20131011123914-7zuvd9mch21yxgj8
 2013-10-11 14:39:14 +02:00
ajay javiya (OpenERP) 390e583569 [ADD]:user can accept/decline his/her invitation , other user are not allowed to accept/decline invitation from email template 
bzr revid: aja@tinyerp.com-20131011123819-2500eau5msgy1bsx
 2013-10-11 18:08:19 +05:30
Christophe Lilo Matthieu 8a54670c57 [FIX] qweb safe_eval: added safe attributes for evaluation. Currently _name is considered as safe; used in publish or edit management (object._name) 
bzr revid: tde@openerp.com-20131011123517-0xd0m7wfvq39s0y0
 2013-10-11 14:35:17 +02:00
niv-openerp e059b1c5c0 Added test with openerp sessions 
bzr revid: nicolas.vanhoren@openerp.com-20131011123416-wsfr0g1pusa0wftp
 2013-10-11 14:34:16 +02:00
Amit Bhavsar (Open ERP) 7384ea8108 [imp] Improve the price margin calculation and name_search for variant. 
bzr revid: amb@tinyerp.com-20131011123024-utkshw2tr1z8y8ah
 2013-10-11 18:00:24 +05:30
Xavier Morel df0fc4afc2 [IMP] test conversions correctly applied, remove unnecessary fields 
bzr revid: xmo@openerp.com-20131011114703-rgg9nsyrm6k92uak
 2013-10-11 13:47:03 +02:00
Christophe Simonis 34d2fd4d02 [FIX] web: request dispatching wraps controller function call to retry request if psycopg raise OperationError and convert IntegrityError into except_orm with translated message. 
bzr revid: chs@openerp.com-20131011113450-ktoaxul22p3nql75
 2013-10-11 13:34:50 +02:00
Amit Bhavsar (Open ERP) e74cdf08a3 [MERGE] merge with latest trunk. 
bzr revid: amb@tinyerp.com-20131011112542-uenx4qt1u5232ygf
 2013-10-11 16:55:42 +05:30