pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,003 Commits 1 Branch 0 Tags
affeeeda2e445b5bddfa0818dc15485e4c19dc5d
Commit Graph
85003 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Trigaux 8e97edb976 [IMP] gamification: put challenge list above goals to be more user friendly 
bzr revid: mat@openerp.com-20140207105529-4a95snjwpc11he6k
 2014-02-07 11:55:29 +01:00
Fabien Pinckaers 02aff66446 [FIX] layout bug, right alignment of blocks incorrect 
bzr revid: fp@tinyerp.com-20140207104831-s52wrim8r8k7eqox
 2014-02-07 11:48:31 +01:00
Denis Ledoux 4ecf5bb09a [FIX] mail: create and edit of template_id in compose message now works, as we pass the template model in context (among others useful default value) 
bzr revid: dle@openerp.com-20140207104637-lkx5am24608n8jka
 2014-02-07 11:46:37 +01:00
Martin Trigaux b8b6a3651a [FIX] gamification: convert missed type to definition filter (goal history menu will group by user and definition) 
bzr revid: mat@openerp.com-20140207103357-7v8seoqgq9rokhhi
 2014-02-07 11:33:57 +01:00
Martin Trigaux 838fe32a98 [IMP] gamification: related field challenge_id is always readonly, add helper 
bzr revid: mat@openerp.com-20140207102705-cf5aue57qzo03rlq
 2014-02-07 11:27:05 +01:00
Thibault Delavallée c02a510889 [IMP] website_mail: email designer: improved template + link to backend 
bzr revid: tde@openerp.com-20140207102124-5joee7c201fmxizu
 2014-02-07 11:21:24 +01:00
Martin Trigaux 344452e73a [FIX] hr_gamification: add auto_install to attribute, when get gamification and hr, automatically installed 
bzr revid: mat@openerp.com-20140207102029-6y45r4cmrc1h8kx7
 2014-02-07 11:20:29 +01:00
Mahendra Barad (OpenERP) 484e04661f [IMP]imprvoe the paragraph level comment 
bzr revid: mba@tinyerp.com-20140207101702-vd9ey7b3ojho08mu
 2014-02-07 15:47:02 +05:30
Christophe Matthieu 8879fb1728 [FIX] website snippet: reset snippet-editor and overlay because the rte re-generate the dom and cancelled all snippet datas 
bzr revid: chm@openerp.com-20140207100734-pdzr0qz8mtmha96m
 2014-02-07 11:07:34 +01:00
Martin Trigaux f988e74828 [FIX] gamification: when serialising data, skip lines and challenges with no goals 
bzr revid: mat@openerp.com-20140207093643-vr1on5oxqtzkalj9
 2014-02-07 10:36:43 +01:00
Martin Trigaux 691d305ed9 [FIX] gamification: automatically generates goals for users when adding them to a new challenge 
bzr revid: mat@openerp.com-20140207092411-yju3pif1ibipcff8
 2014-02-07 10:24:11 +01:00
Thibault Delavallée d26919f73e [IMP] website_mail: reordered email snippets, added 2 and 3 columns in basic email structures 
bzr revid: tde@openerp.com-20140207091907-6brx7m2i69mo9ow0
 2014-02-07 10:19:07 +01:00
ajay javiya (OpenERP) 292f9ad980 [IMP] : demo data 
bzr revid: aja@tinyerp.com-20140207090611-3xccl03os5p4xh2t
 2014-02-07 14:36:11 +05:30
Thibault Delavallée c2b51ee58a [FIX] mail: mail_followers.js: fixed the fix about is_follower, use the right variable 
bzr revid: tde@openerp.com-20140207084946-mkh0ht44x5byhrdj
 2014-02-07 09:49:46 +01:00
Thibault Delavallée 1e2452fb1a [IMP] website_mail: email designer snippets categories better explained, to avoid 
confusion with the classic html editor

bzr revid: tde@openerp.com-20140207084137-zk2o3nn7ml84axa6
 2014-02-07 09:41:37 +01:00
Christophe Matthieu 4663f5b10c [IMP] website test: add a timeout in phantom js to raise a better error and improve log error 
bzr revid: chm@openerp.com-20140207074745-ffrcoi2aj5m67i8m
 2014-02-07 08:47:45 +01:00
ajay javiya (OpenERP) 9e5733c7a8 [MERGE] : merge with lp:~openerp-dev/openobject-addons/trunk-website-al-blog-imp-aja 
bzr revid: aja@tinyerp.com-20140207061928-2s378cq1okd0fs2v
 2014-02-07 11:49:28 +05:30
Christophe Matthieu 062c491488 [IMP] website test_ui: add a try catch in run and run_test to display error 
bzr revid: chm@openerp.com-20140206175113-w0qscfngebnn7718
 2014-02-06 18:51:13 +01:00
Olivier Dony f7c1afffcb [FIX] mail.thread: avoid tracking multiple temporary changes during copy 
bzr revid: odo@openerp.com-20140206173251-1njroiu08fzgdbyp
 2014-02-06 18:32:51 +01:00
Olivier Dony 9ac5d91fdb [FIX] project.copy(): avoid preparing useless children data to copy, as they are discared in analytic.copy. Duplicating children is handled by duplicate_template(). 
bzr revid: odo@openerp.com-20140206172702-vxdhemegc4yoqzsv
 2014-02-06 18:27:02 +01:00
Olivier Dony fab4ad5913 [FIX] project.task: simplify delegated tasks remapping after task copy + avoid write() call if not necessary 
This avoids recomputing function fields if not
necessary.

bzr revid: odo@openerp.com-20140206171028-p7hpc0x9jpfnb7jv
 2014-02-06 18:10:28 +01:00
Launchpad Translations on behalf of openerp f6696383d6 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140207071400-b3u1081zn9icp7xw
 2014-02-07 07:14:00 +00:00
Denis Ledoux 15c105d95f [FIX] mail: re-apply security fix correctly from 9812 revid:mat@openerp.com-20140206121438-epghqo042ync24v5 of 7.0 branch 
bzr revid: dle@openerp.com-20140206170829-918bxb88qh415w9e
 2014-02-06 18:08:29 +01:00
Olivier Dony 391872c4d6 [FIX] orm.copy_data: avoid reading useless and possibly expensive data when copying records 
Rather than reading the data and discarding it,
it is much faster to not read it in the first place.

bzr revid: odo@openerp.com-20140206170401-brd6368pe1fmbkkc
 2014-02-06 18:04:01 +01:00
Denis Ledoux 8e4279835b [FIX]mail: fix indentation problem from previous forward port 
bzr revid: dle@openerp.com-20140206165630-13w44y6iewdrsl02
 2014-02-06 17:56:30 +01:00
Olivier Dony 7c53d8c2d1 [FIX] base: avoid keeping password wizards in the database longer than necessary 
This patch deletes the wizard lines rather than
 the wizard record itself, to avoid errors in case
 the client reloads the wizard data before actually
 closing it.

lp bug: https://launchpad.net/bugs/1271165 fixed

bzr revid: odo@openerp.com-20140206164559-j0j9o30im0u2hl2g
 2014-02-06 17:45:59 +01:00
Denis Ledoux 041f1db4a6 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9814 revid:dle@openerp.com-20140206163444-ckcmurcwk2vhi5vp 
bzr revid: dle@openerp.com-20140206164522-fi05cb4mpg22rkv2
 2014-02-06 17:45:22 +01:00
Christophe Simonis 4b22c30888 [FIX] auth_signup: keep query when generating links 
bzr revid: chs@openerp.com-20140206164020-2yuf5xdciabt4zsp
 2014-02-06 17:40:20 +01:00
Christophe Simonis daace48560 [MERGE] fix template rendering 
bzr revid: chs@openerp.com-20140206163811-i43srg7hd4yqzzo3
 2014-02-06 17:38:11 +01:00
Denis Ledoux 4818a83f26 [FIX] point_of_sale: validate and closing pos sessoin handle multi company 
When the user who validated and closed the pos session was not the same user who created the session, and if this user was not in the same company, it wasnt possible to validate and close the pos session.

This explanation if also valid if the user who created the pos session changed of company in his preferences between the creation and the validation.

bzr revid: dle@openerp.com-20140206163444-ckcmurcwk2vhi5vp
 2014-02-06 17:34:44 +01:00
Christophe Matthieu 97091c31ae [IMP] website: reduce run test of banner 
bzr revid: chm@openerp.com-20140206161614-afam16q12ci0kr7l
 2014-02-06 17:16:14 +01:00
Fabien Meghazi 2d4fb97696 [IMP] Move some qweb rendering context vars from website#ir.qweb to server#ir.ui.view 
bzr revid: fme@openerp.com-20140206161316-jw7luqon476widcm
 2014-02-06 17:13:16 +01:00
Fabien Meghazi 297781df08 [IMP] Move some qweb rendering context vars from website#ir.qweb to server#ir.ui.view 
bzr revid: fme@openerp.com-20140206161204-vp6kydvdxhg5qykx
 2014-02-06 17:12:04 +01:00
Martin Trigaux 610010876b [ADD] stock: update pot file to latest version of translations 
bzr revid: mat@openerp.com-20140206160059-7fkwb6havgazmttg
 2014-02-06 17:00:59 +01:00
Christophe Matthieu a3664a8924 [FIX] website: create event, product 
bzr revid: chm@openerp.com-20140206154711-vwvw7g1wo1fd1h1y
 2014-02-06 16:47:11 +01:00
Christophe Matthieu f3b7cfe2f1 [FIX] website.tour.blog 
bzr revid: chm@openerp.com-20140206154646-fth0k220okdgsckk
 2014-02-06 16:46:46 +01:00
Frédéric van der Essen 34bc74ea42 [MERGE] from saas-3 
bzr revid: fva@openerp.com-20140206151527-qxb9sxrz1wi7d0xk
 2014-02-06 16:15:27 +01:00
Frédéric van der Essen a78af30755 [FIX] hw_escpos: company logo was not centered on the first receipt 
bzr revid: fva@openerp.com-20140206151432-avaz87emjzqyvu9t
 2014-02-06 16:14:32 +01:00
Christophe Matthieu 64eb4376ee [MERGE] from saas-3 
bzr revid: chm@openerp.com-20140206150121-drs3ybhgx5837zt2
 2014-02-06 16:01:21 +01:00
Thibault Delavallée 2f682975bc [FIX] website: fixed call to slugify 
- python-slugify: max_length is an optional keyword
- slugify library also exists and does not accepts max_length -> if this very simple library is used, fall
            back on our own implementation

bzr revid: tde@openerp.com-20140206145638-entdcqsawrqf1nnq
 2014-02-06 15:56:38 +01:00
Thibault Delavallée 989a4f3103 [FIX] website_mail: also depends on email_template 
bzr revid: tde@openerp.com-20140206145524-bafdhe3gc62oya2c
 2014-02-06 15:55:24 +01:00
Thibault Delavallée 93a5122ac5 [IMP] website_mail: improve email_template link for front-end edition didsplay 
bzr revid: tde@openerp.com-20140206145510-y4mangyhhmwcofa7
 2014-02-06 15:55:10 +01:00
Christophe Matthieu 14b4efcd28 [FIX] tour and translate title 
bzr revid: chm@openerp.com-20140206145236-vwdq74yyz21qvyzu
 2014-02-06 15:52:36 +01:00
Fabien Meghazi b112d5d2f1 [FIX] ir ui view should have rendering context on request.website_enabled 
bzr revid: fme@openerp.com-20140206143919-f6vz8rpx9mb4798g
 2014-02-06 15:39:19 +01:00
Frédéric van der Essen 008e3c1ab0 [FIX] point_of_sale: receipt header & footer could overflow outside of ticket 
bzr revid: fva@openerp.com-20140206143648-z1bsknelzznf0jqj
 2014-02-06 15:36:48 +01:00
Christophe Matthieu e8964f896c [FIX] website: tour, test and test_runner 
bzr revid: chm@openerp.com-20140206140746-jmeyx8q9qxv7sz1j
 2014-02-06 15:07:46 +01:00
Frédéric van der Essen ec4dd7389b [IMP] point_of_sale: try harder to connect to proxy when the ip is already known 
bzr revid: fva@openerp.com-20140206140645-uo82x3tf60wlhytj
 2014-02-06 15:06:45 +01:00
Christophe Matthieu 0677fda79e [FIX] website tours: fix and translate 
bzr revid: chm@openerp.com-20140206140643-z3b2fu2v9uaozc1z
 2014-02-06 15:06:43 +01:00
Frédéric van der Essen a9226e3d5b [FIX] hw_scanner, hw_escpos: prevent driver threads from deadlocking when woken by two simultaneous requests 
bzr revid: fva@openerp.com-20140206140524-ur51ghcpdzwxv1yr
 2014-02-06 15:05:24 +01:00
Christophe Matthieu 052bcacd5f [FIX] website_sale template; snippet editor 
bzr revid: chm@openerp.com-20140206140258-l3hriceuksx0c061
 2014-02-06 15:02:58 +01:00