Frédéric van der Essen
5eac688ef0
[MERGE] from chm
...
bzr revid: fva@openerp.com-20121024152429-js4f1w6t4v4fz1zq
2012-10-24 17:24:29 +02:00
Frédéric van der Essen
8d9fdcc352
[IMP] mail: followers css + widget integration in inbox and formview
...
bzr revid: fva@openerp.com-20121024152043-q5j7hpa4rur39k03
2012-10-24 17:20:43 +02:00
Fabien Meghazi
d41a1ef8ce
[IMP] Reworked calendar
...
bzr revid: fme@openerp.com-20121024150605-2o5tnwtkdguhk78n
2012-10-24 17:06:05 +02:00
Antonin Bourguignon
b028e9e838
[IMP] clarify project's field 'parent_id' in form view
...
bzr revid: abo@openerp.com-20121024150217-enya29ut6t9lqylf
2012-10-24 17:02:17 +02:00
Christophe Matthieu
4f65723662
[IMP] mail: try to fix encodeURI for document loader
...
bzr revid: chm@openerp.com-20121024144350-yxf9ivj8rlmtx0eu
2012-10-24 16:43:50 +02:00
Christophe Matthieu
7b6cc50de7
[IMP] mail: filter has attachment
...
bzr revid: chm@openerp.com-20121024144135-frzyxty5iiksqtg4
2012-10-24 16:41:35 +02:00
Arnaud Pineux
0ac6c9eff2
[MERGE]Lunch_new application
...
bzr revid: api@openerp.com-20121024142025-ihjkfieq5tj829jw
2012-10-24 16:20:25 +02:00
Thibault Delavallée
b1122deb38
[IMP] mail: added _search override on mail_message, to filter the results of a search according to our custom rules. Added some tests.
...
bzr revid: tde@openerp.com-20121024141806-8iayf7cz2ndxyz2l
2012-10-24 16:18:06 +02:00
Christophe Matthieu
4ce75bb9bd
[IMP] mail: preview documents (doc, pdf...) on openchatter
...
bzr revid: chm@openerp.com-20121024140910-88gj3t5efhc7pzzi
2012-10-24 16:09:10 +02:00
Ronald Portier
2747e5bef2
[FIX] Correct both age based as count based vacuum cleaning.
...
lp bug: https://launchpad.net/bugs/1009014 fixed
bzr revid: ronald@therp.nl-20121024140119-hv72ffxmf1gvf2sj
2012-10-24 16:01:19 +02:00
Fabien Meghazi
b79406cb89
[WIP] Updated dhtmlx calendar
...
bzr revid: fme@openerp.com-20121024134859-pru7zenpiz0la8mq
2012-10-24 15:48:59 +02:00
Christophe Matthieu
fc34572ee3
[IMP] mail: preview image on openchatter
...
bzr revid: chm@openerp.com-20121024134819-5gf165nf6cc21601
2012-10-24 15:48:19 +02:00
Arnaud Pineux
ccdec6f158
[MERGE]Lunch_new application
...
bzr revid: api@openerp.com-20121024133918-qu0xha3fuaisc0va
2012-10-24 15:39:18 +02:00
Arnaud Pineux
e64b0baffa
[MERGE]Lunch_new application
...
bzr revid: api@openerp.com-20121024132530-qciwxt9d42451niv
2012-10-24 15:25:30 +02:00
Antonin Bourguignon
171000876f
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121024132243-m2hm6dhp206z6gk0
2012-10-24 15:22:43 +02:00
Arnaud Pineux
e2dcb40cb8
[MERGE]Lunch_new application
...
bzr revid: api@openerp.com-20121024131713-ur52t1em8822vfo3
2012-10-24 15:17:13 +02:00
Olivier Dony
21e48c3b96
[ADD] portal_sale: integrate payment acquirer options in sale.order forms
...
bzr revid: odo@openerp.com-20121024131647-hfqgjpftwgygx976
2012-10-24 15:16:47 +02:00
Olivier Dony
20c81b5e2f
[ADD] portal: added portal.payment.acquirer model
...
portal.payment.acquirer stores payment processor
options (formally called payment acquirers). Each
acquirer is just a name and an HTML form template,
used to render an HTML snippet that can be included
in views where a payment option should be displayed.
The aquirer model has a generic method for rendering
a complete block of HTML to be included in form views
directly (with matching CSS): render_payment_block().
This method takes a few parameters to figure out
the name/reference, amount, currency, etc. to pay.
bzr revid: odo@openerp.com-20121024131554-j01ucniecjmoz3jq
2012-10-24 15:15:54 +02:00
Fabien Pinckaers
93056efe99
[FIX] misc useability fixes
...
bzr revid: fp@tinyerp.com-20121024131518-jdyd4stnwozzkr8f
2012-10-24 15:15:18 +02:00
Quentin (OpenERP)
fb9af9f8bb
[FIX] sale_margin: error in yaml test
...
bzr revid: qdp-launchpad@openerp.com-20121024130925-k431qqhmpx5aok20
2012-10-24 15:09:25 +02:00
Arnaud Pineux
d73352a676
[MERGE]Lunch_new application
...
bzr revid: api@openerp.com-20121024130315-vbfrp648vt4rgj97
2012-10-24 15:03:15 +02:00
Olivier Dony
21b56902b7
[FIX] sale/edi: paypal payment should be possible as soon as SO is not draft
...
Most companies won't mind if customers pay too early.
Even if the amount is not 100% correct, it can be
adjusted later, and it's better than missing a
revenue opportunity.
bzr revid: odo@openerp.com-20121024125957-oo8r9zmazzdonhd7
2012-10-24 14:59:57 +02:00
Christophe Matthieu
69a2a3180a
[IMP] mail: name = Emails
...
bzr revid: chm@openerp.com-20121024125626-2iu172swotalm723
2012-10-24 14:56:26 +02:00
Olivier Dony
4c591fa606
[FIX] ir_attachment: fix regression when counting attachments (OPW 576295)
...
Cherry-pick forward-port of rev-id odo@openerp.com-20120816154020-5s6wbwfb5l2xsnyv
from 6.1. Fixes regression introduced by r.4069.
bzr revid: odo@openerp.com-20121024124709-28w8rh8xnelvuhwg
2012-10-24 14:47:09 +02:00
Christophe Matthieu
615b2bddbd
[MREGE] from trunk-openchatter-DOM-chm
...
bzr revid: chm@openerp.com-20121024122913-ykcy751u3a21tzd2
2012-10-24 14:29:13 +02:00
Christophe Matthieu
875b2ede23
[IMP] mail: use widget one2many_binary and value fix
...
bzr revid: chm@openerp.com-20121024122803-ihr421qcvnsd3cjz
2012-10-24 14:28:03 +02:00
Christophe Matthieu
9fe8d72078
[IMP] base: widget one2many_binary
...
bzr revid: chm@openerp.com-20121024122700-k1ycsuyejmh9gqc9
2012-10-24 14:27:00 +02:00
Quentin (OpenERP)
920d85d80c
[FIX] sale_margin: fixing yaml test
...
bzr revid: qdp-launchpad@openerp.com-20121024122357-6watcqo0as1xhn1g
2012-10-24 14:23:57 +02:00
Cedric Snauwaert
757328b2fe
[FIX]removed useless code in view as well as wizard class
...
bzr revid: csn@openerp.com-20121024121719-jp3wfyz2v7oaaxgr
2012-10-24 14:17:19 +02:00
Cedric Snauwaert
97654d6767
[ADD]help messages and correct a bug on vehicle kanban view when the car had no contract
...
bzr revid: csn@openerp.com-20121024115849-orxkd2pyctl1f2fz
2012-10-24 13:58:49 +02:00
Christophe Simonis
da27fd32e0
merge upstream
...
bzr revid: chs@openerp.com-20121024114929-dwn0esxvlobxqle4
2012-10-24 13:49:29 +02:00
Christophe Simonis
9dffee0522
merge upstream
...
bzr revid: chs@openerp.com-20121024114831-5eyxqxd7y066v30d
2012-10-24 13:48:31 +02:00
Fabien Pinckaers
11c0784d71
[IMP] hr_timesheet_sheet form view
...
bzr revid: fp@tinyerp.com-20121024113728-r3nx6p8c8q0mh64q
2012-10-24 13:37:28 +02:00
Fabien Meghazi
81e7d9ba3d
[WIP] calendar
...
bzr revid: fme@openerp.com-20121024112147-g1xthxqor7wxb3wu
2012-10-24 13:21:47 +02:00
Antony Lesuisse
aebe743964
[FIX] revert remove password fp merge
...
Overriding the reset password meachnism should be done in auth signup/reset password addons.
bzr revid: al@openerp.com-20121024111746-r94n1uqyb01a4x0m
2012-10-24 13:17:46 +02:00
Xavier Morel
1cf9b2a60d
[REM] test_support controller
...
bzr revid: xmo@openerp.com-20121024110146-bzuf19sfptew0dn0
2012-10-24 13:01:46 +02:00
Xavier Morel
b2e32b21fa
[FIX] base_import: dummy test file
...
bzr revid: xmo@openerp.com-20121024105612-84fb2gav0jpp2hkc
2012-10-24 12:56:12 +02:00
Xavier Morel
403d2ec6d1
[FIX] process: dependencies
...
bzr revid: xmo@openerp.com-20121024105548-tmcpidjteuf2uwei
2012-10-24 12:55:48 +02:00
Xavier Morel
124480d095
[FIX] reference to invalid and non-existant js file
...
bzr revid: xmo@openerp.com-20121024105531-c0uou49k828wc01t
2012-10-24 12:55:31 +02:00
Xavier Morel
f579cc927f
[FIX] files filtering when loading... stuff.
...
also, cleanup module file (remove extra imports, extra default key in manifest)
bzr revid: xmo@openerp.com-20121024105454-nqw9taxladjofz2v
2012-10-24 12:54:54 +02:00
Fabien Pinckaers
0445d740a7
[IMP] CSS import wizard
...
bzr revid: fp@tinyerp.com-20121024102915-dtfy3dc4ll0ewf90
2012-10-24 12:29:15 +02:00
Frédéric van der Essen
88ec875bbb
[MERGE] mail: css improvements and various fixes
...
bzr revid: fva@openerp.com-20121024100625-ttvvc0knirfctza8
2012-10-24 12:06:25 +02:00
Frédéric van der Essen
7a507ea93e
[FIX] mail: show compose in form comments
...
bzr revid: fva@openerp.com-20121024100518-ocqiyyo4wxzqaosc
2012-10-24 12:05:18 +02:00
Paulius Sladkevičius
d9c7febf49
Fixed sorting for m2o
...
bzr revid: paulius@hacbee.com-20121024100321-tqjm4pyk9y392qur
2012-10-24 13:03:21 +03:00
92528bd510
[IMP]Vehicles list in dashboard now in kanban view
...
bzr revid: dle@openerp.com-20121024095510-hzmfg1gjcfr5sazs
2012-10-24 11:55:10 +02:00
Frédéric van der Essen
de99d4a7f7
[MERGE] from chm
...
bzr revid: fva@openerp.com-20121024095015-9wa4n5br1ps1ijc4
2012-10-24 11:50:15 +02:00
Christophe Matthieu
bc93c031d1
[MREGE] from trunk-mail-uploader-chm
...
bzr revid: chm@openerp.com-20121024094526-4gyzp7bjlalxze95
2012-10-24 11:45:26 +02:00
Frédéric van der Essen
502fa126a7
[IMP] mail widget is now inline-block
...
bzr revid: fva@openerp.com-20121024094506-zy79cj8bai4t5zes
2012-10-24 11:45:06 +02:00
Thibault Delavallée
f42c927992
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20121024093211-gu2d17wbp5cdthap
2012-10-24 11:32:11 +02:00
Christophe Matthieu
fbd53c418e
[IMP] view_form: suppress wrong console.log
...
bzr revid: chm@openerp.com-20121024092542-q9aogx9sefb65jr1
2012-10-24 11:25:42 +02:00
Frédéric van der Essen