Commit Graph

71862 Commits

Author SHA1 Message Date
Xavier Morel 477d7ad803 Merge branch 'web-trunk' 2014-05-14 15:13:35 +02:00
Xavier Morel f4d78ae738 Merge branch 'server-trunk'
Conflicts:
	addons/mass_mailing/controllers/main.py
2014-05-14 15:13:04 +02:00
Launchpad Translations on behalf of openerp e30348e1e0 Launchpad automatic translations update. 2014-05-14 05:55:34 +00:00
Fabien Meghazi f3c8cc50c8 [IMP] Include openerpframework in common assets. Add module list in bundle 2014-05-12 17:18:12 +02:00
Cedric Snauwaert 9d9cfd585f [FIX]sale_report: change type of field date from date to datetime to match field date on sale_order
bzr revid: csn@openerp.com-20140512114532-726a1z0wqbpz96t8
2014-05-12 13:45:32 +02:00
Fabien Meghazi 05c598f0b3 [ADD] website.menu editable list in website config
bzr revid: fme@openerp.com-20140512113820-oidhod8ovqp3nh9a
2014-05-12 13:38:20 +02:00
Olivier Dony 4cecbd919f [FIX] mass_mailing,website*,survey: leftover calls to website.get_public_user()
This method was (partially) removed at rev.9421 
rev-id al@openerp.com-20140507153223-q73u5lhyrfw98o3a

bzr revid: odo@openerp.com-20140512103935-o0ue9wzenm5wjejq
2014-05-12 12:39:35 +02:00
Xavier Morel b39aac717d [IMP] mail, base_import: context key disabling history tracking
* added a ``tracking_disable`` context key used by mail to completely disable
  subscriptions setup and events generation during create and write operations
* added import option to optionally set up that context key and speed up
  imports at the cost of not setting up subscriptions and not sending
  create/update events

bzr revid: xmo@openerp.com-20140512100400-d1axjam2d0i2y0tf
2014-05-12 12:04:00 +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
Xavier Morel f176e65fae [IMP] mail docs
* fill-paragraph
* remove sections referring to removed methods with no obvious replacement

bzr revid: xmo@openerp.com-20140512085546-50u4beuvakgfett8
2014-05-12 10:55:46 +02:00
Martin Trigaux 27a6d2e9f4 Forward-port of latest saas-4, up to revision 3994 (rev-id jke@openerp.com-20140509131203-4gy3nhlj0v6fk7zv) 2014-05-12 10:10:32 +02:00
Martin Trigaux 555d4879c8 Forward-port of latest saas-4, up to revision 9416 (rev-id fme@openerp.com-20140509164338-gnz7p3qxt8etrh5w)
bzr revid: mat@openerp.com-20140512072331-0lidgqb6x7fregdj
2014-05-12 09:23:31 +02:00
Fabien Pinckaers 106abb6496 [FIX] css edit menu alignment and fix of / handling
bzr revid: fp@tinyerp.com-20140511154058-kj8nn9fdl3li9nzi
2014-05-11 17:40:58 +02:00
Fabien Pinckaers cebce64b00 [FIX] better handling of '/'. / is the first menu and not the first menu is /. Allows to move the first menu in another position
bzr revid: fp@tinyerp.com-20140511153235-6mmygt69z45rcx4r
2014-05-11 17:32:35 +02:00
Fabien Pinckaers 798e4156fa [IMP] sitemap cleaning: events
bzr revid: fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
2014-05-11 16:33:14 +02:00
Fabien Pinckaers 105618443f [IMP] Sitemap
bzr revid: fp@tinyerp.com-20140511134037-84vnn1b4zfzk8som
2014-05-11 15:40:37 +02:00
Fabien Pinckaers 54d30d5194 [IMP] clean sitemap, enumerate pages + fixes
bzr revid: fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4
2014-05-11 13:52:31 +02:00
Fabien Pinckaers 80ea7fe099 [IMP] removing static style
bzr revid: fp@tinyerp.com-20140509202753-p5080kwk8dupfdrc
2014-05-09 22:27:53 +02:00
Fabien Meghazi 09d530268f [MOV] ir.ui.view#write() forced noupdate moved in `website` (RTE only)
bzr revid: fme@openerp.com-20140509164338-gnz7p3qxt8etrh5w
2014-05-09 18:43:38 +02:00
Fabien Meghazi 501ad7abeb [IMP] dumb code
bzr revid: fme@openerp.com-20140509151855-7v4hp08qvmac1u2d
2014-05-09 17:18:55 +02:00
Fabien Meghazi 7caabb8f75 [MERGE] upsteam
bzr revid: fme@openerp.com-20140509144608-btah4s8zorzon2jo
2014-05-09 16:46:08 +02:00
Fabien Meghazi 69a93b07c7 [MOV] ir.ui.view#write() forced noupdate moved in `website` (RTE only)
bzr revid: fme@openerp.com-20140509141024-xa9mawoye3o8e6c1
2014-05-09 16:10:24 +02:00
Thibault Delavallée b9c62c7adb [MERGE] [ADD] mass_mailing: add a snippet to allow subscribing to a contact list (newsletter). Also cleaned the wording of the snippet allowing to subscribe do a discussion group to avoid confusion.
bzr revid: tde@openerp.com-20140509135051-tt1blzojwtpt86lr
2014-05-09 15:50:51 +02:00
Martin Trigaux dab3557253 [FIX] website_forum: correct the 'Editor' goal definition, the field author_id on a mail_message is a m2o to res.partner and not res.users
bzr revid: mat@openerp.com-20140509134434-6u2ft2gyv0hcryxq
2014-05-09 15:44:34 +02:00
Fabien Meghazi dba3e92195 [IMP] Add $.fn.button to jquery.ui noconflict template
bzr revid: fme@openerp.com-20140509133528-9i2kvn0heyxn6ngw
2014-05-09 15:35:28 +02:00
Thibault Delavallée 6f60eb218f [IMP] subscribe to group / newsletter widgets: wording cleaning
bzr revid: tde@openerp.com-20140509132156-qbmop9au07cllgkk
2014-05-09 15:21:56 +02:00
Kersten Jeremy 9e141c760c [FIX] Kanban / Modal - Close the backdrop from dialog when we open the dialog for add a new column in kanban view. This bug was introduced since with use bootstrap modal
bzr revid: jke@openerp.com-20140509131203-4gy3nhlj0v6fk7zv
2014-05-09 15:12:03 +02:00
Thibault Delavallée 4c4d610336 [IMP] mass_mailing: added newsletter as mailing list data + imported contact still demo data
bzr revid: tde@openerp.com-20140509125358-2kjc462ttrnxmpxm
2014-05-09 14:53:58 +02:00
Thibault Delavallée da20dc9899 [IMP] website_mail: rename newsletter mail group to discussion group
to avoid confusion with mass mailing mailing lists and newsletters.

bzr revid: tde@openerp.com-20140509125118-obvdjkgreyiez8k9
2014-05-09 14:51:18 +02:00
Thibault Delavallée ad65e32cc2 [MERGE] Sync with upstream (saas-4)
bzr revid: tde@openerp.com-20140507090057-24hacfi1jxs6ob5g
bzr revid: tde@openerp.com-20140509124711-v82rqm57nyc0jlcm
2014-05-09 14:47:11 +02:00
Kersten Jeremy 0826340b8a [FIX] Event - Don't update the context but a copy when we recompute dates with the timezone specified for the event.
bzr revid: jke@openerp.com-20140509123121-xchv133t7gh0e5nh
2014-05-09 14:31:21 +02:00
Fabien Meghazi 4c24985289 [ADD] alternate hreflang links in head for search engines
cf: https://support.google.com/webmasters/answer/189077?hl=en

bzr revid: fme@openerp.com-20140509122400-49sl631mwipx1039
2014-05-09 14:24:00 +02:00
Fabien Meghazi f652660cb6 [FIX] is_multilang_url by checking against werkzeug's routing map using query string too
bzr revid: fme@openerp.com-20140509122323-2ext0livjgr5njb0
2014-05-09 14:23:23 +02:00
Kersten Jeremy 67fb735b50 [FIX] Event - Allow to specify the timezone from the event and use it in template mail.
bzr revid: jke@openerp.com-20140509121827-3ngkf93jhduobcoa
2014-05-09 14:18:27 +02:00
Gery Debongnie 252b527fb9 [MERGE] improve pivot table rendering
* don't redraw the full table when folding/expanding rows: simply removing/inserting
the rows from/into the DOM is faster
* add a $ in front of jquery variables
* improve the way indentation in row headers is done (was done by generating useless spans)
* fix a stupid bug: a tbody tag was added around each row of the table

bzr revid: ged@openerp.com-20140509110350-al7phvo3wk5rozya
2014-05-09 13:03:50 +02:00
Jitendra Prajapati 1f86156991 [MERGE] [IMP] mail, report_webkit: view improvements + better name_get for mail and aliases.
bzr revid: tde@openerp.com-20140509102355-wor8j7cy3egna3qx
2014-05-09 12:23:55 +02:00
Cedric Snauwaert dee000be14 [FIX]modal: when closing a modal, focus previous one to allow several escape hit key
bzr revid: csn@openerp.com-20140509094836-yhncaqp60od67w7k
2014-05-09 11:48:36 +02:00
Quentin (OpenERP) be8d760408 [FIX] claim_from_delivery: fixed error in delivery view
bzr revid: qdp-launchpad@openerp.com-20140509092750-p9o1v530tmdwsqz5
2014-05-09 11:27:50 +02:00
Cedric Snauwaert 1685b4a265 [FIX]purchase_requisition: put js file in a bundle
bzr revid: csn@openerp.com-20140509092717-07wp6u6fc5so07jz
2014-05-09 11:27:17 +02:00
Gery Debongnie e94c1f03d6 [IMP] optimizes pivot table rendering when expanding rows (addon web_graph)
This patch makes the graph widget only add the rows that were new instead
of redrawing the full table when expanding

bzr revid: ged@openerp.com-20140509090935-sje3u6i4x1luswwn
2014-05-09 11:09:35 +02:00
Martin Trigaux 6f99764697 [FIX] product: get_history_price recieves ids instead of a browse record for product template
bzr revid: mat@openerp.com-20140509073315-9q0igp9zh6d96bl6
2014-05-09 09:33:15 +02:00
Gery Debongnie f4860a9fd1 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140509065825-s6awt9ql2ley1zpm
2014-05-09 08:58:25 +02:00
Launchpad Translations on behalf of openerp c43cbe8d72 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140509065326-0e0dp4cg4o3hr707
2014-05-09 06:53:26 +00:00
Mahendra Barad b4aa0eb76f [MERGE] [ADD] kanban_state_selection widget, allowing to manage kanban_state-like selection fields using bullet + dropdown; priority widget allowing to manage priorities using stars.
bzr revid: tde@openerp.com-20140508160156-b2jekyiajkjp7bse
2014-05-08 18:01:56 +02:00
Mahendra Barad df2e290da5 [MERGE] [IMP] crm, hr_recruitment, project, project_issue: use the newly-introduced widgets for the kanban state and the priority management.
This branch comes with a web branch holding those new widgets for form and kanban views.

bzr revid: tde@openerp.com-20140508160126-ddr1p19k9cbjd09h
2014-05-08 18:01:26 +02:00
Thibault Delavallée 8bf965a865 [FIX] priority widget in kanban: css fixes
bzr revid: tde@openerp.com-20140508153710-tbgohlv4ynuvyli9
2014-05-08 17:37:10 +02:00
Thibault Delavallée 32561d933d [IMP] dropdown_selection widget renamed kanban_state_selection
bzr revid: tde@openerp.com-20140508153432-h3f2ez0grw8rst1n
2014-05-08 17:34:32 +02:00
Thibault Delavallée 7d5de8d90d [IMP] dropdownselection widget renamed kanban state selection
bzr revid: tde@openerp.com-20140508153418-hs6ix3qouy1fu482
2014-05-08 17:34:18 +02:00
Thibault Delavallée ea1e0e3275 [CLEAN] crm, hr_recruitmnet, project: cleaned priority / kanban state in kanban views
bzr revid: tde@openerp.com-20140508152536-s3my5onl33z3kxxx
2014-05-08 17:25:36 +02:00
Thibault Delavallée 15e28717b4 [FIX] priority widget: css fixes
bzr revid: tde@openerp.com-20140508152516-1rv69jatyswj8e4r
2014-05-08 17:25:16 +02:00