Fabien Pinckaers [Fri, 23 May 2014 07:43:34 +0000 (09:43 +0200)]
[FIX] Missing file
Fabien Pinckaers [Fri, 23 May 2014 07:15:08 +0000 (09:15 +0200)]
Merge pull request #168 from legalsylvain/master
[FIX] Issues #167. Remove obsolete shop reference
Sylvain LE GAL [Thu, 22 May 2014 20:55:50 +0000 (22:55 +0200)]
[FIX] Issues #167. Remove obsolete shop reference
Thibault Delavallée [Thu, 22 May 2014 14:22:32 +0000 (16:22 +0200)]
Merge pull request #164 from odoo-dev/master-website_sale--fix-tde
[FIX] website_sale: cleaned call to removed methods in website_sale
Martin Trigaux [Thu, 22 May 2014 13:41:36 +0000 (15:41 +0200)]
Improvement of the delivery module
Add field sequence on the delivery.gird.line to order rules
Add condition quantity to add more flexibility in the rules
Add operators > and < to be able to create rules without gap (instead of needing hack like 'x <= 100', 'x >= 100.000001')
--global [Thu, 22 May 2014 13:40:29 +0000 (15:40 +0200)]
[CLEAN] Use none or false, but not both on two lines ...
--global [Thu, 22 May 2014 13:34:09 +0000 (15:34 +0200)]
[FIX] website_sale: still cleaning lost references to deleted code in website_sale ...
Fixed checkout redirection that was meant to clean the session (incorrect sale order or transaction) that may happen
when having issues with the payment.
Martin Trigaux [Thu, 22 May 2014 12:56:33 +0000 (14:56 +0200)]
Add sequence field with handle in tree view
Martin Trigaux [Thu, 22 May 2014 12:55:26 +0000 (14:55 +0200)]
Add < and > operators to allow rules without gap (eg: until 100 & above 100)
Thibault Delavallée [Thu, 22 May 2014 12:29:06 +0000 (14:29 +0200)]
Merge pull request #160 from odoo-dev/master-forum-subtypes-tde
MERGE [IMP] website_forum: make forum.forum inherit from mail.thread. This way we add the possibility to users to follow a forum and be automatically followers of new questions, using some new subtypes on the forum.forum model that do the auto subscription.
Misc :
also added a profile link on the forum, when logged.
also added a subscribe button on the forum.
--global [Thu, 22 May 2014 11:49:41 +0000 (13:49 +0200)]
[IMP] website_forum: make forum;forum inherit from mail.thread. This way we
add the possibility to users to follow a forum and be automatically followers of new
questions, using some new subtypes on the forum.forum model that do the auto subscription.
Also added a profile link on the forum, when logged.
Also added a subscribe button on the forum.
Richard Mathot [Thu, 22 May 2014 11:46:15 +0000 (13:46 +0200)]
Merge pull request #159 from odoo-dev/master-gengo-fix-rim
[FIX] base_gengo: use supported/up-to-date library
Richard Mathot [Thu, 22 May 2014 11:29:07 +0000 (13:29 +0200)]
[DOC] base_gengo: add changelog
Richard Mathot [Thu, 22 May 2014 10:13:34 +0000 (12:13 +0200)]
[FIX] base_gengo: use supported/up-to-date library
Fabien Meghazi [Wed, 21 May 2014 09:15:21 +0000 (11:15 +0200)]
Merge pull request #97 from odoo-dev/master-default-addons-path-fme
[FIX] If no addons-path provided, include the main addons [Fixes #29]
Fabien Meghazi [Wed, 21 May 2014 08:40:33 +0000 (10:40 +0200)]
Merge pull request #95 from odoo-dev/master-seperate-bundle-fme
Seperate web.assets_common from other bundles
Fabien Meghazi [Wed, 21 May 2014 08:29:04 +0000 (10:29 +0200)]
Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme
Fabien Meghazi [Tue, 20 May 2014 20:33:49 +0000 (22:33 +0200)]
If no addons-path provided, include the main addons
Christophe Simonis [Tue, 20 May 2014 18:19:55 +0000 (20:19 +0200)]
[MERGE] forward port of branch saas-4 up to revid bb26dea
Christophe Simonis [Tue, 20 May 2014 17:00:50 +0000 (19:00 +0200)]
[MERGE] forward port of branch saas-3 up to revid 38abc8a
Christophe Simonis [Tue, 20 May 2014 16:57:04 +0000 (18:57 +0200)]
[MERGE] forward port of branch 7.0 up to revid b09b6a0
Christophe Simonis [Tue, 20 May 2014 16:10:36 +0000 (18:10 +0200)]
[MERGE] merge bzr trunk addons branch
Christophe Simonis [Tue, 20 May 2014 15:30:01 +0000 (17:30 +0200)]
[MERGE] merge bzr trunk server branch
Christophe Simonis [Tue, 20 May 2014 15:14:18 +0000 (17:14 +0200)]
[MERGE] merge bzr saas-4 web branch
Christophe Simonis [Tue, 20 May 2014 15:12:01 +0000 (17:12 +0200)]
[MERGE] merge bzr saas-4 addons branch
Fabien Meghazi [Tue, 20 May 2014 15:06:25 +0000 (17:06 +0200)]
Seperate assets_common from other bundles
Christophe Simonis [Tue, 20 May 2014 15:05:25 +0000 (17:05 +0200)]
[MERGE] merge bzr saas-4 server branch
Christophe Simonis [Tue, 20 May 2014 14:46:58 +0000 (16:46 +0200)]
[MERGE] merge bzr saas-3 addons branch
Christophe Simonis [Tue, 20 May 2014 14:41:04 +0000 (16:41 +0200)]
[MERGE] merge bzr saas-3 server branch
Christophe Simonis [Tue, 20 May 2014 14:31:43 +0000 (16:31 +0200)]
[MERGE] merge bzr addons branch
Christophe Simonis [Tue, 20 May 2014 14:28:48 +0000 (16:28 +0200)]
[MERGE] merge bzr server branch
Denis Ledoux [Tue, 20 May 2014 14:08:03 +0000 (16:08 +0200)]
[FIX] account_analytic_analysis: use product.price if pricelist is passed, else list_price
Martin Trigaux [Tue, 20 May 2014 13:27:33 +0000 (15:27 +0200)]
[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
Martin Trigaux [Tue, 20 May 2014 13:05:27 +0000 (15:05 +0200)]
[IMP] display the createion date of the question the same way we display the answer fate
Martin Trigaux [Tue, 20 May 2014 12:50:51 +0000 (14:50 +0200)]
[IMP] as the closing reason is not required, do not display it if none is present
Martin Trigaux [Tue, 20 May 2014 12:41:56 +0000 (14:41 +0200)]
[FIX] remove closing reason 'an answer was accepted', the questions should be left as open to be possible to improve the answer afterward
Martin Trigaux [Tue, 20 May 2014 12:32:21 +0000 (14:32 +0200)]
[FIX] the badges should be ordered by most popular first
Martin Trigaux [Tue, 20 May 2014 12:31:55 +0000 (14:31 +0200)]
[FIX] definition of badges
Fabien Meghazi [Tue, 20 May 2014 11:20:15 +0000 (13:20 +0200)]
Merge pull request #69 from odoo-dev/saas-4-auth-user-login-redirect-fme
Automatic auth='user' redirection for unlogged users
Martin Trigaux [Tue, 20 May 2014 11:10:56 +0000 (13:10 +0200)]
[FIX] crm: do not overwrite the value of no_force_assignation if already set in the context
Martin Trigaux [Tue, 20 May 2014 11:10:44 +0000 (13:10 +0200)]
[FIX] website_forum: when sending emails about forum post, use the public url instead of the private
Thibault Delavallée [Tue, 20 May 2014 11:24:18 +0000 (13:24 +0200)]
[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.
Fabien Meghazi [Tue, 20 May 2014 10:02:46 +0000 (12:02 +0200)]
@auth='user' redirection for unlogged users
opt out with query parameter ?noredirect=1
Fabien Meghazi [Tue, 20 May 2014 08:36:45 +0000 (10:36 +0200)]
Merge pull request #66 from odoo-dev/master-fix-slug-redirect-fme
Slug redirects loses query_string
Fabien Meghazi [Tue, 20 May 2014 08:25:39 +0000 (10:25 +0200)]
Slug redirects loses query_string
Olivier Dony [Tue, 20 May 2014 08:24:33 +0000 (10:24 +0200)]
[FIX] website_forum: country_id is an integer field
Olivier Dony [Tue, 20 May 2014 08:24:01 +0000 (10:24 +0200)]
[FIX] website_forum: allow users to save their edited bio
Martin Trigaux [Tue, 20 May 2014 08:16:17 +0000 (10:16 +0200)]
[FIX] sale: in paypal, the encoding of the url should be done with werkzeug instead of urllib for better handeling of unicode (opw 607866)
Fabien Meghazi [Tue, 20 May 2014 08:15:49 +0000 (10:15 +0200)]
Broken @route arguments for events pages
Fabien Pinckaers [Tue, 20 May 2014 07:56:55 +0000 (09:56 +0200)]
Merge pull request #40 from kirca/mk_lang
[ADD] Macedonian language
Fabien Pinckaers [Tue, 20 May 2014 07:48:15 +0000 (09:48 +0200)]
Merge pull request #33 from richierichrawr/master
Docstrings, typo, and return value
Fabien Pinckaers [Tue, 20 May 2014 07:47:49 +0000 (09:47 +0200)]
Merge pull request #50 from vice/master
Default event track is half hour not 30 hours
Fabien Pinckaers [Tue, 20 May 2014 07:47:28 +0000 (09:47 +0200)]
Merge pull request #62 from luisalvarado/master
Update README.md
Luis Alvarado [Mon, 19 May 2014 21:00:10 +0000 (15:00 -0600)]
Update README.md
The only grammar problem left.
Thibault Delavallée [Mon, 19 May 2014 16:16:10 +0000 (18:16 +0200)]
[FIX] website_crm_partner_assign: fixed error of used template
to display partner references, use the one defined in website_crm_partner_assign module.
Thibault Delavallée [Mon, 19 May 2014 16:15:32 +0000 (18:15 +0200)]
[IMP] ir_qweb: contact widget: handle website info in the contact widget.
Thibault Delavallée [Mon, 19 May 2014 16:12:41 +0000 (18:12 +0200)]
[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.
Antoine Perdaens [Mon, 19 May 2014 15:44:51 +0000 (17:44 +0200)]
[FIX] account_analytic_analysis: recurring invoices
Properly support yearly recurring invoices
Richard Mathot (OpenERP) [Mon, 19 May 2014 15:41:50 +0000 (17:41 +0200)]
[FIX] website_event_track: human-readable display of track durations
Richard Mathot (OpenERP) [Mon, 19 May 2014 15:37:00 +0000 (17:37 +0200)]
[FIX] ir_qweb: Duration widget now displays something
Thibault Delavallée [Mon, 19 May 2014 14:40:50 +0000 (16:40 +0200)]
[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.
Thibault Delavallée [Mon, 19 May 2014 13:57:05 +0000 (15:57 +0200)]
[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.
xmo-odoo [Mon, 19 May 2014 13:45:31 +0000 (15:45 +0200)]
Merge pull request #54 from driou/master
Error (dupe) in a command of the readme
driou [Mon, 19 May 2014 13:39:02 +0000 (15:39 +0200)]
Update README.md
Denis Ledoux [Mon, 19 May 2014 13:36:48 +0000 (15:36 +0200)]
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10056 revid:dle@openerp.com-
20140519133339-uxb01aik1z8wu1sy
Denis Ledoux [Mon, 19 May 2014 13:33:39 +0000 (15:33 +0200)]
[FIX] point_of_sale: opw-607551, mark the pos order as paid before trying to create the picking, so in case the picking could not be created for one reason or another, the pos order workflow process continue.
This commit partially reverts rev. 6036 revid:fp@tinyerp.com-
20111219220053-tn5gc1lmc13fjpyf, the second part of this commit already has been revert in a previous revision.
Martin Trigaux [Mon, 19 May 2014 13:13:07 +0000 (15:13 +0200)]
[FIX] auditrail: fix read rules to record the current state (opw 606956)
Thibault Delavallée [Mon, 19 May 2014 12:40:55 +0000 (14:40 +0200)]
[FIX] website_forum: fixed crash when displaying a closed question for public
users; indeed partner data was displayed without using the contact widget.
Thibault Delavallée [Mon, 19 May 2014 12:40:24 +0000 (14:40 +0200)]
[IMP] website_forum: display only the 100 last
activities + order by date desc
xmo-odoo [Mon, 19 May 2014 12:12:57 +0000 (14:12 +0200)]
Merge pull request #51 from katyukha/oe-fix-1
Fixed bug in 'oe' script when passing no arguments
Dharti Ratani (Open ERP) [Mon, 19 May 2014 12:09:24 +0000 (17:39 +0530)]
[IMP]Improved as per the comment
Дмитро Катюха [Mon, 19 May 2014 12:06:59 +0000 (15:06 +0300)]
Fixed bug in 'oe' script when passing no arguments
When no arguments passed to 'oe' script next exception was thrown:
```
Traceback (most recent call last):
File "./oe", line 5, in <module>
if sys.argv[1] == 'run-tests':
IndexError: list index out of range
```
Fabien Meghazi [Mon, 19 May 2014 12:05:18 +0000 (14:05 +0200)]
[IMP] store sitemaps in ir.attachments
Vicente Jimenez Aguilar [Mon, 19 May 2014 12:04:01 +0000 (14:04 +0200)]
Default event track is half hour not 30 hours
This is a leftover from revision 9304
where the duration property of events changed unit
from minutes to hours but the defualt value remained 30.
Cedric Snauwaert [Mon, 19 May 2014 12:01:47 +0000 (14:01 +0200)]
[FIX]modal: in some particular case, we have 2 actions opening modal one after another, fix problem in those case where second modal was close instead of first one
xmo-odoo [Mon, 19 May 2014 12:00:58 +0000 (14:00 +0200)]
Merge pull request #48 from xmo-odoo/doc-fixes
[FIX] indentation and formatting of various rst snippets
Fabien Meghazi [Mon, 19 May 2014 11:59:38 +0000 (13:59 +0200)]
[IMP] minor changes to sitemap
Xavier Morel [Mon, 19 May 2014 11:59:17 +0000 (13:59 +0200)]
[FIX] indentation and formatting of various rst snippets
Thibault Delavallée [Mon, 19 May 2014 11:50:51 +0000 (13:50 +0200)]
[FIX] website_forum: do not display closed of offensive questions in searches.
Users can still go on the question using their direct link.
Fabien Meghazi [Mon, 19 May 2014 11:40:37 +0000 (13:40 +0200)]
[IMP] route@multilang default value inverted
The default value is now True for route@website=True controllers
Can be voided using multilang=False
Denis Ledoux [Mon, 19 May 2014 10:46:33 +0000 (12:46 +0200)]
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9460 revid:dle@openerp.com-
20140519103942-do7uem4in0jfqzo2
Denis Ledoux [Mon, 19 May 2014 10:39:42 +0000 (12:39 +0200)]
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10054 revid:dle@openerp.com-
20140519103020-bcqz4rssbqsvn9m7
Fabien Meghazi [Mon, 19 May 2014 10:33:47 +0000 (12:33 +0200)]
[FIX] properly set website_multilang attribute
xmo-odoo [Mon, 19 May 2014 10:30:31 +0000 (12:30 +0200)]
Merge pull request #46 from katyukha/setup-py-scripts-fix
Added openerp-gevent and oe to 'scripts' section in setup.py
Denis Ledoux [Mon, 19 May 2014 10:30:20 +0000 (12:30 +0200)]
[FIX] marketing_campaign: server actions always return None or False, and the return value of method _process_wi_action should return True whatever what the server action returns
If the server actions returned None instead of False, the next activity was not triggered, while it should
Fabien Meghazi [Mon, 19 May 2014 10:12:46 +0000 (12:12 +0200)]
[MERGE] upstream
Thibault Delavallée [Mon, 19 May 2014 09:47:23 +0000 (11:47 +0200)]
Merge pull request #45 from odoo-dev/saas-4-blog-tde
[FIX] website_blog: order archives by date desc
Дмитро Катюха [Mon, 19 May 2014 09:45:47 +0000 (12:45 +0300)]
Added openerp-gevent and oe to 'scripts' section in setup.py
xmo-odoo [Mon, 19 May 2014 09:40:53 +0000 (11:40 +0200)]
Merge pull request #38 from cysnake4713/master
[FIX] report set_html_image error
Thibault Delavallée [Mon, 19 May 2014 09:14:30 +0000 (11:14 +0200)]
[FIX] website_blog: order archives by date desc
xmo-odoo [Mon, 19 May 2014 08:18:27 +0000 (10:18 +0200)]
Merge pull request #27 from lyinfo/master-ck-match
Dereferencing of nones could lose error messages during import
xmo-odoo [Mon, 19 May 2014 08:16:44 +0000 (10:16 +0200)]
Merge pull request #44 from xmo-odoo/master-gitignore
[FIX] missing gitignore server rules
Xavier Morel [Mon, 19 May 2014 08:14:08 +0000 (10:14 +0200)]
[FIX] port trunk bzrignore to gitignore
previous port only had the web client's rules
xmo-odoo [Mon, 19 May 2014 07:55:22 +0000 (09:55 +0200)]
Merge pull request #43 from xmo-odoo/website-tutorial
First howto: tutorial to basic website features (dev-wise)
xmo-odoo [Mon, 19 May 2014 07:48:28 +0000 (09:48 +0200)]
[FIX] replace a few more references to trunk with master
xmo-odoo [Mon, 19 May 2014 07:32:53 +0000 (09:32 +0200)]
[FIX] mainline branch is called master in git
Xavier Morel [Tue, 22 Apr 2014 13:10:58 +0000 (15:10 +0200)]
[IMP] wording/section conclusion
Xavier Morel [Wed, 16 Apr 2014 13:16:22 +0000 (15:16 +0200)]
[ADD] move data from custom objects to standard
Xavier Morel [Tue, 15 Apr 2014 15:36:08 +0000 (17:36 +0200)]
[ADD] reuse of existing openerp stuff
Xavier Morel [Tue, 15 Apr 2014 14:56:59 +0000 (16:56 +0200)]
[ADD] hasclass() xpath function
Server-side, view extension is done via xpath. This includes "template" views
full of HTML.
HTML elements often have a bunch of classes, sometimes even semantic
(!). XPath is generally great, but specifically lousy at dealing with
space-separated values: in standard XPath 1.0 to know if an element has a
class 'foo' the predicate is:
contains(concat(' ', normalize-space(@class), ' '), ' foo ')
and this has to be fully duplicated if there's a second class involved.
Things are slightly better with EXSLT/XPath 2.0 and tokenize, but still not
great:
tokenize(@class, '\s+') = 'foo'
and the equality check is very weird when unaware of XPath's evaluation rules.
``hasclass`` makes this much simpler to deal with: to get any ``foo`` node
with the class ``bar`` is as simple as:
//foo[hasclass('bar')
and it can take multiple class, as with e.g. jquery it will return elements
with all specified classes.
Beware though, the predicate function will be called once for each element to
check, since it's implemented in pure python and not profiled elements should
be filtered as much as possible before this point.