Christophe Simonis
7a7d7febf8
[MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
...
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
Olivier Dony
96b9d8b9d5
[FIX] mass_mailing: avoid using werkzeug API only present in 0.9+
...
bzr revid: odo@openerp.com-20140424131451-rhtokro13piol7ji
2014-04-24 15:14:51 +02:00
Olivier Dony
3ad6d69b21
[FIX] website: avoid using werkzeug API only present in 0.9+
...
bzr revid: odo@openerp.com-20140424131415-ot0r5062wndvuicr
2014-04-24 15:14:15 +02:00
Christophe Simonis
c16780df83
[MERGE] forward port of branch saas-3 up to revid 5120 chs@openerp.com-20140424125338-26k5atvtqwmmfv4e
...
bzr revid: chs@openerp.com-20140424131405-4oannh1102x42m8b
2014-04-24 15:14:05 +02:00
Christophe Simonis
e59aecca94
[MERGE] forward port of branch 7.0 up to revid 5288 mat@openerp.com-20140423150215-578nzug1glccvpwy
...
bzr revid: chs@openerp.com-20140424125338-26k5atvtqwmmfv4e
2014-04-24 14:53:38 +02:00
Christophe Simonis
52cfc16c2e
[MERGE] forward port of branch 7.0 up to revid 10012 launchpad_translations_on_behalf_of_openerp-20140424063249-gwnojb5kvlq544nz
...
bzr revid: chs@openerp.com-20140424123538-rxk9got9k2on1ki1
2014-04-24 14:35:38 +02:00
Kersten Jeremy
7994fe09a3
[FIX] Calendar - only try to split the virtual id if it's a string
...
bzr revid: jke@openerp.com-20140424121118-t5rgqssf7mnr6bax
2014-04-24 14:11:18 +02:00
Martin Trigaux
f73907587b
[FIX] gamification: do not set a start_date by default as the cron starts past challenges (making data challenge to start) and avoid useless write
...
bzr revid: mat@openerp.com-20140424110341-pnu79q44m7gzl8t0
2014-04-24 13:03:41 +02:00
Thibault Delavallée
ca63094542
[MERGE] [FIX] email_template: effectively support 'user signature'
...
in the mail composer when using templates.
bzr revid: tde@openerp.com-20140424102801-j1qbqdvbyo9wv48e
2014-04-24 12:28:01 +02:00
Kersten Jeremy
1a4177d777
[FIX] Calendar - Override _name_search to convert virtual_id to real_id
...
bzr revid: jke@openerp.com-20140424101036-1twaii8oj70e4fx5
2014-04-24 12:10:36 +02:00
Stephane Wirtel
2ce61258ad
[FIX] Importing dateutil.relativedelta.relativedelta
...
bzr revid: stw@openerp.com-20140424092828-j8l6j1re9sa94m85
2014-04-24 11:28:28 +02:00
Thibault Delavallée
3d78f4a17e
[FIX] email_template: fixed a test not checking signature but
...
using a template adding signature.
bzr revid: tde@openerp.com-20140424082622-71ratcz4xrdn8d7t
2014-04-24 10:26:22 +02:00
Launchpad Translations on behalf of openerp
c7565cd540
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140424063249-gwnojb5kvlq544nz
2014-04-24 06:32:49 +00:00
Antony Lesuisse
56d2df71d3
[FIX] ir.ui.view missing time libraries in qweb rendering context
...
bzr revid: al@openerp.com-20140423162827-zw1fjysgkshgamwa
2014-04-23 18:28:27 +02:00
Simon Lejeune
cd016e385c
[FIX] res_company view: usability improvements on report configuration
...
bzr revid: sle@openerp.com-20140423162739-n050df7bh4acs2xi
2014-04-23 18:27:39 +02:00
Simon Lejeune
7edbd315da
[FIX] Report: usability fixes + use only custom footer if set, sale_layout: usability fixes + remove constraint on deletion
...
bzr revid: sle@openerp.com-20140423162614-wrofm5684shscyd3
2014-04-23 18:26:14 +02:00
Simon Lejeune
af30e6b5d3
[MERGE] saas-4
...
bzr revid: sle@openerp.com-20140423161155-im8b5j0l7avrgbts
2014-04-23 18:11:55 +02:00
Simon Lejeune
825848ba12
[MERGE] saas-4
...
bzr revid: sle@openerp.com-20140423160802-2kngtsa0zgkkegqx
2014-04-23 18:08:02 +02:00
Thibault Delavallée
0ae0b643d1
[REM] Removed print statement
...
bzr revid: tde@openerp.com-20140423153008-jngdjm0qx7cgqctu
2014-04-23 17:30:08 +02:00
Thibault Delavallée
549da11e40
[FIX] email_template: when usign the composer in mass mailing mode with
...
a template, display the user's signature if asked by the template. The use will
then be able to modify the generated content and to remove / update it if necessary;
Otherwise the signature is not added in mass mailing mode, because the content
of the email is based on the wizard's body, not the template one.
Some rewriting in the onchange: now using a browse instead of a read.
bzr revid: tde@openerp.com-20140423152926-sno0gk8lup9l442p
2014-04-23 17:29:26 +02:00
Simon Lejeune
a17bb46b44
[FIX] Sale_layout: renamed 'layout category' as 'section', removed constraint
...
bzr revid: sle@openerp.com-20140423151546-rd8freqn1ljf141k
2014-04-23 17:15:46 +02:00
Martin Trigaux
acc784cc99
[FIX] stock: pass the geven limit attribute in read_group call, courtesy of Guewen Baconnier
...
bzr revid: mat@openerp.com-20140423150621-rjiae83nxh5tqyau
2014-04-23 17:06:21 +02:00
Martin Trigaux
91bf583b1c
[FIX] amount_to_text: make sure accented string is in unicode
...
bzr revid: mat@openerp.com-20140423150215-578nzug1glccvpwy
2014-04-23 17:02:15 +02:00
Christophe Simonis
156225f9ea
[IMP] do not fail if cannot delete the pidfile. It may have a race-condition when in multi-workers.
...
bzr revid: chs@openerp.com-20140423150117-nyt16snzwvey2vz4
2014-04-23 17:01:17 +02:00
Christophe Simonis
981f683f0f
[FIX] ir.ui.view: when post-validating views of a module, only validate updated views (left out old views that will be deleted at the end of the update)
...
bzr revid: chs@openerp.com-20140423145639-whfipjobbxgfzqvx
2014-04-23 16:56:39 +02:00
Simon Lejeune
0ed42faa61
[FIX] sale_layout: place layout category when opening order line in target new
...
bzr revid: sle@openerp.com-20140423145313-55tn0xqmxgzg8uyt
2014-04-23 16:53:13 +02:00
Thibault Delavallée
252be1b9ab
[FIX] website_forum: various fixes and usability improvements
...
- question title is now a link
- fixed a crash when trying to see badges in the 'new badge' notification
- improved the tags manager: manage tag at blur event (otherwise the last tag
was ften not created) + manage already-existing tags
bzr revid: tde@openerp.com-20140423142034-5si58h4jgd1jyyem
2014-04-23 16:20:34 +02:00
Simon Lejeune
f340fc33ea
[MERGE] saas-4
...
bzr revid: sle@openerp.com-20140423141323-8rlqxuovo720hbyg
2014-04-23 16:13:23 +02:00
Simon Lejeune
acd3c99ddf
[FIX] Sale_layout: moved the sale category inside the form and after the product, not before
...
bzr revid: sle@openerp.com-20140423141225-55qdtykoohb4uh06
2014-04-23 16:12:25 +02:00
Richard Mathot (OpenERP)
f53ecc076a
[MERGE][IMP] Usability of event and event_sale
...
bzr revid: rim@openerp.com-20140423140752-6hw7rjdc4k7zxvbr
2014-04-23 16:07:52 +02:00
Richard Mathot (OpenERP)
11680fd1f7
[IMP] Usability of event and event_sale
...
bzr revid: rim@openerp.com-20140423133917-zpulvflwflgz12sw
2014-04-23 15:39:17 +02:00
Simon Lejeune
85c32739d9
[FIX] report_webkit: moved configuration to the report tab of company form and moved menuitem under 'Reports' menuitem
...
bzr revid: sle@openerp.com-20140423132927-3n5xv62zck6nyh2m
2014-04-23 15:29:27 +02:00
Simon Lejeune
d65b9c5e4c
[FIX] report: correct xpath to select paper format in the company form
...
bzr revid: sle@openerp.com-20140423132805-a5kdtvu052hdzbrr
2014-04-23 15:28:05 +02:00
Simon Lejeune
e3d7d2d7f5
[FIX] res_company view: improve usability of report configuration by hiding the rml fields without technical features
...
bzr revid: sle@openerp.com-20140423132635-ew4i2yu8xfxa1qls
2014-04-23 15:26:35 +02:00
Martin Trigaux
f613774606
[MERGE] [FIX] stock: fix error when executing a read_group on stock.picking.in and out, courtesy of Yannick Vaucher (Camptocamp)
...
bzr revid: mat@openerp.com-20140423132552-hpnr2skutqranvsj
2014-04-23 15:25:52 +02:00
Christophe Simonis
9ed196bc81
[FIX] report: set a default paperformat for companies, based on rml paperformat
...
bzr revid: chs@openerp.com-20140423132100-t6lmyd8qymoo4wqq
2014-04-23 15:21:00 +02:00
Martin Trigaux
901bb47235
[MERGE] [IMP] mail sanitizer: do not remove comments in html body when cleaning (and do not remove too many content) (opw 605315)
...
bzr revid: mat@openerp.com-20140423131919-q3vbw12tokglwdsq
2014-04-23 15:19:19 +02:00
Cedric Snauwaert
1b594f5cce
[FIX]while everything is not adaptative, leave overflow-y on modal body
...
bzr revid: csn@openerp.com-20140423131548-7hyo9eei2d2z99zc
2014-04-23 15:15:48 +02:00
Simon Lejeune
7088ddc3be
[FIX] report footer: hide footer from external layout if a custom footer is set; use company.website instead of request.website.name
...
bzr revid: sle@openerp.com-20140423125104-38mrhuov0snti7js
2014-04-23 14:51:04 +02:00
Denis Ledoux
966a818aa6
[FIX] hr_timesheet_sheet: allow writing attendance line not according to the date order, and check that the attendances satisfy the alternance constraint, even for delete operations
...
lp bug: https://launchpad.net/bugs/1180773 fixed
bzr revid: dle@openerp.com-20140423112554-75bpk5k3viroqbh5
2014-04-23 13:25:54 +02:00
Martin Trigaux
a6797e68e6
[MERGE] [FIX] account_voucher: in recompute_voucher_lines, ensure the price value is not modified when computing the writeoff_amount.
...
Using the remaining amount for writeoff does not make sense as the amount is already in credit or debit lines.
This issue could be observed in the payment wizard where the execution of _compute_writeoff_amount (through onchange) would be a negative value at the first execution.
bzr revid: mat@openerp.com-20140423101847-s0efihzqe7jcdcps
2014-04-23 12:18:47 +02:00
Fabien Meghazi
679d278d25
[FIX] /web/login restore request.uid in case of authentication failure
...
bzr revid: fme@openerp.com-20140423100749-t4y4oi01tszn3z5a
2014-04-23 12:07:49 +02:00
Martin Trigaux
f43f406355
[MERGE] [FIX] procurement: default_get in orderpoint make a search instead of hardcoding a warehouse as it's possible te user do not have access to it (e.g. multicompany), courtesy of Romain Deheele(Camptocamp)
...
bzr revid: mat@openerp.com-20140423100324-6stypg5uapnl1s5f
2014-04-23 12:03:24 +02:00
Thibault Delavallée
b6d83483b2
[REV] event: partial revert of commit 9310. Icons on list/tree views removed
...
in event are back. The purpose of commit 9310 was to remove icons on filters
and in searches, not in other views.
bzr revid: tde@openerp.com-20140423094244-cphuvy93uv020vgw
2014-04-23 11:42:44 +02:00
Thibault Delavallée
48e9d255ae
[FIX] web: list view: fixed button behavior
...
- icon-like behavior is the default behavior
- text-based buttons (using btn_txt class) are used whenever no icon is given to the
button in a list view.
This way the previous behavior is always the default behavior, and the css modifications are
done only for the text-based buttons, avoiding side-effects.
bzr revid: tde@openerp.com-20140423094124-8zq3yysy616aowu2
2014-04-23 11:41:24 +02:00
Richard Mathot (OpenERP)
99f19ba562
[MERGE][FIX] survey: incorrect route + security rules
...
bzr revid: rim@openerp.com-20140423085703-kyv4z4dc35mmiama
2014-04-23 10:57:03 +02:00
Richard Mathot (OpenERP)
e53b07b12b
[FIX]
...
bzr revid: rim@openerp.com-20140423085404-rleqt5f9rznpbj0k
2014-04-23 10:54:04 +02:00
Richard Mathot (OpenERP)
35d50a7139
[FIX] add noupdate to survey security rules
...
bzr revid: rim@openerp.com-20140423085037-7wgp3hekne7hwnrl
2014-04-23 10:50:37 +02:00
Cedric Snauwaert
447fa873df
[FIX] Force zindex for elements which should be at top of a modal window.
...
bzr revid: jke@openerp.com-20140423081914-anmpeae40z7dav4a
2014-04-23 10:19:14 +02:00
Launchpad Translations on behalf of openerp
d64b172b3b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140423065826-x7fmgc85ckhi9s8u
bzr revid: launchpad_translations_on_behalf_of_openerp-20140423070300-k249yxs2ghd1vaof
2014-04-23 07:03:00 +00:00