Christophe Matthieu
4724266802
[FIX] product: wrong product and supplierinfo demo data. Because product_id of product.supplierinfo is a product.template field and not a product.product field
...
bzr revid: chm@openerp.com-20131015125308-mzmq1p1nm1kfqd9g
2013-10-15 14:53:08 +02:00
Xavier Morel
705e34b7a7
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20131015111106-f6kaa0a5py3ph0xn
2013-10-15 13:11:06 +02:00
Fabien Meghazi
b475e002bb
[FIX] newest werkzeug.utils.escape() does not automatically __repr__
...
bzr revid: fme@openerp.com-20131015103028-2intnc38kzrqgrl3
2013-10-15 12:30:28 +02:00
Christophe Matthieu
d2108bf33c
[FIX] sale: change test because product's demo datas have changed
...
bzr revid: chm@openerp.com-20131015102133-s78olcy53ypu21c5
2013-10-15 12:21:33 +02:00
Xavier Morel
e0493cd6d4
[FIX] handling of single-line files sent for preview
...
bzr revid: xmo@openerp.com-20131015100313-sdgqx1t43922kgq8
2013-10-15 12:03:13 +02:00
Fabien Meghazi
c056f03a82
[FIX] main_objet is now always set in qweb rendering context
...
If no main_object is provided, the current ir.ui.view will be used
bzr revid: fme@openerp.com-20131015095413-ij6dt2rjo527sgga
2013-10-15 11:54:13 +02:00
Christophe Matthieu
c14134140d
[FIX] website: snippets banner: add contenteditable
...
bzr revid: chm@openerp.com-20131015095335-e9uik9ov1ghp22m4
2013-10-15 11:53:35 +02:00
Xavier Morel
f2feffe5e2
[FIX] backwards-compatible controller decorator not backwards-compatible at all, replace with @route
...
bzr revid: xmo@openerp.com-20131015095331-r2xm2198zrwax0c7
2013-10-15 11:53:31 +02:00
Xavier Morel
bd6efcfc14
[FIX] removal of session_id from params, may not be only in GET params
...
bzr revid: xmo@openerp.com-20131015095307-3m1gc71dt3zihm26
2013-10-15 11:53:07 +02:00
Christophe Matthieu
38286d850c
[IMP] website: snippets banner: now user can't remove the picture
...
bzr revid: chm@openerp.com-20131015095058-ci36cqfm06j9e15s
2013-10-15 11:50:58 +02:00
Christophe Matthieu
110d2d1386
[FIX] website_sale: forgotten files
...
bzr revid: chm@openerp.com-20131015094505-g0n3g48megu96kh0
2013-10-15 11:45:05 +02:00
Xavier Morel
5e9dd279c1
[IMP] sensible implementation of set_request
...
bzr revid: xmo@openerp.com-20131015094216-sgsfukzndfpu8kss
2013-10-15 11:42:16 +02:00
Christophe Matthieu
5dd919e930
[IMP] website_sale: replace sql search by openerp domain for attributes searching
...
bzr revid: chm@openerp.com-20131015093350-a4irzeqiwpn55gh4
2013-10-15 11:33:50 +02:00
Xavier Morel
96f30d058f
[REM] useless leftover crap
...
bzr revid: xmo@openerp.com-20131015093114-15a2jsmsbveqxuw4
2013-10-15 11:31:14 +02:00
Christophe Matthieu
5f7cbf6ad5
[FIX] account_anglo_saxon: inherit view of product use field and not xpath.
...
bzr revid: chm@openerp.com-20131015085537-dv70k245v01crptn
2013-10-15 10:55:37 +02:00
Christophe Matthieu
03b360e19f
[FIX] website_sale: search by facets/attributes and category
...
bzr revid: chm@openerp.com-20131015083331-gypew1z1sb4m9jzt
2013-10-15 10:33:31 +02:00
Christophe Matthieu
f06566baa1
[IMP] website_sale: remove some args in t-keep-query xml attr
...
bzr revid: chm@openerp.com-20131015083010-sxslddq0l8hk174g
2013-10-15 10:30:10 +02:00
Christophe Matthieu
e6a831a1a2
[IMP] website: add facets/attributes on product template. Displayed in the left category menu in the ecommerce
...
bzr revid: chm@openerp.com-20131015082726-6f1tkyhoaju27p85
2013-10-15 10:27:26 +02:00
5cfe4038f1
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131015044114-anr45am6g1a3h0gg
2013-10-15 04:41:14 +00:00
Antony Lesuisse
c195532185
[FIX] debian deps, recommend antiword and python-gevent
...
bzr revid: al@openerp.com-20131015015800-68pcdv8fg573gi44
2013-10-15 03:58:00 +02:00
Antony Lesuisse
ff9e439733
[FIX] fcntl not needed on windows
...
bzr revid: al@openerp.com-20131015013700-eo0y09ft0p3w0fwe
2013-10-15 03:37:00 +02:00
ddm
2688f258fb
[FIX] Lint errors
...
bzr revid: ddm@openerp.com-20131014161237-1sqv23gd6w0ok81e
2013-10-14 18:12:37 +02:00
ddm
64c1ab7f1c
[FIX] Repair tour
...
bzr revid: ddm@openerp.com-20131014155359-3nrggycvuss0fcvp
2013-10-14 17:53:59 +02:00
Fabien Meghazi
62d4dee992
[FIX] website_meta_*
...
bzr revid: fme@openerp.com-20131014153815-ncmzwgxx5u0xwpeb
2013-10-14 17:38:15 +02:00
Martin Trigaux
74cbd7978f
[IMP] base_setup: improve custom font selection (requires server revision 4971)
...
bzr revid: mat@openerp.com-20131014151928-hz364mginrmbck7n
2013-10-14 17:19:28 +02:00
Martin Trigaux
1d59e6f784
[IMP] fonts: improvement of custom font intergration in rml reports
...
creation of model res.font
preload font list with basic pdf fonts for performances improvements
add 'reload fonts' on view to scan the filesystem
font selection is a simple on2many
bzr revid: mat@openerp.com-20131014151906-racz1lm0arw6ahfk
2013-10-14 17:19:06 +02:00
Fabien Meghazi
853cb1dd26
[MERGE] SEO meta data persistence. New template title handling
...
bzr revid: fme@openerp.com-20131014151509-6bnux7ncvqmy3tea
2013-10-14 17:15:09 +02:00
Fabien Meghazi
03f9e595f9
[REM] console.log
...
bzr revid: fme@openerp.com-20131014151354-hoodridrctgyzavv
2013-10-14 17:13:54 +02:00
Fabien Meghazi
fa66a101b8
[ADD] website#url_for() support for keep_query
...
bzr revid: fme@openerp.com-20131014151016-f6xsqxenbs5ph5ey
2013-10-14 17:10:16 +02:00
Martin Trigaux
554093ae86
[IMP] base_setup: better view for fonts
...
bzr revid: mat@openerp.com-20131014150724-820j9wcduapbzrpz
2013-10-14 17:07:24 +02:00
Martin Trigaux
b9c3d93416
[IMP] font: handle better the difference of fonts
...
bzr revid: mat@openerp.com-20131014150507-4ueuyyneo6h2f6ju
2013-10-14 17:05:07 +02:00
Martin Trigaux
3bc24a9f3b
[FIX] font: correct action for reloading
...
bzr revid: mat@openerp.com-20131014145339-p1uz9iwfyf3uhyhr
2013-10-14 16:53:39 +02:00
ddm
a71007e05d
[FIX] Serialize SEO metadata
...
bzr revid: ddm@openerp.com-20131014143119-7bpjk0i989v5x8vl
2013-10-14 16:31:19 +02:00
Fabien Meghazi
e4edd08ad8
[IMP] Do not use main_object#name field, use website_meta_* fields
...
bzr revid: fme@openerp.com-20131014135647-3otn3b6q4gy3olwg
2013-10-14 15:56:47 +02:00
Martin Trigaux
53e8625cea
[FIX] font: cleaning and better default data
...
bzr revid: mat@openerp.com-20131014123815-6tnegdiv4cnaimtf
2013-10-14 14:38:15 +02:00
Xavier Morel
5c75678f94
[FIX] broken merge hidden by leftover pyc file
...
bzr revid: xmo@openerp.com-20131014121319-ry0s5tnpz5f21aw0
2013-10-14 14:13:19 +02:00
Xavier Morel
a3c11bedb8
[IMP] mitigate disappearance of empty inline cke widgets
...
bzr revid: xmo@openerp.com-20131014112644-f95lqkr6j2nlm98a
2013-10-14 13:26:44 +02:00
Martin Trigaux
59efdc209a
[FIX] base_setup: correctly handle new font value
...
bzr revid: mat@openerp.com-20131014103308-jynnbs2cy0nsehhn
2013-10-14 12:33:08 +02:00
Martin Trigaux
3798b1ed96
[IMP] better labels
...
bzr revid: mat@openerp.com-20131014101523-bwb4lda2rxbqpb8a
2013-10-14 12:15:23 +02:00
Martin Trigaux
b94140f6c9
[IMP] better labels
...
bzr revid: mat@openerp.com-20131014101503-lfge6qnfioepu22x
2013-10-14 12:15:03 +02:00
Martin Trigaux
4328f8253a
[MERGE] sync with trunk
...
bzr revid: mat@openerp.com-20131014101423-bvb7sr45rt7890aa
2013-10-14 12:14:23 +02:00
Xavier Morel
c81bf938cf
[FIX] don't close editor dialogs on click *around* the dialog
...
APR double-clicks images in the image sub-popup (browse existing), if
an image on a side (outside the initial dialog's rect) is picked the
first click will select it and close the dialog, and the second one
will land on the base dialog's backdrop, cancelling & closing it.
bzr revid: xmo@openerp.com-20131014100944-3xtbiyj063fmzhko
2013-10-14 12:09:44 +02:00
Xavier Morel
804f879518
[MERGE] new fields & field conversions in CMS
...
bzr revid: xmo@openerp.com-20131014100222-v73qz8dbrurc2eoq
2013-10-14 12:02:22 +02:00
Xavier Morel
2cdaa44b9e
[FIX] wrong end tag during merge
...
bzr revid: xmo@openerp.com-20131014095820-njd1v48lgljrj2q0
2013-10-14 11:58:20 +02:00
Fabien Meghazi
631b1cbc09
[MERGE] upstream
...
bzr revid: fme@openerp.com-20131014095642-qxl7ceqptfsj215l
2013-10-14 11:56:42 +02:00
Martin Trigaux
b3a8a4493d
[IMP] fonts: adapt fonts to many2one instead of list
...
bzr revid: mat@openerp.com-20131014094122-6ndc5scni2xyzksy
2013-10-14 11:41:22 +02:00
Martin Trigaux
81e03814e8
[IMP] base_setup: adapt fonts to many2one instead of list
...
bzr revid: mat@openerp.com-20131014094025-05989gbpdghu2rwt
2013-10-14 11:40:25 +02:00
Xavier Morel
ec8ea76a0e
[FIX] QWebContext necessary in some tests
...
bzr revid: xmo@openerp.com-20131014093713-2hawn717pby32pgw
2013-10-14 11:37:13 +02:00
Xavier Morel
2e352ce187
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20131014085459-dhbypq0hg3lzzf3j
2013-10-14 10:54:59 +02:00
Thibault Delavallée
000870508f
[MOV] website_hr_recruitment: new module organization
...
bzr revid: tde@openerp.com-20131014084150-gdk360aytm0wc043
2013-10-14 10:41:50 +02:00
Christophe Matthieu