pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,800 Commits 1 Branch 0 Tags
4e3bed270e75b85cfefa79f64713b45052b18c19
Commit Graph
78800 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Darshan Kalola (OpenERP) 4e3bed270e [IMP]improved product template in website_sale. 
bzr revid: dka@tinyerp.com-20140116120100-m305tam84zvjh0fw
 2014-01-16 17:31:00 +05:30
Amit Bhavsar (Open ERP) 6a1eb008bf [IMP] add context on product_tmpl_id of variant form. 
bzr revid: amb@tinyerp.com-20140116111955-528o6gkjsb0p68t3
 2014-01-16 16:49:55 +05:30
Darshan Kalola (OpenERP) 27da32873e [IMP]put domainin ecommerce_get_product_domain method of website to restrict the product_template which has not variants(ecommerce view). 
bzr revid: dka@tinyerp.com-20140116093347-tz9mn24r01xbfdp0
 2014-01-16 15:03:47 +05:30
Darshan Kalola (OpenERP) 79778888e7 [IMP]improved test case in compute_price_margin. 
bzr revid: dka@tinyerp.com-20140116084128-4g5cqtuf6bqf9mh8
 2014-01-16 14:11:28 +05:30
Darshan Kalola (OpenERP) acde6d86c1 [IMP]rename has_variants field to standard_variants in product form and improved fields_view_get method. 
bzr revid: dka@tinyerp.com-20140116074535-m40q8q7dy3kzfguf
 2014-01-16 13:15:35 +05:30
Darshan Kalola (OpenERP) a8fe8ac44f [IMP]added onchange method on product_tmpl_id and added standard_variants function field to check the number of variants, improved view of product and removed unneccessary code. 
bzr revid: dka@tinyerp.com-20140116072118-0xccl7mkdqbpdggb
 2014-01-16 12:51:18 +05:30
Darshan Kalola (OpenERP) 90248025a4 [MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al. 
bzr revid: dka@tinyerp.com-20140115144940-srkv28a758ov0xx8
 2014-01-15 20:19:40 +05:30
Christophe Matthieu 3487d36fc2 [FIX] website_sale: fix boostrap row 
bzr revid: chm@openerp.com-20140115143139-dieh48j9t1tbh4w3
 2014-01-15 15:31:39 +01:00
Christophe Matthieu 5593d53e94 [IMP] website_crm: auto install (and add the contact form in the contact us page) when install crm and website 
bzr revid: chm@openerp.com-20140115142630-p3vfz2p3upilbthk
 2014-01-15 15:26:30 +01:00
Christophe Matthieu b802e21671 [FIX] website snippet: jumbotron link to contact us 
bzr revid: chm@openerp.com-20140115142240-0fe7vr8dfnl092am
 2014-01-15 15:22:40 +01:00
Christophe Matthieu bcef910f84 [FIX] website editor: add attributeEditable attribute to edit an editing host 
bzr revid: chm@openerp.com-20140115141756-4ixq240p5z1snt9h
 2014-01-15 15:17:56 +01:00
Christophe Matthieu d24ff2f505 [FIX] crm_partner_assign: demo data load like data 
bzr revid: chm@openerp.com-20140115141717-q0n27fkxpin1j6s1
 2014-01-15 15:17:17 +01:00
Amit Bhavsar (Open ERP) e1d3744589 [IMP] add context on product_tmpl_id. 
bzr revid: amb@tinyerp.com-20140115141238-5bydnxn3a2qgfhz6
 2014-01-15 19:42:38 +05:30
Amit Bhavsar (Open ERP) 38b47cb029 [IMP] improve _save_product_lst_price. 
bzr revid: amb@tinyerp.com-20140115135119-mh7phg952conv2of
 2014-01-15 19:21:19 +05:30
Christophe Matthieu c7bf7ad759 [FIX] website_sale: shiping and invoicing data in red (required) are agressive even the first time 
bzr revid: chm@openerp.com-20140115131716-zj38n7pl3pnmdzpd
 2014-01-15 14:17:16 +01:00
Christophe Matthieu 2d659d5102 [IMP] website: clean editor.css 
bzr revid: chm@openerp.com-20140115130213-r55f246btqus6dzj
 2014-01-15 14:02:13 +01:00
Christophe Matthieu fd14481dd3 [IMP] website snippet: create snippets.sass, imrpove css and resizing layout 
bzr revid: chm@openerp.com-20140115125923-eggv51bsvokc7a06
 2014-01-15 13:59:23 +01:00
Amit Bhavsar (Open ERP) 6f277289ea [IMP] improve code for fields_view_get and _save_product_lst_price. 
bzr revid: amb@tinyerp.com-20140115125400-2hq2qgg81l21rwr0
 2014-01-15 18:24:00 +05:30
Darshan Kalola (OpenERP) d4460bf323 [IMP]product template: put context 'search_variants' in action to hide a blank varinats and revert the revno 10025. 
bzr revid: dka@tinyerp.com-20140115122723-we4y9wmn6pu36rh9
 2014-01-15 17:57:23 +05:30
Darshan Kalola (OpenERP) 33af9858b5 [IMP]put ondelete='restrict' on product_tmpl_id to restrict deletion of product template if template having a variants. 
bzr revid: dka@tinyerp.com-20140115113455-26aupx34va3b0km5
 2014-01-15 17:04:55 +05:30
Thibault Delavallée 21906d9d27 [MERGE] [IMP] [ADD] website: added a page for email.template designer. This page allows to customize the html content of the email.template using the website editor. Specific snippets have been developed to be used in the templates. Indeed the classic snippets using complex html5 and css are not correctly rendered inside email clients. 
[IMP] email_template: body_html is now a valid html file. As the html_sanitize is now basically destroyed, we can use an html field instead of a text one. Moreover, issues in the template will be seen directly and not when sending emails. Top cool.

[ADD] website: email_template: added website_link field, a link to edit the template
directly in the website
[ADD] website_mail: added controller and page to edit templates. They are still jinja
templates editable in the website. Not qweb templates.
[ADD] website_mail: JS file and editor override to enable only certain snippets. Some snippets have been implemented, based on the website editor snippets, but using tables and inline style instead of css and complex html5 formatting.
[IMP] website: improved the addition of editor JS in the template header to be able
to add JS file that override the editor without having to hack everything in the
template.

[TODO]
- verify the snippets in outlook
- check for snippet customize
- improve the layout of the template designer page

bzr revid: tde@openerp.com-20140115111010-y1f5elaadcq0k2g8
 2014-01-15 12:10:10 +01:00
Christophe Matthieu 320a0bc28c [IMP] website/website_sale: Use group to display shipping address in frontend like the backend. Use group for product facet caracteristique (backend/frontend). Customize templates is displayed function of groups of ir.ui.view templates. 
bzr revid: chm@openerp.com-20140115110547-v0nllq0f800tlhpg
 2014-01-15 12:05:47 +01:00
Amit Bhavsar (Open ERP) fcd017aedc [IMP] Remove deprecated code unlink method and improve code for _set_image 
bzr revid: amb@tinyerp.com-20140115105223-st7166p7z10lkaa7
 2014-01-15 16:22:23 +05:30
Darshan Kalola (OpenERP) b189887a46 [IMP]remove unnecessary yml change from point of sale and keep as it is. 
bzr revid: dka@tinyerp.com-20140115094220-w708vknkeh913r9x
 2014-01-15 15:12:20 +05:30
Thibault Delavallée 006ffd00ad [MERGE] Sync with website-al 
bzr revid: tde@openerp.com-20140115091759-fdupd1vral3z3ng8
 2014-01-15 10:17:59 +01:00
Thibault Delavallée 7a9bafc39c [CLEAN] website_mail: template designer: cleaned a bit the snippets to remove section tag 
bzr revid: tde@openerp.com-20140115091738-q0gpxqpn80m9r1sd
 2014-01-15 10:17:38 +01:00
Darshan Kalola (OpenERP) a452ff9d90 [IMP]remove domain from product_variant_ids and improve view. 
bzr revid: dka@tinyerp.com-20140115065949-8vnj4lvmsiq5vixr
 2014-01-15 12:29:49 +05:30
Darshan Kalola (OpenERP) 67f6f54e73 [MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al. 
bzr revid: dka@tinyerp.com-20140113130212-4f17b0inc4u3s5k3
bzr revid: dka@tinyerp.com-20140115052550-15ulprts5fo6s30r
 2014-01-15 10:55:50 +05:30
Fabien Pinckaers 8d8c382582 [FIX] CSS bug 
bzr revid: fp@tinyerp.com-20140114232046-56x0o2jnq93pi0wc
 2014-01-15 00:20:46 +01:00
Fabien Pinckaers 097f9074b9 [IMP] more snippets 
bzr revid: fp@tinyerp.com-20140114231054-am7au91oxjv66ntn
 2014-01-15 00:10:54 +01:00
Fabien Pinckaers 2affab61ef [IMP] remove badge for login, better design 
bzr revid: fp@tinyerp.com-20140114223426-praiwqupdlh9cyy9
 2014-01-14 23:34:26 +01:00
Fabien Pinckaers 942497350e [IMP] Features snippets 
bzr revid: fp@tinyerp.com-20140114223158-0nlv75aavf0zrntp
 2014-01-14 23:31:58 +01:00
Fabien Pinckaers a14745d53e [IMP] Clean flat colors 
bzr revid: fp@tinyerp.com-20140114220548-c2bda6k3fn8weqqn
 2014-01-14 23:05:48 +01:00
Fabien Pinckaers d73c8f15b6 [IMP] cleaned CSS, removed CSS 
bzr revid: fp@tinyerp.com-20140114212533-iz4oleo0opads01l
 2014-01-14 22:25:33 +01:00
Thibault Delavallée cb26621d2b [IMP] website_mail: template designer: improved button snippet 
bzr revid: tde@openerp.com-20140114173629-zfxili82zn6zi6yv
 2014-01-14 18:36:29 +01:00
Thibault Delavallée 5be1dfda6e [MERGE] Sync with website-al 
bzr revid: tde@openerp.com-20140114171738-zz4apq7nk5dcov0i
 2014-01-14 18:17:38 +01:00
Thibault Delavallée 0aa495f5cb [IMP] website_mail: improved email template snippets + added comparison / three columns / big pictures + some improvements in the page layout of template designer 
bzr revid: tde@openerp.com-20140114171715-akbkj9x8ls8i5phf
 2014-01-14 18:17:15 +01:00
Christophe Matthieu 45feba1f86 [IMP]website_sale: no product message for public users 
bzr revid: chm@openerp.com-20140114162925-z1gcl5h2rkxb7crx
 2014-01-14 17:29:25 +01:00
Christophe Matthieu dac3058100 [IMP] website: This page is under construction 
bzr revid: chm@openerp.com-20140114160434-wukbj48ope1twhja
 2014-01-14 17:04:34 +01:00
Christophe Matthieu 9a53155e7e [IMP] product: product_variant restrict to the group_product_variant 
bzr revid: chm@openerp.com-20140114152208-r2hasl9arc28rmm2
 2014-01-14 16:22:08 +01:00
Christophe Matthieu f51b91c345 [FIX] website: mobile snippets height 
bzr revid: chm@openerp.com-20140114151243-u1rjzw0exhskukbx
 2014-01-14 16:12:43 +01:00
Christophe Matthieu 9624ec21f8 [FIX] website_sale_delivery: public mode 
bzr revid: chm@openerp.com-20140114145833-73t9cc60z9i8bniw
 2014-01-14 15:58:33 +01:00
Christophe Matthieu 4e94761a8e [IMP] product: category and website_sale controllers 
bzr revid: chm@openerp.com-20140114142940-xpshp8e6trio5mxc
 2014-01-14 15:29:40 +01:00
Christophe Matthieu 9e0df88d7a [ADD] website_mail: css 
bzr revid: chm@openerp.com-20140114111607-as9mmdjcyqo2nrnh
 2014-01-14 12:16:07 +01:00
Christophe Matthieu fbb74096e3 [FIX] website_blog: employee can't post a comment 
bzr revid: chm@openerp.com-20140114105802-ztc2d398zuz100z0
 2014-01-14 11:58:02 +01:00
Christophe Matthieu c3cc2b08f1 [IMP] website_sale: demo data for suggested product 
bzr revid: chm@openerp.com-20140114105744-gz1z4ap9zra33s11
 2014-01-14 11:57:44 +01:00
Thibault Delavallée ba77b88179 [MERGE] Sync with main website-al branch 
bzr revid: tde@openerp.com-20140114101640-hw7hpa7t7lrde6hv
 2014-01-14 11:16:40 +01:00
Christophe Matthieu 057184bb64 [FIX] website_sale: if I add a suggested product to the card: Page not found wrong url 
bzr revid: chm@openerp.com-20140114095721-xjj4keju12znfoky
 2014-01-14 10:57:21 +01:00
Christophe Matthieu 449a37dc0d [FIX] website: base_language_install is an osv.osv_memory insead of osv.osv 
bzr revid: chm@openerp.com-20140114093603-toryzflx3b0yzdyr
 2014-01-14 10:36:03 +01:00
Thibault Delavallée 4ec71cd82b [ADD] website_mail: template designer: added some snippets for template design 
bzr revid: tde@openerp.com-20140113180051-dqtzzn9mrya0ythq
 2014-01-13 19:00:51 +01:00