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
65936 Commits
Author SHA1 Message Date
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
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
Olivier Dony b7fe8e1f8a [FIX] portal: use email_split method to avoid blocking valid emails, rather than obsolete email_re 
lp bug: https://launchpad.net/bugs/1199386 fixed

bzr revid: odo@openerp.com-20140115093120-r2u2bmms9y847b93
 2014-01-15 10:31:20 +01:00
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
Martin Trigaux 3a95bbaf63 [FIX] base_calendar: when sorting on a many2one field (format (id, name)), sort on the name value instead of full tuple 
bzr revid: mat@openerp.com-20140115085748-029ntjqc71huep25
 2014-01-15 09:57:48 +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
Launchpad Translations on behalf of openerp 5334330d9d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140115062126-ypg4xp33rspusnts
bzr revid: launchpad_translations_on_behalf_of_openerp-20140115062205-ov2axame3z00jkii
 2014-01-15 06:22:05 +00:00
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
Denis Ledoux ede8d04028 [FIX] account_anglo_saxon: tests, accounts on which reconciliations are done must have reconcile field set to True 
bzr revid: dle@openerp.com-20140114201834-2ul27pur66701un4
 2014-01-14 21:18:34 +01:00
Denis Ledoux 7084d9259f [FIX] email_template: fix test email_template, list of emails space-separated is not correct, should be comma-separated 
bzr revid: dle@openerp.com-20140114180652-xeoil4jgjh7k5i2e
 2014-01-14 19:06:52 +01:00
Denis Ledoux 899166ecac [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9761 revid:dle@openerp.com-20140114164804-zhfy9lb308554kp1 
bzr revid: dle@openerp.com-20140114173653-xhh85ubx27uu1306
 2014-01-14 18:36:53 +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
Denis Ledoux 8a729c10fa [FIX] purchase: fix workflow for orders based on incoming shipments 
Purchase orders Based on incoming shipments never ended in done stage

bzr revid: dle@openerp.com-20140114164804-zhfy9lb308554kp1
 2014-01-14 17:48:04 +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
jke-openerp a9218d7afd [MERGE] Merge with trunk 
Replace dHtmlXScheduler calendar by FullCalendar from Jquery
Manage filter by coworker/favorite Employee
Manage avatar in event / in sidebar filter

bzr revid: jke@openerp.com-20140114160325-1e4dgbe3f8fo38na
 2014-01-14 17:03:25 +01:00
jke-openerp 0848bc7c79 [MERGE] Merge with trunk-cal-jke 
New calendar :
   Component changed : dHtml into Jquery FullCalendar
   Manage recurrency
   Manage alarm with notif/mail
   oAuth google 'web app'
   Manage coworker / Favorite
   Use avatar for attendee and filter
   Manager calendar by partner and not user
   Your events are now event where you are attendees and not events that you have created
   Manage quick_create, Quick_view, ...

Rename module google_base_account into google_account
Rename module base_calendar into calendar
New module Google Calendar

bzr revid: jke@openerp.com-20140114155927-vu7x8egpcirommus
 2014-01-14 16:59:27 +01:00
jke-openerp 85610ef401 [IMP] Force start date to the first occurence of an rrule 
bzr revid: jke@openerp.com-20140114155152-fbdy5n51shlc9xvu
 2014-01-14 16:51:52 +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
Fabien Meghazi 5d540d69b3 [IMP] Allow /login route to redirect after login (useful for Aline's user tests) 
bzr revid: fme@openerp.com-20140114151553-fehc82gxz1nq25yu
 2014-01-14 16:15:53 +01:00