jke-openerp
493301be30
[REF] Add field oe_update_date in exclude list in the write of calendar. That allow to update the name of title in all recurrence.
...
bzr revid: jke@openerp.com-20140115163358-uitr7iz38j5lojm3
2014-01-15 17:33:58 +01:00
Christophe Simonis
eae55df214
[FIX] point_of_sale: let the session generate a session_id itself
...
bzr revid: chs@openerp.com-20140115161651-aht37d2ruf1jyzw6
2014-01-15 17:16:51 +01:00
Christophe Matthieu
52e4cb3f99
[IMP] website_job: no job offer found message, better template, and fix type
...
bzr revid: chm@openerp.com-20140115160219-mqh0sx869zfwk1g7
2014-01-15 17:02:19 +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
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
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
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
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
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
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
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
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
jke-openerp
b039b62435
[REF] Remove sequence from test data
...
bzr revid: jke@openerp.com-20140115102941-51rdgpoecc4k8e12
2014-01-15 11:29:41 +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
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
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
Richard Mathot (OpenERP)
934aca0a6f
[MERGE] Merge parents
...
bzr revid: rim@openerp.com-20140114074420-swwlexlcq3wfaf5n
bzr revid: rim@openerp.com-20140115075208-aw04xhkjvxzr184z
2014-01-15 08:52:08 +01:00
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
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
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
Martin Trigaux
3f4c637674
[IMP] view_form: do not display hugly error message when name_get returns no value but more helpful message (eg: bad default value returns wrong id)
...
bzr revid: mat@openerp.com-20140114145720-r3lg0qjezqj4p3i1
2014-01-14 15:57:20 +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
jke-openerp
11ad17a085
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20140113200621-m1tuxf3mx9hgzsha
bzr revid: jke@openerp.com-20140114135749-p7s1vtyg0sy8yza6
2014-01-14 14:57:49 +01:00
jke-openerp
0072915549
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20140114135240-c7r0ma18f1ls2yae
2014-01-14 14:52:40 +01:00
jke-openerp
e9e2673044
[REF] Remove unused picture from POS
...
bzr revid: jke@openerp.com-20140114135154-4xyk2z4qarx6s59r
2014-01-14 14:51:54 +01:00
Olivier Dony
a7cb9b762d
[FIX] email_template: fix invalid uses of tools.email_split
...
This is necessary to have the tests pass after
the corresponding server patch in server 7.0
at revision 5198 revision-id: odo@openerp.com-20140114120344-r58wndgybqusnnq7
lp bug: https://launchpad.net/bugs/1199386 fixed
lp bug: https://launchpad.net/bugs/1165531 fixed
bzr revid: odo@openerp.com-20140114134627-6j83f4s6pvnj4uma
2014-01-14 14:46:27 +01:00
jke-openerp
53264da08a
[REF] Add order fix on calendar list view, flake google_calendar, undelete function get_sequence needed for google synchro
...
bzr revid: jke@openerp.com-20140114133736-cvvftr4hmaa3w3ad
2014-01-14 14:37:36 +01:00
Xavier Morel
e761b40a04
[FIX] pillow-compatible Image import
...
bzr revid: xmo@openerp.com-20140114125342-1l9smyz7woh8fg6t
2014-01-14 13:53:42 +01:00
Xavier ALT
7960f9fc59
[FIX] web: list view: fix wrong css for fields.reference in editable tree view
...
bzr revid: xal@openerp.com-20140114115947-gkh09tb2vxsjyksk
2014-01-14 12:59:47 +01:00
Stephane Wirtel
0aadcf42c9
[FIX] hr_holidays: Reverse previous patch with the warning
...
bzr revid: stw@openerp.com-20140114114559-ri5ts0vgv2vmyfth
2014-01-14 12:45:59 +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
Xavier ALT
9a84e25342
[FIX] web: list view: keep original fields.reference value instact, store it's display in fake field_name+'__display' column, so that editing value in editable tree mode works
...
bzr revid: xal@openerp.com-20140114100439-hvdu9cxwyb3vvsum
2014-01-14 11:04:39 +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
Richard Mathot (OpenERP)
47fd05247e
[IMP]
...
bzr revid: rim@openerp.com-20140114074322-99mm19e3o2002diz
2014-01-14 08:43:22 +01:00
Launchpad Translations on behalf of openerp
fb7a497ff0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140114055838-31j3saw3pdlwevp1
2014-01-14 05:58:38 +00:00
jke-openerp
facb8547db
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20140113193830-igvzvf8gsic5okm8
2014-01-13 20:38:30 +01:00
jke-openerp
41706f1ab5
[REF] Add missing import for uuid
...
bzr revid: jke@openerp.com-20140113193121-dafln7ygtzy6415s
2014-01-13 20:31:21 +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
jke-openerp
5626a5a391
[REF] Removing the quick create overriding for hr_holiday - that was a test/sample not used
...
bzr revid: jke@openerp.com-20140113174701-nmvtarylf19d63nx
2014-01-13 18:47:01 +01:00
jke-openerp
f9b6ff0760
[REF] Refactoring according to the review of CHS
...
bzr revid: jke@openerp.com-20140113174338-4fkx4zs8cw6k20y3
2014-01-13 18:43:38 +01:00
jke-openerp
c5791441c4
[REF] Refactoring according to CHS and AL review
...
bzr revid: jke@openerp.com-20140113174157-ins4vf57g0p6v82u
2014-01-13 18:41:57 +01:00
Martin Trigaux
c2da410014
[FIX] kanban: format aggregates values to float to avoid too long numbers in kanban column
...
bzr revid: mat@openerp.com-20140113172623-yuqjbhcsdxjq82rw
2014-01-13 18:26:23 +01:00
Stephane Wirtel
bfe20de386
[FIX] project_timesheet: supply_method is implemented in the module
...
'procurement' but this one is not in the dependencies of project_timesheet.
bzr revid: stw@openerp.com-20140113162901-0ykp7nlrxdiydmv5
2014-01-13 17:29:01 +01:00
Stephane Wirtel
e091efecb8
[FIX] hr_holidays: Use osv.except_osv instead exceptions.Warning, because
...
Warning does not inherit from osv.except_osv and this exception is not catched
by the system.
bzr revid: stw@openerp.com-20140113162727-5au3iimfz4d1mszw
2014-01-13 17:27:27 +01:00
Christophe Matthieu
9987b9a858
[FIX] website_blog: Customize: Blog Category
...
bzr revid: chm@openerp.com-20140113152038-rrc3x3sfcjoppvvk
2014-01-13 16:20:38 +01:00
Christophe Matthieu
74c9840476
[FIX] website_blog: Customize: Authors
...
bzr revid: chm@openerp.com-20140113151708-gyii0v2gg3ljxwcp
2014-01-13 16:17:08 +01:00
Denis Ledoux
1478317986
[FIX] mass_mailing, marketing: menus displayed to employees only (no portal/anonymous). ACL change too.
...
bzr revid: dle@openerp.com-20140113151018-5xksff08s0vrjh8d
2014-01-13 16:10:18 +01:00
Christophe Matthieu
cf15dfb490
[FIX] website_blog: Customize: Author
...
bzr revid: chm@openerp.com-20140113150859-cmj22j72syvosmmg
2014-01-13 16:08:59 +01:00
Thibault Delavallée
cbbe82a4a1
[MERGE] Sync with main website-al branch
...
bzr revid: tde@openerp.com-20140113134937-kijvjjne6grov61c
2014-01-13 14:49:37 +01:00
Thibault Delavallée
b97727701c
[IMP] [ADD] website: added base for template designer.
...
[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. Those
are still to add, but will be base templates for email.
[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.
bzr revid: tde@openerp.com-20140113125534-djy48pi7lf42f9ms
2014-01-13 13:55:34 +01:00
Martin Trigaux
1f163f5a78
[FIX] account: demo opening period, add x in the name
...
bzr revid: mat@openerp.com-20140113122917-zszm18ywrel1ie68
2014-01-13 13:29:17 +01:00
Denis Ledoux
9a93675d2d
[FIX] project: projects_ids default value must be an array or none, not a lonely integer
...
bzr revid: dle@openerp.com-20140113113015-fobrv940bjhw1g7z
2014-01-13 12:30:15 +01:00
ddm@openerp.com
f319a68196
[IMP] requestd by fp: load correct HTML template
...
bzr revid: ddm@openerp.com-20140113112514-qg43scqeryaha4nf
2014-01-13 12:25:14 +01:00
Martin Trigaux
7078d1c36a
[MERGE] sync with trunk
...
bzr revid: mat@openerp.com-20140113112336-1dg6zz86g24yiicq
2014-01-13 12:23:36 +01:00
Christophe Matthieu
f927506bfc
[FIX] website_mail: follow/subscribe button
...
bzr revid: chm@openerp.com-20140113110542-jkb13xfiy3tno50n
2014-01-13 12:05:42 +01:00
Martin Trigaux
e0f4c59f11
[FIX] account: accounting periods in demo data are no longer opening periods, create a new period_0 as opening period
...
bzr revid: mat@openerp.com-20140113105555-nuefln1bajgwexpd
2014-01-13 11:55:55 +01:00