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
Christophe Matthieu b9d668e23d [MERGE] from trunk-website-event-chm: managment of tickets for an event to defined price and max number registration, and check registration_limits 
bzr revid: chm@openerp.com-20130807141328-mpxkhr70qs4qhe18
 2013-08-07 16:13:28 +02:00
Christophe Matthieu edce9867e5 [FIX] website_sale: create a new order if order. 
bzr revid: chm@openerp.com-20130807140334-oa8bap1i0ya9tfaf
 2013-08-07 16:03:34 +02:00
Christophe Matthieu c012e3bdc6 [IMP] website_event: create order_line and check registration_limits 
bzr revid: chm@openerp.com-20130807134547-rbsrcswsozmna03w
 2013-08-07 15:45:47 +02:00
bth-openerp bed908a057 [MERGE]Merge main al branch. 
bzr revid: bth@tinyerp.com-20130807133950-gm911a2plrqy42ym
 2013-08-07 19:09:50 +05:30
Fabien Meghazi 89a6d2744c [FIX] make QWeb usable in standalone mode 
bzr revid: fme@openerp.com-20130807133939-3c2jxg5btjj8d2rq
 2013-08-07 15:39:39 +02:00
bth-openerp 0033a11708 [IMP]Add company name. 
bzr revid: bth@tinyerp.com-20130807133210-epwxgywxbxi4wsiv
 2013-08-07 19:02:10 +05:30
Thibault Delavallée 33fd9e01d6 [ADD] mass_mailing: added module for mass mailign campaigns. First draft of new module : 
simple mass mailing campaign model, linked to emails, compute some statistics
mail.compose.message updated to the mass mailing campaigns in mass mail mode

bzr revid: tde@openerp.com-20130807130334-nwd34fgsz4lc6lt1
 2013-08-07 15:03:34 +02:00
Fabien Meghazi 6e56bac4b0 [IMP] Replaced website#get_public_uid by get_public_user (returns browse record) 
bzr revid: fme@openerp.com-20130807130127-9yd6k1pypyhmo12n
 2013-08-07 15:01:27 +02:00
Thibault Delavallée fd100054cc [FIX] mail_mail: fixed reply_to computation (before create was leading to a wrong message_id to the embedded mail_message); mail_thread; fixed private discussion not going through the route checking; improved replying through mailgateway now incrementing the replied field of mail_mail. 
bzr revid: tde@openerp.com-20130807130118-yggvmontssofxt0q
 2013-08-07 15:01:18 +02:00
niv-openerp 88d43bf677 [FIX] mimetype problem that made Firefox crash 
bzr revid: nicolas.vanhoren@openerp.com-20130807123041-8tvf9u14xderh3hr
 2013-08-07 14:30:41 +02:00
Xavier Morel 5082758f86 [ADD] forgot sharedspace plugin 
bzr revid: xmo@openerp.com-20130807123019-7mfe70kdk4wtvjx1
 2013-08-07 14:30:19 +02:00
Xavier Morel 9d929fc49d [MERGE] from upstream 
bzr revid: xmo@openerp.com-20130807122010-0nsy134ki0obqyfc
 2013-08-07 14:20:10 +02:00
Xavier Morel 8f1acfff3b [ADD] basic stylesSet conf 
bzr revid: xmo@openerp.com-20130807121746-10gjzibadyr1kdml
 2013-08-07 14:17:46 +02:00
Xavier Morel 204fb89a8c [IMP] switch ck to built-in toolbar again 
bzr revid: xmo@openerp.com-20130807115905-4ooacsvwh7tsone5
 2013-08-07 13:59:05 +02:00
Fabien Meghazi 2d8bf806c9 [FIX] Forgot to change jQuery filename after upstream merge 
bzr revid: fme@openerp.com-20130807113900-awlhqfv0g1z7v1fv
 2013-08-07 13:39:00 +02:00
Christophe Matthieu 95e8504d5c [IMP] website_event: add function fields register on ticket model. Add onchange on sale.order.line for event tickets 
bzr revid: chm@openerp.com-20130807112812-23l0b8pjdzutyixy
 2013-08-07 13:28:12 +02:00
Xavier Morel 82999df03c [IMP] recent qunit will send moduleStart with no name if error happens outside of a testing module 
bzr revid: xmo@openerp.com-20130807112159-91jdzgl6g2fk966t
 2013-08-07 13:21:59 +02:00
Xavier Morel 0e88711020 [FIX] website dependency 
bzr revid: xmo@openerp.com-20130807111614-m9eoal3l4zmp65ny
 2013-08-07 13:16:14 +02:00
Turkesh Patel (Open ERP) dcb8285e9d [MRG] merge with lp:openobject-addons 
bzr revid: tpa@tinyerp.com-20130807104737-whxcg093p7rcoy60
 2013-08-07 16:17:37 +05:30
Fabien Meghazi 11fb809e60 [MERGE] upstream 
bzr revid: fme@openerp.com-20130807100643-0olinq3584kzc3we
 2013-08-07 12:06:43 +02:00
Fabien Meghazi 8d4efbe2a2 [FIX] Distribute branding for all website#render() calls if editable 
bzr revid: fme@openerp.com-20130807100142-uc01ncn9oca65t10
 2013-08-07 12:01:42 +02:00
niv-openerp 1f726f7826 [FIX] regression that made the qweb modules be loaded 2 times 
bzr revid: nicolas.vanhoren@openerp.com-20130807095457-gdm1ixzk0rcev2sg
 2013-08-07 11:54:57 +02:00
Christophe Matthieu 64ec795203 [IMP] website_event: managment of tickets for an event to defined price and max number registration 
bzr revid: chm@openerp.com-20130807094734-4uwlezgr50m4lwwu
 2013-08-07 11:47:34 +02:00
Ravi Gohil (OpenERP) f8d47a4a1d [FIX] crm: While processing the 'Convert to Opportunity' wizard in leads view, if the system found matching partner from the information provided in lead and suggested that partner in the wizard, and later if we decided not to link the opportunity to existing partner but to create a new one, it never create one, but will link to the priorly suggested partner: (Maintenance Case : 596231) 
lp bug: https://launchpad.net/bugs/1208436 fixed

bzr revid: rgo@tinyerp.com-20130807094630-efk7yo1ia27vpq5i
 2013-08-07 15:16:30 +05:30
Fabien Pinckaers 3c7c5e568d [IMP] website manifest 
bzr revid: fp@tinyerp.com-20130807093348-gvacpeu31x81c93q
 2013-08-07 11:33:48 +02:00
niv-openerp 8b963ce64f [FIX] Fixed regression that made the debug mode unavailable 
bzr revid: nicolas.vanhoren@openerp.com-20130807092232-jgkap3b3cfa2grfq
 2013-08-07 11:22:32 +02:00
Christophe Matthieu 2e88574a57 [IMP] res.partner: add us country for demo data 
bzr revid: chm@openerp.com-20130807090054-5sa1vst28w9exenw
 2013-08-07 11:00:54 +02:00
Xavier Morel 480630aecf [IMP] remove big blue border around RTE sections 
bzr revid: xmo@openerp.com-20130807075343-22er1l4ob6jbxczc
 2013-08-07 09:53:43 +02:00
Foram Katharotiya (OpenERP) 39e5ec3b9a [IMP] improve code 
bzr revid: fka@tinyerp.com-20130807064343-gifqjce1bewj0sk5
 2013-08-07 12:13:43 +05:30
Launchpad Translations on behalf of openerp ade561e1cc Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130803055522-fcjgcnhlfmzbpk1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20130806044754-4d3d8qgnfyuu1v8e
bzr revid: launchpad_translations_on_behalf_of_openerp-20130807044648-mspjcf73m77dwwb3
 2013-08-07 04:46:48 +00:00
Christophe Matthieu 49ce8ee1b6 [IMP] website_mail 
bzr revid: chm@openerp.com-20130806153950-to0nk5mqlxy4x8ug
 2013-08-06 17:39:50 +02:00
Christophe Matthieu 24a790e95f [FIX] website_hr 
bzr revid: chm@openerp.com-20130806153323-ctvf6y0yskaiwv8y
 2013-08-06 17:33:23 +02:00
Christophe Matthieu bbe9721732 [IMP] website_mail: check_access_rule to follow 
bzr revid: chm@openerp.com-20130806152951-0ur49vxwnxfexzq7
 2013-08-06 17:29:51 +02:00
Christophe Matthieu 892e38decf [IMP] website: website in context value 
bzr revid: chm@openerp.com-20130806152551-al681prbs3l1150q
 2013-08-06 17:25:51 +02:00
niv-openerp 67cba2d9c5 [FIX] Potential problems with server-side autodetection of request type. 
bzr revid: nicolas.vanhoren@openerp.com-20130806152547-2b5puachpvcjsci3
 2013-08-06 17:25:47 +02:00
Christophe Matthieu 966da9b37b [IMP] website 
bzr revid: chm@openerp.com-20130806152158-0waq0cqo2702isyo
 2013-08-06 17:21:58 +02:00
Thibault Delavallée 38a534dee0 [IMP] mail: first implementation of tracking and bounce management. 
Added 2 fields on mail_mail to count read/bounce.
Added bounce alias bounce-mail_id-model-res_id.
Added message_receive_bounce method that try to incremetn message_bounce field.

bzr revid: tde@openerp.com-20130806151143-7dw6xlj8n7mh0nqe
 2013-08-06 17:11:43 +02:00
Thibault Delavallée d1e7ad9be6 [IMP] tools: added a regex for bounce email addresses 
bzr revid: tde@openerp.com-20130806151018-0uom07dbr8b7ycb3
 2013-08-06 17:10:18 +02:00
Christophe Matthieu cf82d597f2 [IMP] website_event: on_change product 
bzr revid: chm@openerp.com-20130806144536-6l2g1glui1cout2q
 2013-08-06 16:45:36 +02:00
Christophe Matthieu dc0148b73e [IMP] website_mail: public_uid 
bzr revid: chm@openerp.com-20130806142835-tfk8gvdidxi0m371
 2013-08-06 16:28:35 +02:00
Christophe Matthieu 1a93e8bbca [IMP] website_sale: some access right 
bzr revid: chm@openerp.com-20130806141848-0m2c742tg18p2f04
 2013-08-06 16:18:48 +02:00
Fabien Meghazi 67e1d2819b [REM] Remove public_uid from request 
bzr revid: fme@openerp.com-20130806140636-qreh32s86q1synmk
 2013-08-06 16:06:36 +02:00
niv-openerp 8039768fc8 [IMP] added doc 
bzr revid: nicolas.vanhoren@openerp.com-20130806132807-rbiafmcqvbh1o79y
 2013-08-06 15:28:07 +02:00
Christophe Matthieu 972d35b277 [IMP] website_event: access right for event and product 
bzr revid: chm@openerp.com-20130806132041-84ubxx4hxgyqtwqk
 2013-08-06 15:20:41 +02:00
niv-openerp d3a2c47fb1 [IMP] Moved Mutex class to openerpframework.js 
bzr revid: nicolas.vanhoren@openerp.com-20130806131746-l43mz6aos7eupehm
 2013-08-06 15:17:46 +02:00
niv-openerp e6e5fcde1e [IMP] Improved shim for function.bind 
bzr revid: nicolas.vanhoren@openerp.com-20130806130734-lov3aq0m4b1r4sto
 2013-08-06 15:07:34 +02:00
Christophe Matthieu ca54d94534 [IMP] website_event, event 
bzr revid: chm@openerp.com-20130806130053-wt1l25ri50c1z0e6
 2013-08-06 15:00:53 +02:00
Foram Katharotiya (OpenERP) 1d2fefb203 [FIX] traceback from journal vouchers 
bzr revid: fka@tinyerp.com-20130806125854-txgvpzvkpc928v09
 2013-08-06 18:28:54 +05:30
niv-openerp baef37aec6 [IMP] Removed old JavaScript module loading system in the 'web' addons. Still has some retro-compatibility for other addons. 
bzr revid: nicolas.vanhoren@openerp.com-20130806125022-bzjbtn0nqk40ak4g
 2013-08-06 14:50:22 +02:00
Frédéric van der Essen 1e5794ac01 [MERGE] wip: ecommerce product list pager 
bzr revid: fva@openerp.com-20130806123103-2iske1o6ckt7rjxf
 2013-08-06 14:31:03 +02:00