pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,355 Commits 1 Branch 0 Tags
a3f5da5f4f98eb42e4b7a0dc2f868db362fd0e87
Commit Graph
88355 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Pinckaers a3f5da5f4f Merge pull request #168 from legalsylvain/master 
[FIX] Issues #167. Remove obsolete shop reference
 2014-05-23 09:15:08 +02:00
Sylvain LE GAL 5d8927e2b1 [FIX] Issues #167. Remove obsolete shop reference 2014-05-22 22:55:50 +02:00
Thibault Delavallée ada00bbe32 Merge pull request #164 from odoo-dev/master-website_sale--fix-tde 
[FIX] website_sale: cleaned call to removed methods in website_sale
 2014-05-22 16:22:32 +02:00
Martin Trigaux c0fdc2cdbe 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')
 2014-05-22 15:41:36 +02:00
--global 13ac3865d5 [CLEAN] Use none or false, but not both on two lines ... 2014-05-22 15:40:29 +02:00
--global 15e874b5c8 [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.
 2014-05-22 15:34:09 +02:00
Martin Trigaux 0efc066aa6 Add sequence field with handle in tree view 2014-05-22 14:56:33 +02:00
Martin Trigaux 4e34e3bce5 Add < and > operators to allow rules without gap (eg: until 100 & above 100) 2014-05-22 14:55:26 +02:00
Thibault Delavallée 8df42a88ab 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.
 2014-05-22 14:29:06 +02:00
--global 2649beba97 [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.
 2014-05-22 13:49:41 +02:00
Richard Mathot 8ad97da843 Merge pull request #159 from odoo-dev/master-gengo-fix-rim 
[FIX] base_gengo: use supported/up-to-date library
 2014-05-22 13:46:15 +02:00
Richard Mathot 0b0f74861e [DOC] base_gengo: add changelog 2014-05-22 13:36:48 +02:00
Richard Mathot b283f8d5b1 [FIX] base_gengo: use supported/up-to-date library 2014-05-22 12:13:34 +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