Commit Graph

472 Commits

Author SHA1 Message Date
Christophe Simonis e4cb5202a0 [MERGE] forward port of branch saas-4 up to fa07bc8 2014-07-30 20:30:14 +02:00
Denis Ledoux 88c022dfc8 [MERGE] forward port of branch 7.0 up to bbb8d8f25a 2014-07-29 11:42:10 +02:00
Martin Trigaux 3d53306ccc [FIX] gamification: why is there a button here ? do you need a button ? I don't think so... 2014-07-24 08:50:48 +02:00
Raphael Collet cbe2dbb672 [MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.

- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
2014-07-06 17:05:41 +02:00
rba-odoo c6d8eaabf5 [IMP]kanban View: harmonize kanban view by changing head as bold and centered and aliases as centered 2014-07-02 14:52:29 +02:00
Jaydeep Barot 026e38b48f [REM] Unnecessary `size` parameters on char fields 2014-06-25 17:13:43 +02:00
Christophe Simonis eef6330c55 [MERGE] forward port of branch saas-5 up to adf07a9 2014-06-19 16:23:32 +02:00
Christophe Simonis adf07a9490 [MERGE] forward port of branch saas-4 up to 5087612 2014-06-19 16:13:35 +02:00
Christophe Simonis 5087612d1d [MERGE] forward port of branch saas-3 up to bf53aed 2014-06-19 15:44:07 +02:00
Paramjit Singh Sahota 9bb0abd641 [FIX] GAMIFICATION: Fixed the Attribute Error
' 'str' object has no attribute 'strftime' '
2014-06-17 15:12:15 +02:00
Olivier Dony 0f01df42ea [MERGE] Forward-port saas-5 up to f15cbd6 2014-06-12 18:59:15 +02:00
Olivier Dony f15cbd6520 [MERGE] Forward-port saas-4 bugfixes up to ad4c6ca 2014-06-12 18:54:36 +02:00
ged-odoo 74168c4e9d Merge pull request #272 from odoo-dev/master-inline-searchview-ged
[MERGP] Inline Searchview

This task split the searchview in two parts: SearchView and SearchViewDrawer. The drawer is displayed inside the main view and the searchview stays in place.  It also changes the scrolling behavior of the web client: the main view area can scroll without affecting the UI (so the various menus stays in place)

Because of this, other large changes have been made:

the drawer has been redesigned,
the Custom Filter widget has been split in two (Custom Report and SaveCurrentFilter),
the main view is now scrollable, so the UI stays in place and only the view can change
The text 'Group By...' has been changed into 'Group By' (most addons had to be modified)
bootstrap classes are used when it makes sense (for example, badge)
the left menu is also scrollable (separately from the main view)

It is likely that some stupid bugs have been introduced.  Please don't hurt me.
2014-06-12 16:27:11 +02:00
Fabien Meghazi faa09da325 Removed version="7.0" from form views 2014-06-12 09:09:59 +02:00
Christophe Simonis 7bee9447c4 [MERGE] forward port of branch saas-3 up to 3c7a54a 2014-06-11 11:06:04 +02:00
Martin Trigaux 387093a34a gamification: when changing the domain on a goal definition give a simple check to avoid getting a traceback when the challenge is reloaded 2014-06-10 12:03:32 +02:00
Géry Debongnie 8202561511 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-06-10 11:43:17 +02:00
Christophe Simonis a5908c5812 [MERGE] forward port of branch saas-5 up to b1c0bc0 2014-06-03 20:02:00 +02:00
Christophe Simonis b1c0bc0b46 [MERGE] forward port of branch saas-4 up to 65f68c1 2014-06-03 19:45:19 +02:00
Martin Trigaux aa1165441c [FIX] gamification: do not group on agregated field for sum
The read_group behaviour has changed and read_group no longer sum on the field you are grouping.
Instead agregate on the field we want to sum and use no groupby.
For future version, grouping on a user such as what is done in batch mode is a better way to process.
2014-06-03 10:48:26 +02:00
Martin Trigaux ae8e7ea920 [IMP] gamification: remove deprecated method 2014-06-02 15:15:53 +02:00
Géry Debongnie 62900fe01b Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
Conflicts:
	addons/crm/crm_case_section_view.xml
2014-05-26 10:06:31 +02:00
Géry Debongnie 555677f14d [IMP] replace all 'Group By...' by 'Group By'
in all searchview, the 'Group By...' looks weird, next to the Custom
Reports and Filters.  This change was requested by the upper management
2014-05-22 11:44:35 +02:00
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Martin Trigaux 8f2bbf73ae [FIX] gamification: avoid sending reports for non-reported challenges 2014-05-14 16:15:18 +02:00
Martin Trigaux ce5ba45d45 [IMP] gamification: avoid fetching function field while we could reuse the cache system of the browse records (avoid memory errors when updating a large number of records) 2014-05-14 15:41:38 +02:00
Martin Trigaux 0043a58763 Forward-port of latest saas-3, up to revision 9456 (yep I missed one commit) 2014-05-14 11:01:36 +02:00
Martin Trigaux 3ff7b48a81 [FIX] gamification: make sure than a cron running more than once a day will not report the progress more than once 2014-05-14 10:59:20 +02:00
Martin Trigaux 583fe74ba2 Forward-port of latest saas-3, up to revision 9455 (rev-id mat@openerp.com-20140514080416-m4t23y0rxx2ot7y6) 2014-05-14 10:37:54 +02:00
Martin Trigaux f14f632ef5 [IMP] gamification: improve the name of some m2m relations
bzr revid: mat@openerp.com-20140512092718-s6143ajy2g18ofy4
2014-05-12 11:27:18 +02:00
Martin Trigaux 55ac64258f [FIX] gamification: correct name of ir.rule fixing bad copy-paste
bzr revid: mat@openerp.com-20140512085041-b0euexzgxgvb30oe
2014-05-12 10:50:41 +02:00
Martin Trigaux 3691ee0ca7 [FIX] gamification: avoid challenge to be initialised at the target limit (e.g. set your company data goal has a target of 0) and make sure we will compute the goal at least once
bzr revid: mat@openerp.com-20140509131839-lm5zt696sif1krvx
2014-05-09 15:18:39 +02:00
Christophe Simonis b8089a1521 [MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1
bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am
2014-05-07 19:01:12 +02:00
Martin Trigaux fd50793820 [IMP] gamification: avoid subscription hacks and send directly relevant messages to followers of the challenge, remove the goals of users not matching the user domain anymore
bzr revid: mat@openerp.com-20140507095616-1xvetgj4qel7iqii
2014-05-07 11:56:16 +02:00
Martin Trigaux 3fa2751855 [FIX] name_get returns tuple
bzr revid: mat@openerp.com-20140506143834-od28gkhbpbhsgde4
2014-05-06 16:38:34 +02:00
Martin Trigaux 3cdb9803d4 [IMP] unsubscribing at each cron run is overkill
bzr revid: mat@openerp.com-20140506135953-3hssq2lycvy1c3df
2014-05-06 15:59:53 +02:00
Martin Trigaux 687d675de5 [FIX] gamification: using batch mode to check rewards
bzr revid: mat@openerp.com-20140506134805-4nsurv82cg9anfvm
2014-05-06 15:48:05 +02:00
Martin Trigaux 409bf269d3 [FIX] gamification: be sure that not challenge get subscribers depending of the report_message_frequency
bzr revid: mat@openerp.com-20140506115245-ktuxhcsml466ym6u
2014-05-06 13:52:45 +02:00
Martin Trigaux a233e26f71 [IMP] gamification: commit for each goal definition in cron
bzr revid: mat@openerp.com-20140506113831-iut3aqbwfwbnertv
2014-05-06 13:38:31 +02:00
Martin Trigaux 697dcae728 [IMP] gamification: move write in goal update inside the first loop to be able to group the computation by definition (and potentially apply intermediate commits)
bzr revid: mat@openerp.com-20140506112109-z4rsx5umet5x6n26
2014-05-06 13:21:09 +02:00
Martin Trigaux ccf4d142b0 [FIX] gamification: avoid recomputing every goal for every challenge
bzr revid: mat@openerp.com-20140506102942-obopc9j5a2136cxh
2014-05-06 12:29:42 +02:00
Martin Trigaux bde55baaa9 [IMP] gamification: performance improvement on the goal computation
Removing the inheritance to mail.thread will avoid posting message at creation and other tracking mechanism at each write. Updating a challenge with a large number of users will be significantly faster.

bzr revid: mat@openerp.com-20140506093716-xvpe1n2ase2zix0v
2014-05-06 11:37:16 +02:00
Gery Debongnie 5aa2fa150c [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
Antony Lesuisse 7e25b9ae55 [MERGE] saas-4 report_webkit missing dependency on report
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
Denis Ledoux 79d4c57877 [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9439 revid:dle@openerp.com-20140429112147-hqfqd0y487s817n7
bzr revid: dle@openerp.com-20140429112738-y2el246dmd2o2zy9
2014-04-29 13:27:38 +02:00
Martin Trigaux b2bc761d76 [FIX] gamification: do not overwrite the mail widget as it would be called too often, the wall is enough
bzr revid: mat@openerp.com-20140425130740-ptkbsyyql08cx572
2014-04-25 15:07:40 +02:00
Fabien Meghazi 1c4e2cfd22 [IMP] bundlify addons (except website)
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
Christophe Simonis 7a7d7febf8 [MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
Martin Trigaux f73907587b [FIX] gamification: do not set a start_date by default as the cron starts past challenges (making data challenge to start) and avoid useless write
bzr revid: mat@openerp.com-20140424110341-pnu79q44m7gzl8t0
2014-04-24 13:03:41 +02:00
Martin Trigaux bb91b146dd [MERGE] [FIX] gamification and website_forum
- add noupdate tag
- domain are evaluated at loading
- better user subscription and computation of domain
- batch creation of users

bzr revid: mat@openerp.com-20140422083856-3dffeml5qt0w0dt4
2014-04-22 10:38:56 +02:00
Martin Trigaux 6022f890cb [FIX] gamification: convert calls to private method and don't forget to create missing goals
bzr revid: mat@openerp.com-20140422075247-5rddurvr6ymt80mo
2014-04-22 09:52:47 +02:00
Martin Trigaux b24252d5e9 [IMP] gamification: force domain to be in unicode
bzr revid: mat@openerp.com-20140418163837-32nldgj5u04q9kyu
2014-04-18 18:38:37 +02:00
Martin Trigaux 4725d6f532 [REF] gamification: remove unused ref local variable
bzr revid: mat@openerp.com-20140418163440-7y1k3sliuk9bgco8
2014-04-18 18:34:40 +02:00
Martin Trigaux 130f572d81 [IMP] gamification: use evaluated version of the domain.
Needs server fix to avoid sending evaluated data.

bzr revid: mat@openerp.com-20140418161053-lc970koh96wfe200
2014-04-18 18:10:53 +02:00
Martin Trigaux a6bcf53bd3 [IMP] gamification: performance improvement in generation method
bzr revid: mat@openerp.com-20140418150618-9g179rleuru44xrt
2014-04-18 17:06:18 +02:00
Martin Trigaux 1b006190d9 [REF] gamification
bzr revid: mat@openerp.com-20140418140741-djesyaxahxytnl1n
2014-04-18 16:07:41 +02:00
Martin Trigaux 202ee0208b [IMP] gamification: add use_ids fields if technical features
bzr revid: mat@openerp.com-20140418124220-fvsgvvgunmeq3opj
2014-04-18 14:42:20 +02:00
Martin Trigaux 067f21ce5a [FIX] gamification: set data in noupdate blocks to allow the user to customise it without loosing changes after update
bzr revid: mat@openerp.com-20140418120846-h8yo4ljult88f1h3
2014-04-18 14:08:46 +02:00
Martin Trigaux 6f4efd45bb [FIX] gamification: change scope of goal_obj variable
bzr revid: mat@openerp.com-20140418090520-zq4r6s4g9qn78mvx
2014-04-18 11:05:20 +02:00
Martin Trigaux 5e7b8518d5 [FIX] gamification: this noupdate block should be in noupdate (no kidding)
bzr revid: mat@openerp.com-20140417125412-4w5wp0ubsendx7nr
2014-04-17 14:54:12 +02:00
Gery Debongnie 0c24df7074 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140417065356-x7o3jg5bo5430zth
2014-04-17 08:53:56 +02:00
Martin Trigaux 36acee7568 [FIX] gamification: test needs cron to run
bzr revid: mat@openerp.com-20140416153153-f6r85uc8ibztzvup
2014-04-16 17:31:53 +02:00
Martin Trigaux 0c32e7241d [IMP] use char_domain widget
bzr revid: mat@openerp.com-20140416152208-1rnyyvr35m0kj5cm
2014-04-16 17:22:08 +02:00
Martin Trigaux d79cbd3fb8 [FIX] gamification: convert autojoin_group_id to a domain representing the list of users
bzr revid: mat@openerp.com-20140416151026-lmvyo8k0wo4hw9gn
2014-04-16 17:10:26 +02:00
Martin Trigaux f6a75093b9 [FIX] gamification: add security rule for multicompany (avoid getting error messages on home page when displaying top 3 goals)
bzr revid: mat@openerp.com-20140416130924-8pyuejefcu7hnzmf
2014-04-16 15:09:24 +02:00
Martin Trigaux 0443680952 [FIX] gamification: the subquery domain should use less than for ending dates
bzr revid: mat@openerp.com-20140415161538-mdfadjjih90wuj3d
2014-04-15 18:15:38 +02:00
Gery Debongnie f57b767361 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +02:00
Martin Trigaux 35c7f4814d Allow overwrite of the serialising method to exclude some categories in the challenge search
bzr revid: mat@openerp.com-20140415134809-uconkvnp0z32jxjs
2014-04-15 15:48:09 +02:00
Martin Trigaux 14ff39f96e [FIX] website_forum: mooooore baaaaaadges
bzr revid: mat@openerp.com-20140415101842-yf6vndw7h62q0b42
2014-04-15 12:18:42 +02:00
Martin Trigaux c40318a46a [ADD] website_forum: self_reply field and some badges
bzr revid: mat@openerp.com-20140414145415-8g9jtp95d173183i
2014-04-14 16:54:15 +02:00
Martin Trigaux 0c8539846a [ADD] website_forum: quality badges
bzr revid: mat@openerp.com-20140414135115-onmywwurr03g21dw
2014-04-14 15:51:15 +02:00
Gery Debongnie 9950bb8f74 [FIX] remove an useless computation in gamification.py and improves the text of the stat button displayed in challenges form view (addon gamification)
bzr revid: ged@openerp.com-20140414134332-h4gn61fu1ly9tbye
2014-04-14 15:43:32 +02:00
Martin Trigaux a52e13bd86 [FIX] remove wrong required and readonly fields
bzr revid: mat@openerp.com-20140414131720-bzqd1sv0j2t5wywd
2014-04-14 15:17:20 +02:00
Thibault Delavallée d0740bedb9 [IMP] gamification: messages posted on user when receiving a badge
now have a subtype, to ease their search.

bzr revid: tde@openerp.com-20140411175730-hq06b7qezurzymj6
2014-04-11 19:57:30 +02:00
Thibault Delavallée f091e9d6e5 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140411155723-pqe8ofxh060afiuj
2014-04-11 17:57:23 +02:00
Martin Trigaux 668fb8a542 [MERGE] gamification: add batch mode, improve some views, remove inprogess_update state and "realtime" (using cron) badge to recieve badges without needing to close the challenge
bzr revid: mat@openerp.com-20140411154740-pzw0v7po7pmci42l
2014-04-11 17:47:40 +02:00
Martin Trigaux 236a4d71be [MERGE] sync with trunk
bzr revid: mat@openerp.com-20140411154002-6557tcjfetqwb0kf
2014-04-11 17:40:02 +02:00
Martin Trigaux c67c964d5f [ADD] gamification: realtime badge to recieve badge without closing the challenge
bzr revid: mat@openerp.com-20140411151917-21drebbaa1d36jv4
2014-04-11 17:19:17 +02:00
Thibault Delavallée aa48312b98 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140411145955-91iohb1enc50se5l
2014-04-11 16:59:55 +02:00
Martin Trigaux 21022c5472 [REF] gamification: add batch mode, improve some views, remove inprogess_update state (replaced with boolean 'to update')
bzr revid: mat@openerp.com-20140411142257-zpaul4sq3t5j5r64
2014-04-11 16:22:57 +02:00
Thibault Delavallée e4d4c00312 [FIX] gamification: allow having False or 0 values as result of a computation.
bzr revid: tde@openerp.com-20140411141510-c11djv7qlf9qgek2
2014-04-11 16:15:10 +02:00
Gery Debongnie 2e9ee9c76e [MERGE] merge from rma branch
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
Thibault Delavallée a8445aac37 [FIX] gamification: avoid discarding False or 0 given as result for
python computation.

bzr revid: tde@openerp.com-20140410141049-luw63buvf0jsvkoh
2014-04-10 16:10:49 +02:00
Thibault Delavallée 1d5beb57ef [MERGE] Sync with upstram: website-forum-tpa
bzr revid: tde@openerp.com-20140409165804-q4wi76e0m0c9ovzw
2014-04-09 18:58:04 +02:00
Thibault Delavallée 70eb634173 [FIX] Fixe dlast commit: badge message is posted on the user
as before. Also updated code in mail/res_users that could big: partner_ids given
to message_post can be a list of commands, or a list of ids.

bzr revid: tde@openerp.com-20140409155003-32ccef4udlzfg5us
2014-04-09 17:50:03 +02:00
Thibault Delavallée 9b922d9858 [REVIEW] [CLEAN] gamification: reverted changes instead of
the fix.

bzr revid: tde@openerp.com-20140409152629-3div4vdfknjrtnb6
2014-04-09 17:26:29 +02:00
Turkesh Patel (Open ERP) 1cb83cbb3b [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20140409121219-vls8f4edm6sta49w
2014-04-09 17:42:19 +05:30
Gery Debongnie eb41be40bf [FIX] fixes an incorrect call to read_group (the groupby argument should be a list of groupbys and should not be a list with an empty string (addon gamification)
bzr revid: ged@openerp.com-20140404114216-35wqvkegnpnn7mil
2014-04-04 13:42:16 +02:00
Randhir Mayatra rma-openerp 77ff3a69b8 [IMP] improve icons and views
bzr revid: rma@tinyerp.com-20140328133051-2amm63n2vy3bj3xe
2014-03-28 19:00:51 +05:30
Yogesh Parekh (OpenERP) 21bb79d47e [IMP]: Convert buttons into stat button in gamification module
bzr revid: ypa@tinyerp.com-20140326122549-imqefk86wbxdxmpm
2014-03-26 17:55:49 +05:30
Turkesh Patel (Open ERP) 9bb6139cd2 [IMP] gamification: improved code to send notification message when bedge assigned, website_forum: improved code to show notification when badge assigned to user.
bzr revid: tpa@tinyerp.com-20140319090735-zi01wzh8a8u5cfb7
2014-03-19 14:37:35 +05:30
Thibault Delavallée 6709242bb8 [CLEAN] gamification: removed .moved folder, added when forward porting
saas-3 into trunk.

bzr revid: tde@openerp.com-20140221114004-9ee33tn3ilk6rekf
2014-02-21 12:40:04 +01:00
Christophe Simonis 4b72678bc7 [MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
Martin Trigaux cce60acc15 [FIX] gamification: when auto-subscribing users to challenges, do it as superuser
bzr revid: mat@openerp.com-20140218140403-eamxtm6dvwj3g5d3
2014-02-18 15:04:03 +01:00
Martin Trigaux a90962e56d [IMP] do not change the API and use superuser inside the method instead of in the call
bzr revid: mat@openerp.com-20140218135101-uozhw08pkr04q49z
2014-02-18 14:51:01 +01:00
Martin Trigaux 4a35b2e4b0 [FIX] gamification: skip challenges where every goal is achieved in serialisation
bzr revid: mat@openerp.com-20140218133138-9od9xqr3dv4hl95b
2014-02-18 14:31:38 +01:00
Martin Trigaux 5fbeea64b5 [IMP] remove useless html files
bzr revid: mat@openerp.com-20140218131112-3sd0f8nnv5w6c93s
2014-02-18 14:11:12 +01:00
Martin Trigaux b34108ac73 [FIX] gamification: accpet and discard challenges wizard should work as superuser, the user do no need gamification rights
bzr revid: mat@openerp.com-20140218130800-vth6elmbtrjmdouq
2014-02-18 14:08:00 +01:00
Martin Trigaux a1b6b4f1ac [ADD] gamification: i18n translation files
bzr revid: mat@openerp.com-20140213151208-l452x2lf2g4dyhdj
2014-02-13 16:12:08 +01:00
Martin Trigaux 68128c971b [ADD] gamification: i18n translation files
bzr revid: mat@openerp.com-20140213150613-hgblsyl893bc6ov7
2014-02-13 16:06:13 +01:00