Josse Colpaert
ad58b17e6e
[IMP] Add security rules from bzr branch
2014-05-21 17:34:19 +02:00
Fabien Meghazi
7adfaf786d
Merge pull request #97 from odoo-dev/master-default-addons-path-fme
...
[FIX] If no addons-path provided, include the main addons [Fixes #29 ]
2014-05-21 11:15:21 +02:00
Fabien Meghazi
d5fcc1e1e0
Merge pull request #95 from odoo-dev/master-seperate-bundle-fme
...
Seperate web.assets_common from other bundles
2014-05-21 10:40:33 +02:00
Fabien Meghazi
593cdf427f
Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme
2014-05-21 10:29:04 +02:00
Fabien Meghazi
05f376e310
If no addons-path provided, include the main addons
2014-05-20 22:33:49 +02:00
Christophe Simonis
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
Christophe Simonis
bb26dea60b
[MERGE] forward port of branch saas-3 up to revid 38abc8a
2014-05-20 19:00:50 +02:00
Christophe Simonis
38abc8a006
[MERGE] forward port of branch 7.0 up to revid b09b6a0
2014-05-20 18:57:04 +02:00
Christophe Simonis
040c93026a
[MERGE] merge bzr trunk addons branch
2014-05-20 18:10:36 +02:00
Christophe Simonis
ab4c3534de
[MERGE] merge bzr trunk server branch
2014-05-20 17:30:01 +02:00
Christophe Simonis
a70eea3b11
[MERGE] merge bzr saas-4 web branch
2014-05-20 17:14:18 +02:00
Christophe Simonis
d93f628c72
[MERGE] merge bzr saas-4 addons branch
2014-05-20 17:12:01 +02:00
Fabien Meghazi
863edbaaf2
Seperate assets_common from other bundles
2014-05-20 17:06:25 +02:00
Christophe Simonis
8f0066d728
[MERGE] merge bzr saas-4 server branch
2014-05-20 17:05:25 +02:00
Christophe Simonis
a5bb6b17e2
[MERGE] merge bzr saas-3 addons branch
2014-05-20 16:46:58 +02:00
Christophe Simonis
e046626093
[MERGE] merge bzr saas-3 server branch
2014-05-20 16:41:04 +02:00
Christophe Simonis
b09b6a06b1
[MERGE] merge bzr addons branch
2014-05-20 16:31:43 +02:00
Christophe Simonis
528d04d6dd
[MERGE] merge bzr server branch
2014-05-20 16:28:48 +02:00
Denis Ledoux
40abb97136
[FIX] account_analytic_analysis: use product.price if pricelist is passed, else list_price
2014-05-20 16:08:03 +02:00
Martin Trigaux
3d70237d0d
[FIX] website_forum: correct goal definition and other improvement
...
- scholar: the field is_correct is on the answer, not on the question
- remove closing reason 'an answer was accepted', the questions should be left as open to be possible to improve the answer afterward
- sort badges by most frequent first
- display the creation date of the question the same way we display the answer date
2014-05-20 15:27:33 +02:00
Martin Trigaux
a558a84630
[IMP] display the createion date of the question the same way we display the answer fate
2014-05-20 15:05:27 +02:00
Martin Trigaux
4d9aa300a7
[IMP] as the closing reason is not required, do not display it if none is present
2014-05-20 14:50:51 +02:00
Martin Trigaux
70d3652c27
[FIX] remove closing reason 'an answer was accepted', the questions should be left as open to be possible to improve the answer afterward
2014-05-20 14:41:56 +02:00
Martin Trigaux
c786ceb760
[FIX] the badges should be ordered by most popular first
2014-05-20 14:32:21 +02:00
Martin Trigaux
8da2cb6d4a
[FIX] definition of badges
2014-05-20 14:31:55 +02:00
Fabien Meghazi
a78e27fc0c
Merge pull request #69 from odoo-dev/saas-4-auth-user-login-redirect-fme
...
Automatic auth='user' redirection for unlogged users
2014-05-20 13:20:15 +02:00
Martin Trigaux
6718e9d03a
[FIX] crm: do not overwrite the value of no_force_assignation if already set in the context
2014-05-20 13:10:56 +02:00
Martin Trigaux
4c822b1a3b
[FIX] website_forum: when sending emails about forum post, use the public url instead of the private
2014-05-20 13:10:44 +02:00
Thibault Delavallée
96128a678e
[IMP] website_crm_partner_assign: use geoip to display partners in the visitor's country.
...
Also added a breadcrumb in partners navigation; when going on the partner view
a link to come back to the list view has been added and takes into account
selected grade and country.
2014-05-20 13:24:18 +02:00
Fabien Meghazi
9cd8ec98bc
Automatic @auth='user' redirection for unlogged users
...
opt out with query parameter ?noredirect=1
2014-05-20 12:02:46 +02:00
Fabien Meghazi
6808b174c2
Merge pull request #66 from odoo-dev/master-fix-slug-redirect-fme
...
Slug redirects loses query_string
2014-05-20 10:36:45 +02:00
Fabien Meghazi
59bfda8efd
Slug redirects loses query_string
2014-05-20 10:25:39 +02:00
Olivier Dony
c1a0d23422
[FIX] website_forum: country_id is an integer field
2014-05-20 10:24:33 +02:00
Olivier Dony
c97d0ccf8f
[FIX] website_forum: allow users to save their edited bio
2014-05-20 10:24:01 +02:00
Martin Trigaux
d88ecfa970
[FIX] sale: in paypal, the encoding of the url should be done with werkzeug instead of urllib for better handeling of unicode (opw 607866)
2014-05-20 10:16:17 +02:00
Fabien Meghazi
ffb18d0af3
Broken @route arguments for events pages
2014-05-20 10:15:49 +02:00
Fabien Pinckaers
a9ded014b2
Merge pull request #40 from kirca/mk_lang
...
[ADD] Macedonian language
2014-05-20 09:56:55 +02:00
Fabien Pinckaers
7cdbc0b7cd
Merge pull request #33 from richierichrawr/master
...
Docstrings, typo, and return value
2014-05-20 09:48:15 +02:00
Fabien Pinckaers
a29f695953
Merge pull request #50 from vice/master
...
Default event track is half hour not 30 hours
2014-05-20 09:47:49 +02:00
Fabien Pinckaers
4d2735a48a
Merge pull request #62 from luisalvarado/master
...
Update README.md
2014-05-20 09:47:28 +02:00
Luis Alvarado
1351bf6820
Update README.md
...
The only grammar problem left.
2014-05-19 15:00:10 -06:00
Thibault Delavallée
eae72dd1c8
[FIX] website_crm_partner_assign: fixed error of used template
...
to display partner references, use the one defined in website_crm_partner_assign module.
2014-05-19 18:16:10 +02:00
Thibault Delavallée
f99785e29d
[IMP] ir_qweb: contact widget: handle website info in the contact widget.
2014-05-19 18:15:32 +02:00
Thibault Delavallée
066fb14326
[FIX] orm: unlink: when unlinking a record, trigger the computing of
...
function fields for other records in the same model. Previously all function fields in the
current model were not computed for some reason not provided by the history.
We therefore compute effective store_ids on which the various trigerred
function fields will be computed again. Those ids are the ids given
in the store_get storage variable minus the deleted ones.
2014-05-19 18:12:41 +02:00
Antoine Perdaens
4dbaa116ee
[FIX] account_analytic_analysis: recurring invoices
...
Properly support yearly recurring invoices
2014-05-19 17:44:51 +02:00
Richard Mathot (OpenERP)
be99dbf16a
[FIX] website_event_track: human-readable display of track durations
2014-05-19 17:41:50 +02:00
Richard Mathot (OpenERP)
f5368a1bad
[FIX] ir_qweb: Duration widget now displays something
2014-05-19 17:37:00 +02:00
Thibault Delavallée
4837952ad4
[FIX] website_crm_partner_assign: fixed crash when having partners to display
...
on resellers page that do not have country_id set, leading to some values
not being present in the countries variable holding data about partner
localisation.
2014-05-19 16:40:50 +02:00
Thibault Delavallée
f037a009cc
[MERGE] [FIX] website_forum:
...
- fixed crash when displaying a closed question for public users; indeed partner data was displayed without using the contact widget
- display only the 100 last activities + order by date desc
- do not display closed of offensive questions in searches. Users can still go on the question using their direct link.
2014-05-19 15:57:05 +02:00
xmo-odoo
b27a3351af
Merge pull request #54 from driou/master
...
Error (dupe) in a command of the readme
2014-05-19 15:45:31 +02:00