pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,003 Commits 1 Branch 0 Tags
affeeeda2e445b5bddfa0818dc15485e4c19dc5d
Commit Graph
85003 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Meghazi 3755e320a0 [MERGE] upstream 
bzr revid: fme@openerp.com-20140115160017-tg0zqbogexo0ybhz
 2014-01-15 17:00:17 +01:00
Christophe Matthieu 57273279db [IMP] website_blog: no blog post found message 
bzr revid: chm@openerp.com-20140115155211-61zcen9fjnatzyfr
 2014-01-15 16:52:11 +01:00
Gery Debongnie 74d6e75007 [IMP] supports col groupby in search view in graph view (addon web_graph) 
bzr revid: ged@openerp.com-20140115155137-qwy0sr49zhizgmf6
 2014-01-15 16:51:37 +01:00
Christophe Matthieu 025a94ad2f [IMP] website_event: no event found message 
bzr revid: chm@openerp.com-20140115154941-cz9ijtlaf961p72g
 2014-01-15 16:49:41 +01:00
Frédéric van der Essen edce92293d [FIX] point_of_sale: increased network posbox discovery timeout 
bzr revid: fva@openerp.com-20140115154542-vpl29qoj80ftskuf
 2014-01-15 16:45:42 +01:00
Christophe Matthieu 6117f829b1 [IMP] product: Service (product.product_product_consultant) eval='False' and True inside demo data 
bzr revid: chm@openerp.com-20140115153713-vd0tn5ttn7dhb3k6
 2014-01-15 16:37:13 +01:00
Fabien Meghazi 876760bec4 [IMP] Ignore phantomjs Warnings for ui tests 
bzr revid: fme@openerp.com-20140115153235-hicqe8foynkc14yj
 2014-01-15 16:32:35 +01:00
Christophe Matthieu cd12832f9e [IMP] product: Service (product.product_product_consultant) is sale_ok=False by default and overwrite in hr_timesheet to True 
bzr revid: chm@openerp.com-20140115152526-dptyljv7yxdkmis0
 2014-01-15 16:25:26 +01:00
Thibault Delavallée 54ee20cbd0 [IMP] website_mail: tmeplate editor: improved tmeplate of the pag 
- removed an unnecessary oe_structure in head of the page
- added a position: relative on the body_html field because otherwise
there are ugly violet bars

bzr revid: tde@openerp.com-20140115151706-pwy0jjgce955ttth
 2014-01-15 16:17:06 +01:00
Thibault Delavallée 6072e586f4 [FIX] website_mail: email_template: fixed lxml/etree adding a div 
outside of the html content, breaking the snippets-based editor.

bzr revid: tde@openerp.com-20140115151644-0cei3chdl5op2flr
 2014-01-15 16:16:44 +01:00
Martin Trigaux 1066a1ca2c [MERGE] [FIX] css: Fix the missing border-bottom of the notebook in dialogs 
bzr revid: mat@openerp.com-20140115145049-bj80tsytb8fcrsiw
 2014-01-15 15:50:49 +01:00
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
Martin Trigaux 83babf4f21 [IMP] sale,purchase order: order the field based on date_order instead of name (opw 602879) 
This avoids getting irrelevent order based on sequences without padding (eg: SO10 between SO1 and SO2)

bzr revid: mat@openerp.com-20140115144030-04xlhaf3b4sviq92
 2014-01-15 15:40:30 +01:00
Christophe Matthieu 3487d36fc2 [FIX] website_sale: fix boostrap row 
bzr revid: chm@openerp.com-20140115143139-dieh48j9t1tbh4w3
 2014-01-15 15:31:39 +01:00
Thibault Delavallée c63ffed24d [IMP] tools: mail: the cleaner, by parsing and serializing the html content, 
encapsulatse the whole content inside a div. This means that html fields are
not editor-clean after being sanitized, because a div has been inserted as root
element. Removing this element allows to have snippets that can be dragged,
dropped, or to insert new snippets inside edited html content in html fields.

[IMP] tools: tests: mail: updated a test accordingly

bzr revid: tde@openerp.com-20140115142709-e4951b4nc06sfxf0
 2014-01-15 15:27:09 +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
Cecile Tonglet f00e6711f5 [FIX] Fix the missing border-bottom of the notebook in dialogs 
bzr revid: cto@openerp.com-20140115142608-rjemiq5lq8ju8zc0
 2014-01-15 15:26:08 +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
Thibault Delavallée 2c4600f242 [IMP] [READD] [IMP] tools: mail: have a strict mode for html_sanitizer (not default) with 
options before website: without frames, with safe attributes only.
We will have to find a way to use the strict mode when parsing incoming
emails, but not when sending or storing openerp content.

Currently the not strict mode is the default one, to avoid side-effects with
the website.

bzr revid: tde@openerp.com-20140115141319-g15zl1kqrp8sgoa3
 2014-01-15 15:13:19 +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
Fabien Meghazi 1f916750eb [FIX] test_request: process cookies on redirections 
bzr revid: fme@openerp.com-20140115140958-9hm8thtlcnyflazz
 2014-01-15 15:09:58 +01:00
Martin Trigaux 2aa8a38447 [IMP] sale,purchase order: order the field based on date_order instead of name 
This avoids getting irrelevent order based on sequences without padding (eg: SO10 between SO1 and SO2)

bzr revid: mat@openerp.com-20140115140527-pztwh3kl6y9y7jbe
 2014-01-15 15:05:27 +01:00
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
Pooja Zankhariya (OpenERP) ba458f6abc [MERGE]Merge with Parent 
bzr revid: pza@tinyerp.com-20140115123052-n9pfmaoh5jzev28d
 2014-01-15 17:30:52 +05:00
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
Olivier Dony 1c129e4ca0 [FIX] ir.translation: search view should use the stored src colum, the source function is meant for edition only 
bzr revid: odo@openerp.com-20140115121021-978u00gkshuabvtf
 2014-01-15 13:10:21 +01:00
Denis Ledoux 6109102e91 [FIX] web: view_form.js, allow press enter to break line in fieldtextwidget 
bzr revid: dle@openerp.com-20140115120844-1z0pbh9pc63tllce
 2014-01-15 13:08:44 +01:00
Thibault Delavallée 4d73f955a9 [FIX] mail: mail_thread: fixed a bug in subscription, new followers 
could overwrite the subscription of previous followers.

This has already been fixed in saas-2 branch at revision 9079 (revid
tde@openerp.com-20140109131748-hgtflp40pmjhlhu2). But the fix is also
valid for the 7.0 stable branch.

bzr revid: tde@openerp.com-20140115115825-fniobvz33sssvrwd
 2014-01-15 12:58:25 +01:00
Denis Ledoux 7826e495a1 [FIX] crm_partner_assign: next.js, if active_view is form, go to next, else reload the view 
bzr revid: dle@openerp.com-20140115114428-bboczdthq9wbvrn6
 2014-01-15 12:44:28 +01:00
Denis Ledoux 39a54d1096 [FIX]crm_partner_assign: message_post only accept one thread id 
bzr revid: dle@openerp.com-20140115113525-01dzfhjfawvxwopb
 2014-01-15 12:35:25 +01:00
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
Pooja Zankhariya (OpenERP) c722fff1f8 [IMP]Changed string 'Option' to 'Suggested Products', Added 'Suggested Products' on Quote template which let us select products and fill it to 'Suggested Products' on sale order. 
bzr revid: pza@tinyerp.com-20140115111158-d2gfyi19arn28s3o
 2014-01-15 16:11:58 +05:00
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
Martin Trigaux 2170efe270 [MERGE] [FIX] reference field: correct editable tree view for refrence field (opw 601553) 
bzr revid: mat@openerp.com-20140115110038-30hgekee12evx5fm
 2014-01-15 12:00:38 +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
Gery Debongnie 4343ca278a [FIX] correctly compares groupby in pivot_table to avoid bugs/crashes (now, it ignores the 'interval' attributes) so the table can interact with the graph view (addon web_graph) 
bzr revid: ged@openerp.com-20140115105104-qff3t47lo1lyp5wd
 2014-01-15 11:51:04 +01:00
jke-openerp b039b62435 [REF] Remove sequence from test data 
bzr revid: jke@openerp.com-20140115102941-51rdgpoecc4k8e12
 2014-01-15 11:29:41 +01:00
Fabien Meghazi 1783797949 [FIX] database manager link 
bzr revid: fme@openerp.com-20140115100631-9wrchrrvoei4llo0
 2014-01-15 11:06:31 +01:00
jke-openerp 02130ffcd7 [REF] Update __openerp__.py to point on the good filename 
bzr revid: jke@openerp.com-20140115100506-s0a5rn1hn1eivxof
 2014-01-15 11:05:06 +01:00
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
jke-openerp 46b0c7aa00 [REF] Rename model crm.meeting into calendar.event 
Remove 2 unsused field from calendar.event model (dir,sequence)

bzr revid: jke@openerp.com-20140115093805-1g1j1oymyxsb6kgh
 2014-01-15 10:38:05 +01:00
Gery Debongnie cf81efda43 [IMP] adds search view integration in graph view (addon web_graph) 
bzr revid: ged@openerp.com-20140115093749-t2s0306fchm2tnir
 2014-01-15 10:37:49 +01:00
Denis Ledoux 1cfd7ec102 [FIX] google_drive: anyone with the link can now write 
We used to give write access to the email address of the current user, but if the email is not a google account, there is no way for the current user to write on the data (except if the current email address is also the email which has done the oauth activation in the settings).

bzr revid: dle@openerp.com-20140115093528-ir39ppqrinjqyeta
 2014-01-15 10:35:28 +01:00