ajay javiya (OpenERP)
b54833d392
[FIX] : change the cover and use an existing one, it is too big
...
bzr revid: aja@tinyerp.com-20140318130537-yst48p45st4n78bz
2014-03-18 18:35:37 +05:30
Thibault Delavallée
e2f29e66d8
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140318130452-3x7niq8irf0br1lu
2014-03-18 14:04:52 +01:00
Thibault Delavallée
aef967eefc
[IMP] mass_mailing :
...
- cleaned management of domains in contact lists, now having a method to compute the global domain
of several lists;
- added action to see the contacts of a mailing + contact number correctly counter
bzr revid: tde@openerp.com-20140318130428-8f4kp0ve2lf1rafe
2014-03-18 14:04:28 +01:00
1395c9ee0e
[IMP] website: snippet editor: change size automatic button into a cross between resize handler
...
bzr revid: chm@openerp.com-20140318130414-yb29wtm7oo4bammz
2014-03-18 14:04:14 +01:00
Sunil Sharma (OpenERP)
64ef5ce03f
[imp]:improeve demo tag and valid answer
...
bzr revid: sunilsharma.sharma07@gmail.com-20140318124130-9ykkk6g1c6ry7ysx
2014-03-18 18:11:30 +05:30
Christophe Simonis
8f8ca3bd84
[MERGE] forward port of branch saas-3 up to revid 5093 chs@openerp.com-20140318114540-l50kmo4azb57g31x
...
bzr revid: chs@openerp.com-20140318124112-cj65l3wysk2rhwlw
2014-03-18 13:41:12 +01:00
Christophe Simonis
a2f9619e26
[MERGE] forward port of branch saas-3 up to revid 3975 chs@openerp.com-20140318115516-sn3laxqseam1oz3f
...
bzr revid: chs@openerp.com-20140318124050-ul3reev0vvmgqxz8
2014-03-18 13:40:50 +01:00
5b722a036a
[PATCH] sle
...
bzr revid: chm@openerp.com-20140318123225-zgn83zslr65z0wej
2014-03-18 13:32:25 +01:00
bbca8bd17e
[PATCH] sle
...
bzr revid: chm@openerp.com-20140318122250-22bt2bcfzvxowkvf
2014-03-18 13:22:50 +01:00
Turkesh Patel (Open ERP)
603cc77da7
[MRG] merge with https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-website-forum-tpa-imp2-ssh , improved some comments
...
bzr revid: tpa@tinyerp.com-20140318120659-mn87lrd0ppcbt8t8
2014-03-18 17:36:59 +05:30
f9c68abfb5
[FIX] website_sale: test must inject tour
...
bzr revid: chm@openerp.com-20140318115631-aiifjcqmtubiofb0
2014-03-18 12:56:31 +01:00
Christophe Simonis
541a5d3f82
[MERGE] forward port of branch saas-2 up to revid 3904 chs@openerp.com-20140318112743-tqv492026y2pnbff
...
bzr revid: chs@openerp.com-20140318115516-sn3laxqseam1oz3f
2014-03-18 12:55:16 +01:00
Christophe Simonis
a7cdda3ba6
[MERGE] forward port of branch saas-2 up to revid 5021 chs@openerp.com-20140318105837-53vsx5g7fm517cuc
...
bzr revid: chs@openerp.com-20140318114540-l50kmo4azb57g31x
2014-03-18 12:45:40 +01:00
Christophe Simonis
acb010a985
[MERGE] forward port of branch 7.0 up to revid 4162 launchpad_translations_on_behalf_of_openerp-20140318062141-rdiqz2ptnz3qmxd0
...
bzr revid: chs@openerp.com-20140129095637-mbfz82r5pyz4dctc
bzr revid: dle@openerp.com-20140210140818-5mtk1qhheo219bm1
bzr revid: dle@openerp.com-20140214114445-krexrwm9o2nrxepk
bzr revid: mat@openerp.com-20140219111353-cxo860z7ctz7om30
bzr revid: dle@openerp.com-20140221120519-1pj3wc8kqgkr5uda
bzr revid: chs@openerp.com-20140318112743-tqv492026y2pnbff
2014-03-18 12:27:43 +01:00
Turkesh Patel (Open ERP)
6f9479252f
[IMP] improved editing of user profile.
...
bzr revid: tpa@tinyerp.com-20140318112050-bde1yiz9fp2y1oge
2014-03-18 16:50:50 +05:30
31893ce1bb
[FIX]
...
bzr revid: chm@openerp.com-20140318111830-pudmv5okc69lo8a5
2014-03-18 12:18:30 +01:00
f9579073fe
[FIX] website: color of Edit Master link for themes. CSS less specific
...
bzr revid: chm@openerp.com-20140318111442-mbrhrmtnwy3uxc5y
2014-03-18 12:14:42 +01:00
Sunil Sharma (OpenERP)
8615272b2c
[imp]:improve user vote tab
...
bzr revid: sunilsharma.sharma07@gmail.com-20140318111229-70nqzgul8d4y21e0
2014-03-18 16:42:29 +05:30
ajay javiya (OpenERP)
509588710d
[IMP][REM] : improve code and remove unwated changes
...
bzr revid: aja@tinyerp.com-20140318104723-zhw8h01tk6v46ev3
2014-03-18 16:17:23 +05:30
bc578bd6a7
[IMP] website_sale: activate tests
...
bzr revid: chm@openerp.com-20140318103014-bfjkkqka98tc3hmv
2014-03-18 11:30:14 +01:00
Thibault Delavallée
1a086bca82
[IMP] sidebar in list view: context should be the one of the dataset, allowing context propagation, not
...
void default context.
bzr revid: tde@openerp.com-20140318102501-pi6qcaz1zbu71tsh
2014-03-18 11:25:01 +01:00
abe8e7208e
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140318102102-ug0ny6q360i4o1e6
2014-03-18 11:21:02 +01:00
9d026e3fe3
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140318101822-w616am661x8shfkd
2014-03-18 11:18:22 +01:00
3624a3beb2
[IMP] website_mail: refactor follow button; add partner_id in session for public user
...
bzr revid: chm@openerp.com-20140318101505-4yivw8h5oujyhm9b
2014-03-18 11:15:05 +01:00
Thibault Delavallée
ada6d06f8e
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140318093756-3bq7b4n5va33b3l2
2014-03-18 10:37:56 +01:00
Paramjit Singh Sahota
5de677208c
[FIX] [saas-3/trunk] IE9: Bad display of the address on a contact attached to a company
...
lp bug: https://launchpad.net/bugs/1293523 fixed
bzr revid: psa@tinyerp.com-20140318093611-iis8wfuzgqclngnm
2014-03-18 15:06:11 +05:30
Thibault Delavallée
b987405134
[IMP] Sidebar: added a new section for the sidebar, the buttons section.
...
When having actions to display in the 'more' menu and if the action id is present
in the context, get the action out of the menu to display a specific red button.
This is used to highlight some specific action to do in a given flow. For example
when going to a list view from a button, with an action that should be the next
one to perform, it allows to display the button once at least one record is
selected.
bzr revid: tde@openerp.com-20140318092955-vym3d7xkl3mmf62i
2014-03-18 10:29:55 +01:00
Kersten Jeremy
77622d3b24
[FIX] Fix css which make unusable the option dropdown for unpublished product. When an user was hover on a product not published and was trying to go in submenu, he had lost cursor, because he was changing div due to opacoty little than 1.
...
bzr revid: jke@openerp.com-20140318092341-ncgb173y0xfiaj87
2014-03-18 10:23:41 +01:00
ajay javiya (OpenERP)
cabb51a511
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140318091606-ldmfo35uuhatebwt
2014-03-18 14:46:06 +05:30
Turkesh Patel (Open ERP)
3fc29404db
[IMP] improved code to fix error on creating new form from contents, allow user to delete own comments, there should be only one correct answer per question.
...
bzr revid: tpa@tinyerp.com-20140318090154-m8e20wtosxdnqnfy
2014-03-18 14:31:54 +05:30
Gery Debongnie
373cb908ca
[FIX] correctly handle the case where a 'stat button' has a string attribute (it needs to be displayed in a div instead of a span) (addon web)
...
bzr revid: ged@openerp.com-20140318085525-vllzeycht9841g41
2014-03-18 09:55:25 +01:00
ajay javiya (OpenERP)
f2b51c7b69
[FIX] : subscribe/unsubscribe button not work
...
[IMP]: layout
bzr revid: aja@tinyerp.com-20140318083559-jwc196mypc67p5x4
2014-03-18 14:05:59 +05:30
Richard Mathot (OpenERP)
39f3264e53
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140318075419-qkw5odjmgi58n0rj
2014-03-18 08:54:19 +01:00
Dharmraj Jhala (OpenERP)
3566b69374
[MERGE] with latest trunk addons
...
bzr revid: dizzy.zala@gmail.com-20140318065716-m8wxkwonpu7gpp3a
2014-03-18 12:27:16 +05:30
596cc96b7e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140318062135-gqvoka8hm41pe762
2014-03-18 06:21:35 +00:00
Turkesh Patel (Open ERP)
63f18d4af9
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20140318054255-3c32y4fnogjfb83v
2014-03-18 11:12:55 +05:30
Antony Lesuisse
ce1b0ad243
[FIX] ir_logging acl
...
bzr revid: al@openerp.com-20140318002954-3vc2wj6llc2017bu
2014-03-18 01:29:54 +01:00
Antony Lesuisse
0b7a673821
[MERGE] trunk
...
bzr revid: al@openerp.com-20140317223549-gyhpe8dkzaw0qe7z
2014-03-17 23:35:49 +01:00
Denis Ledoux
ea4e924208
[FIX] crm: remove the fact that the convert to opp button is hidden if the lead has probability 100: this is possible that you want to convert it anyway
...
bzr revid: dle@openerp.com-20140317172415-f5thfl78sxx2cb1z
2014-03-17 18:24:15 +01:00
Thibault Delavallée
93284177d8
[ADD] Added module mass_mailing_crm, that adds the lead and opportunities
...
as available for mass mailign campaigns.
bzr revid: tde@openerp.com-20140317171634-4ucthtbaw542ealj
2014-03-17 18:16:34 +01:00
Thibault Delavallée
9845285781
[IMP] mass_mailing: mailing_type -> mailing_model, because
...
this is basically a model. yay.
bzr revid: tde@openerp.com-20140317171612-lgnaojfadbkwowcw
2014-03-17 18:16:12 +01:00
Christophe Simonis
7887085631
[FIX] test_converter: force inherit_branding by passing the right context
...
bzr revid: chs@openerp.com-20140317170706-dkig0e31xtnrsskj
2014-03-17 18:07:06 +01:00
Thibault Delavallée
b4a5960e14
[REM] Dead code
...
bzr revid: tde@openerp.com-20140317165737-lr1vb8b5x27ykrq9
2014-03-17 17:57:37 +01:00
Thibault Delavallée
030941e192
[DEMO] mass_mailing: updated demo data, sent field new on mail mail stats updated
...
bzr revid: tde@openerp.com-20140317165713-gh87h9nvfvecm5y0
2014-03-17 17:57:13 +01:00
Thibault Delavallée
73a7dc58d1
[IMP] mass_mailing: improved campaign management in mass mailing wizard
...
- campaign appear only when having the group activated
- now choosing the mailing name, that create the mailing list + campaign
- currently limited to the valid models
bzr revid: tde@openerp.com-20140317165649-321f0wxatvj4pz5w
2014-03-17 17:56:49 +01:00
Thibault Delavallée
b0522b3b79
[ADD] mass_mailing: added forgotten init file
...
bzr revid: tde@openerp.com-20140317165418-28c33lzbfjnzerel
2014-03-17 17:54:18 +01:00
Denis Ledoux
112fe22347
[FIX] point_of_sale: prevent duplicated order posting
...
bzr revid: dle@openerp.com-20140317164131-eewyqmzz5niebz2a
2014-03-17 17:41:31 +01:00
Olivier Dony
f0d4240082
[FIX] http dispatch: make sure transaction rollback happens in all cases when request handling raised (to be refactored)
...
Not doing so leads to cases where a transaction is committed
even after failing to validate a Python constraint.
This patch attempts to keep the rollback() logic next to the
corresponding commit(), and makes the rollback() more
explicit even if close() without commit() would also rollback
implicitly.
bzr revid: odo@openerp.com-20140317163228-zqbce8f0rgcg0pt4
2014-03-17 17:32:28 +01:00
Thibault Delavallée
61f90f4581
[IMP] mass_mailing: campaign and mailing kanban view update
...
to match new specs, removed unnecessary CSS.
Also added a sent field on mail mail statistics, to be able to count the
number of really sent emails.
bzr revid: tde@openerp.com-20140317160919-7sx7ja28zaxid67t
2014-03-17 17:09:19 +01:00
Gery Debongnie
e8198d74b6
[IMP] various tweaks to stat_button, to fix issues mentioned in code review. This is mostly cosmetic cleanups, only notable change is that stat_button is now a proper html button instead of a label (addon web)
...
bzr revid: ged@openerp.com-20140317152710-c33q8kua33o001la
2014-03-17 16:27:10 +01:00
ajay javiya (OpenERP)