pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,746 Commits 1 Branch 0 Tags
f61339b82cd6993f00a91149fb5dca7a2bfb8ab1
Commit Graph
89746 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibault Delavallée 9199587ec9 [CLEAN] crm: cleaned crm module before merging : 
- removed unnecessary changes
- rewrote on_change_user and get_default_sectoin_id to have a correct default section
- removed duplicated code in sales_team module due to code moving not correctly cleaned
 2014-05-12 13:41:49 +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 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
Thibault Delavallée 443c830bfc [RENAME] sale_team renamed to sales_team. Update module name, file name and reference to the module. 2014-05-12 10:37:47 +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
Thibault Delavallée dd531b3300 [MERGE] Sync with upstream (trunk) 2014-05-12 10:08:48 +02:00
Martin Trigaux 4f5cc00420 Forward-port of latest saas-4, up to revision 5211 (revid fme@openerp.com-20140509164408-rtml4brrhpiv4zz9) 2014-05-12 10:05:23 +02:00
Denis Ledoux e70fc38f2f [FIX] crm: The get_formview_id method does not expect a model arg anymore 
bzr revid: dle@openerp.com-20140512075919-ewldirr5ejd5py13
 2014-05-12 09:59:19 +02:00
Denis Ledoux d2716e2db9 [ADD] hw_escpos: TM-T20II printer added in supported device list 
bzr revid: dle@openerp.com-20140512074150-9wepj7andgwrgj7x
 2014-05-12 09:41:50 +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
Paramjit Singh Sahota cce820565d Missed commit while merging. 2014-05-12 12:11:08 +05:30
Launchpad Translations on behalf of openerp 8c139b01e7 Launchpad automatic translations update. 2014-05-12 06:38:16 +00:00
Paramjit Singh Sahota 2ac1156925 [MERGE] Merged lp:openobject-addons. 2014-05-12 10:31:53 +05:30
Paramjit Singh Sahota fe9b88a3ba [REVERT] Reverted the changes of rev 9219. 2014-05-12 10:25:20 +05:30
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 bcbd263214 [IMP] Adding fields 
bzr revid: fp@tinyerp.com-20140511074755-5b3iy2b1xk7cjxmf
 2014-05-11 09:47:55 +02:00
Launchpad Translations on behalf of openerp 1397b7aa34 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140510075539-empsrh7k5l6q44ln
bzr revid: launchpad_translations_on_behalf_of_openerp-20140510075505-nu0zmfg57i2352lz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140511070820-8xp1e2jxonp4i750
bzr revid: launchpad_translations_on_behalf_of_openerp-20140503064840-v6n2wyrm1l162bh4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140504062728-9tmsk2r01vvs3avi
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506072722-8xpshoxb4um6ef30
bzr revid: launchpad_translations_on_behalf_of_openerp-20140511070841-lboiasc73m8h3fb2
 2014-05-11 07:08:41 +00: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 dbd6e4362a [MOV] ir.ui.view#write() forced noupdate moved in website (RTE only) 
bzr revid: fme@openerp.com-20140509164408-rtml4brrhpiv4zz9
 2014-05-09 18:44:08 +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 f506fc45a3 [MOV] ir.ui.view#write() forced noupdate moved in website (RTE only) 
bzr revid: fme@openerp.com-20140509141106-vbokuh0prptxavvg
 2014-05-09 16:11:06 +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
Atul Patel (OpenERP) 320abf6be9 [FIX]: Remove rml tag removeParentNode. improve condition. 2014-05-09 19:08:36 +05:30
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
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
Prashant Panchal (OpenERP) 138ffedbf0 [MERGE]: Merged with addons 2014-05-09 18:47:56 +05:30
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
Martin Trigaux b87db84c0d [FIX] ir_values: try to evaluate the given expression before saving it in pickle form (opw 607398) 
The value_unpickled given by xml data is usualy already evaluated but when it is given by the web client, a str is recieved by the method (as the field is a text field). In the later case, we need to evaluate the field before storing to be correctly evaluated as a default value.

bzr revid: mat@openerp.com-20140509130412-ki211x7qdccdnv5w
 2014-05-09 15:04:12 +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
Prashant Panchal (OpenERP) ca2bee0865 [IMP]add groups 'base.group_multi_salesteams' 2014-05-09 16:16:07 +05:30