Martin Trigaux
16293621dd
[MERGE] [FIX] report: Skip register reports that have xsl but no xml
...
bzr revid: mat@openerp.com-20130911092947-4gy77vtgddpk1odh
2013-09-11 09:29:47 +00:00
DBR (OpenERP)
6f44a53ca8
[IMP] Add condition
...
bzr revid: dbr@tinyerp.com-20130911090855-98upgcnn57bbx63y
2013-09-11 14:38:55 +05:30
ajay javiya (OpenERP)
a83eaf8413
[MERGE]: with trunk
...
bzr revid: rgaopenerp-20130906121341-kpt6wua2msig28f9
bzr revid: aja@tinyerp.com-20130911085322-kka2cltcpm002yxp
2013-09-11 14:23:22 +05:30
Xavier Morel
f7a14f2830
[HIDE] issue with ckeditor not handling block-level links
...
Instead of keeping them where they are, ckeditor propagates links to
closest inline elements (as pre-HTML5 parsing did), which breaks
e.g. product headers.
bzr revid: xmo@openerp.com-20130911084305-b5v36wlni620m7r3
2013-09-11 10:43:05 +02:00
Dharmraj Zala (OpenERP Trainee)
4bd0540505
[IMP] added a global method for getting system font list
...
bzr revid: dizzy.zala@gmail.com-20130911064104-6umza2px5v4oltk2
2013-09-11 12:11:04 +05:30
Dharmraj Zala (OpenERP Trainee)
6efdf7615c
[IMP] called method from server to get a list of system fonts
...
bzr revid: dizzy.zala@gmail.com-20130911063210-b271n7eaq3gnup77
2013-09-11 12:02:10 +05:30
c1ee146f7b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130911051946-7al2yclyqfsdurml
2013-09-11 05:19:46 +00:00
ddm
41eeecee5a
[FIX] Ace editor cleanup + bugfixes
...
bzr revid: ddm@openerp.com-20130910221154-y9i1w1omib1bp01o
2013-09-11 00:11:54 +02:00
Fabien Pinckaers
f80717d3e5
[UNDO] revert change as snippets moved to client side
...
bzr revid: fp@tinyerp.com-20130910154024-qc1h6ha7hmocu2fj
2013-09-10 17:40:24 +02:00
Thibault Delavallée
128d7f39c8
[IMP] mass_mailing: using delivered instead of bounced in kanban views
...
bzr revid: tde@openerp.com-20130910152933-3xb34l0xyhj9yh21
2013-09-10 17:29:33 +02:00
Thibault Delavallée
ce8c987089
[IMP] mail, email_template, mass_mailing: improvev mass mailing management in mail.compose.message + form view cleanings + some fixes in mail_mail about set_opened/replied/bounced, now checking that ids effectively exist
...
bzr revid: tde@openerp.com-20130910151901-nhuwvtrkbwekyh7x
2013-09-10 17:19:01 +02:00
Thibault Delavallée
2982257521
[IMP] mail: added catchall and bounce aliases to config
...
bzr revid: tde@openerp.com-20130910151822-jg78ff0fojjqdiwj
2013-09-10 17:18:22 +02:00
ddm
95a9983f66
[IMP] XML autoformat
...
bzr revid: ddm@openerp.com-20130910151249-vxn5vm0dewytngzn
2013-09-10 17:12:49 +02:00
ddm
2096516514
[IMP] Integrate Ace editor for XML views
...
bzr revid: ddm@openerp.com-20130910145445-li6jqjm8e00w9f88
2013-09-10 16:54:45 +02:00
Olivier Dony
b24e37db63
[FIX] ir.mail_server: be more lenient when validating From address
...
When a user has their email as name, the system will
construct the From header as "email<email>".
We previously forbade this, because the naive
check only counts the number of emails in
the From header.
We might need to drop that assert or implement
something better in the future.
bzr revid: odo@openerp.com-20130910143809-wu32dkz20es579nv
2013-09-10 16:38:09 +02:00
Xavier Morel
29707bb8bf
[FIX] don't lose text following a node being transformed back into a t-field
...
bzr revid: xmo@openerp.com-20130910143406-nuzu8vz5rzmshnzc
2013-09-10 16:34:06 +02:00
Xavier Morel
5bd3396023
[TEMP] embed original expression in output to reverse correctly
...
bzr revid: xmo@openerp.com-20130910143345-es9vbvxlfq5sra6h
2013-09-10 16:33:45 +02:00
Fabien Meghazi
c4a39548b2
[IMP] better name for global rendering variables
...
bzr revid: fme@openerp.com-20130910141502-ptz2vj1jckvh7urq
2013-09-10 16:15:02 +02:00
ddm
54b461b4a3
Merged trunk-website-ace-ddm
...
bzr revid: ddm@openerp.com-20130910135801-wlp5u4zvna2q5228
2013-09-10 15:58:01 +02:00
ddm
7b2d8017b2
[IMP] Basic XML verification
...
bzr revid: ddm@openerp.com-20130910135544-9i9xr52uq0um17y3
2013-09-10 15:55:44 +02:00
Xavier Morel
59734d3e34
[FIX] no need to use types for builtins (also fixes broken import, oops)
...
bzr revid: xmo@openerp.com-20130910134402-1fj37o3pxtb4hrau
2013-09-10 15:44:02 +02:00
Fabien Meghazi
0e82448ed8
[IMP] Refactor code + WIP multiwebsite
...
bzr revid: fme@openerp.com-20130910134133-esdgbhbtt8eguapk
2013-09-10 15:41:33 +02:00
Fabien Pinckaers
ccb00ddf77
[IMP] Snippets Categories + Jumbotron
...
bzr revid: fp@tinyerp.com-20130910134011-h6kss8dx5g16xphc
2013-09-10 15:40:11 +02:00
Xavier Morel
857e7a4f56
[FIX] make product prices editable (kinda-sorta)
...
bzr revid: xmo@openerp.com-20130910133123-h0dnnu076a0zeftw
2013-09-10 15:31:23 +02:00
Xavier Morel
7e6f1a104e
[ADD] move view.save tests from server
...
bzr revid: xmo@openerp.com-20130910133055-75q72gd75sty317m
2013-09-10 15:30:55 +02:00
Xavier Morel
85a3d8eaeb
[FIX] moved view.save to website, forgot to move tests
...
bzr revid: xmo@openerp.com-20130910132638-2v4ilmi5uuboazt9
2013-09-10 15:26:38 +02:00
DBR (OpenERP)
d0923892c2
[IMP]Improve code
...
bzr revid: dbr@tinyerp.com-20130910132523-5xbkmrn1gss7p2tv
2013-09-10 18:55:23 +05:30
DBR (OpenERP)
1339e24226
[IMP] Label name improve
...
bzr revid: dbr@tinyerp.com-20130910131704-mawfghrz42jow31r
2013-09-10 18:47:04 +05:30
DBR (OpenERP)
efc8bb37a9
[IMP]Improve code for crm also
...
bzr revid: dbr@tinyerp.com-20130910131205-39cwpiik2ncs6wcn
2013-09-10 18:42:05 +05:30
Xavier Morel
420a65cdad
[IMP] remove unneeded import, cases redundancy
...
bzr revid: xmo@openerp.com-20130910125015-75tjdv1eopipwk4m
2013-09-10 14:50:15 +02:00
Christophe Simonis
3fa90321e1
[MERGE] forward port of branch saas-1 up to revid 8772 chs@openerp.com-20130910122113-171osvcukxffxcry
...
bzr revid: chs@openerp.com-20130910124803-wxkb8gkz1tub5qjf
2013-09-10 14:48:03 +02:00
Thibault Delavallée
c063f54691
[IMP] mail: in mass mail mode, default value is now to send emails, not to perform a mass post on documents.
...
bzr revid: tde@openerp.com-20130910124754-jssus6l43nil4qad
2013-09-10 14:47:54 +02:00
Xavier Morel
21ae2e059a
[REM] noop
...
bzr revid: xmo@openerp.com-20130910124731-dx2hygjm6ixkw81j
2013-09-10 14:47:31 +02:00
Christophe Matthieu
9693c18da2
[FIX] website.snippet: don't call snippet if the thumbnail is not dropped inside a drop zone
...
bzr revid: chm@openerp.com-20130910123101-ixosjev7tcx08g1z
2013-09-10 14:31:01 +02:00
Christophe Matthieu
f61e65539e
[IMP] website: auto open editor when create new product (use ?unable_editor in url)
...
bzr revid: chm@openerp.com-20130910122646-ug8dn61rqgbm3eq3
2013-09-10 14:26:46 +02:00
Christophe Simonis
4327e09a55
[MERGE] forward port of branch saas-1 up to revid 4903 dle@openerp.com-20130909170248-a4t5y6qd5ikkhhac
...
bzr revid: chs@openerp.com-20130910121230-xcr2yj6rpbo83wy0
2013-09-10 14:12:30 +02:00
Thibault Delavallée
43bfef6918
[FIX] mass_mailing: fixed sparkline computation for opened and replied emails, using dates and group_by; fixed demo data
...
bzr revid: tde@openerp.com-20130910121123-uu4hplm91xb5aexi
2013-09-10 14:11:23 +02:00
Christophe Matthieu
cb8bdad1ec
[FIX] website_sale: reduce qty
...
bzr revid: chm@openerp.com-20130910115159-qdmhi4rdmxqz5cm3
2013-09-10 13:51:59 +02:00
ddm
3ee7b343dc
[FIX] Ace editor size
...
bzr revid: ddm@openerp.com-20130910112439-0d5aoddbxa29asf6
2013-09-10 13:24:39 +02:00
Thibault Delavallée
a89547aab6
[FIX] mass_mailing: forgotten brackets
...
bzr revid: tde@openerp.com-20130910110104-a0pr7q06k3i1lv6h
2013-09-10 13:01:04 +02:00
ddm
969d8fa32e
[IMP] Improve XML display
...
bzr revid: ddm@openerp.com-20130910105113-2x0r1fls6hcln9m4
2013-09-10 12:51:13 +02:00
Thibault Delavallée
316ce91243
[IMP] mass_mailing
...
Added delivered field, number of delivered emails
Improved kanban view of mass mailing campaign
Improved statistics of segments, now daily instead of monthly
bzr revid: tde@openerp.com-20130910104623-7ljg0q9pebbcqk7m
2013-09-10 12:46:23 +02:00
Thibault Delavallée
aca5e76062
[IMP] orm: first draft of improvign group_by on date field, allowing to tune the grain, format and interval when grouping on a date field. Default behavior is the old one, grouping on month.
...
bzr revid: tde@openerp.com-20130910104500-sfjosqkmpfxa2jxk
2013-09-10 12:45:00 +02:00
Xavier Morel
8bb10bdf67
[FIX] incorrect conversion of some fields transmogrification in template tag
...
bzr revid: xmo@openerp.com-20130910103526-r9q98zirvmiylr69
2013-09-10 12:35:26 +02:00
ddm
a5e1ed7800
Merged trunk-website-al
...
bzr revid: ddm@openerp.com-20130910103353-j5sbly1v6m93qiel
2013-09-10 12:33:53 +02:00
Christophe Matthieu
45727ab601
[IMP] website snippet editor: add some comments
...
bzr revid: chm@openerp.com-20130910102140-sr5jxwme0uvvyjul
2013-09-10 12:21:40 +02:00
ddm
c4f52f12cd
[FIX] Proper editing undo
...
bzr revid: ddm@openerp.com-20130910101822-4pb6q6zq9dbho5h1
2013-09-10 12:18:22 +02:00
Christophe Matthieu
4bed245c08
[MERGE] from website-fva: snippets editor and building block
...
bzr revid: chm@openerp.com-20130910100348-w9kxnxc9tavyanqt
2013-09-10 12:03:48 +02:00
Christophe Matthieu
5a16088b0b
[MERGE] from website-al
...
bzr revid: chm@openerp.com-20130910100159-xs0d8zngz4ybl0y9
2013-09-10 12:01:59 +02:00
ddm
a109098cb7
[FIX] Proper editor sizing
...
bzr revid: ddm@openerp.com-20130910100127-98zjbitry2xhqld2
2013-09-10 12:01:27 +02:00
Martin Trigaux