Richard Mathot [Mon, 2 Jun 2014 15:01:44 +0000 (17:01 +0200)]
[FIX] stupid typo
Richard Mathot [Mon, 2 Jun 2014 14:56:36 +0000 (16:56 +0200)]
[FIX] website*: make custom footer independant of main layout
Richard Mathot [Mon, 2 Jun 2014 10:11:18 +0000 (12:11 +0200)]
[FIX] website_blog: use new custom footer
Richard Mathot [Mon, 2 Jun 2014 10:10:56 +0000 (12:10 +0200)]
[FIX] website: remove standard footer from the DOM instead of hiding it
Christophe Simonis [Sun, 1 Jun 2014 12:35:54 +0000 (14:35 +0200)]
[MERGE] forward port of branch saas-5 up to revid c19bb8c
Christophe Simonis [Sun, 1 Jun 2014 12:30:15 +0000 (14:30 +0200)]
[FIX] website: correct "/" redirect to first menu
Christophe Simonis [Sun, 1 Jun 2014 09:21:35 +0000 (11:21 +0200)]
[MERGE] forward port of branch saas-5 up to revid 587084f
Christophe Simonis [Sun, 1 Jun 2014 09:19:03 +0000 (11:19 +0200)]
[MERGE] forward port of branch saas-4 up to revid c319dc4
Christophe Simonis [Sun, 1 Jun 2014 09:17:09 +0000 (11:17 +0200)]
[FIX] mail: view_mode "list" does not exists, it's "tree"
Christophe Simonis [Sun, 1 Jun 2014 08:56:39 +0000 (10:56 +0200)]
[MERGE] forward port of branch saas-3 up to revid faace84
Christophe Simonis [Sun, 1 Jun 2014 08:52:02 +0000 (10:52 +0200)]
[FIX] email_template: partners ids are integers, not strings
Christophe Simonis [Sat, 31 May 2014 14:09:03 +0000 (16:09 +0200)]
[MERGE] forward port of branch saas-5 up to revid 285e1d5
Christophe Simonis [Sat, 31 May 2014 13:37:23 +0000 (15:37 +0200)]
[FIX] website_sale: so javascipt does not like tuples. use a list instead
Christophe Simonis [Sat, 31 May 2014 12:16:10 +0000 (14:16 +0200)]
[MERGE] forward port of branch saas-5 up to revid 960b866
Christophe Simonis [Sat, 31 May 2014 12:05:48 +0000 (14:05 +0200)]
[FIX] website_sale: remove invalid (and stupid) function field
Olivier Dony [Fri, 30 May 2014 23:48:55 +0000 (01:48 +0200)]
[FIX] website_mail_group: duplicate preventDefault() call (called before onclick already)
Plus it fails because `event` is not defined nor passed there (e.g. in Firefox)
Christophe Simonis [Fri, 30 May 2014 21:05:34 +0000 (23:05 +0200)]
[REL] saas-5
Christophe Simonis [Fri, 30 May 2014 20:54:05 +0000 (22:54 +0200)]
Merge pull request #278 from odoo-dev/master-bank-reconcile-ama
[IMP] account: bank statement reconciliation widget
qdp-odoo [Fri, 30 May 2014 20:25:52 +0000 (22:25 +0200)]
[FIX] account: fixed inconsistence in yaml test since some demo data was added
Fabien Pinckaers [Fri, 30 May 2014 19:26:13 +0000 (21:26 +0200)]
Merge pull request #269 from sve-odoo/patch-1
[ADD] "Model" Column in base_action_rule tree view.
Christophe Simonis [Fri, 30 May 2014 18:34:56 +0000 (20:34 +0200)]
[FIX] account_bank_statement_extensions: do not extend dropped form view
qdp-odoo [Fri, 30 May 2014 17:28:40 +0000 (19:28 +0200)]
[FIX] account_bank_statement_extension: fixed xml path in view
qdp-odoo [Fri, 30 May 2014 17:04:13 +0000 (19:04 +0200)]
[IMP] account: bank statement reconciliation widget (part 3: missing files lost during manual merge (renamed))
qdp-odoo [Fri, 30 May 2014 16:47:50 +0000 (18:47 +0200)]
[IMP] account: bank statement reconciliation widget (part 2)
qdp-odoo [Fri, 30 May 2014 16:34:13 +0000 (18:34 +0200)]
[IMP] account: bank statement reconciliation widget
qdp-odoo [Fri, 30 May 2014 16:09:05 +0000 (18:09 +0200)]
[MERGE] master-wmsstaging-jco with fixes on WMS + new barcode reports
Christophe Simonis [Fri, 30 May 2014 15:30:36 +0000 (17:30 +0200)]
[IMP] replace OpenERP by Odoo in backend + change company default logo.
qdp-odoo [Fri, 30 May 2014 14:52:03 +0000 (16:52 +0200)]
[MERGE] master
Xavier Morel [Fri, 30 May 2014 15:00:52 +0000 (17:00 +0200)]
[FIX] bunch of changes lost in incorrect merge
f4d78ae738e474abd4e77dc8fc6cdf8a668a5d72
Xavier Morel [Fri, 30 May 2014 14:00:28 +0000 (16:00 +0200)]
[REV] attempt to revert incorrect removals in
f4d78ae738e474abd4e77dc8fc6cdf8a668a5d72
Richard Mathot [Fri, 30 May 2014 13:35:59 +0000 (15:35 +0200)]
[FIX] website: fix incomplete refactoring
Richard Mathot [Fri, 30 May 2014 13:20:18 +0000 (15:20 +0200)]
[REV][FIX] Reverting regression introduced in forward-port
04211015fc3d4be2a8c65b9d977c2d9c4dac8be7
Thibault Delavallée [Fri, 30 May 2014 09:22:00 +0000 (11:22 +0200)]
[FIX] website_mail_group: fixed discussion group data, wrongly forward-ported
Josse Colpaert [Fri, 30 May 2014 09:15:51 +0000 (11:15 +0200)]
Merge remote-tracking branch 'odoo/master' into master-wmsstaging-jco
Josse Colpaert [Fri, 30 May 2014 08:37:26 +0000 (10:37 +0200)]
Merge branch 'master-wmssecurity3-jco' into master-wmsstaging-jco
Josse Colpaert [Fri, 30 May 2014 08:24:31 +0000 (10:24 +0200)]
Merge branch 'master-wmsstatbut-jco' into master-wmsstaging-jco
Christophe Simonis [Fri, 30 May 2014 08:16:23 +0000 (10:16 +0200)]
[MERGE] product: refactoring of product variants.
close PR #222
Christophe Simonis [Fri, 30 May 2014 08:00:54 +0000 (10:00 +0200)]
[IMP] product: improve field labels about variant/attributes distinction
Antony Lesuisse [Fri, 30 May 2014 07:55:30 +0000 (09:55 +0200)]
[FIX] odoo.py git_locate
Antony Lesuisse [Thu, 29 May 2014 23:52:07 +0000 (01:52 +0200)]
[IMP] packaging v8 part1, tgz deb and rpm
Antony Lesuisse [Thu, 29 May 2014 21:19:24 +0000 (23:19 +0200)]
[FIX] website_sale and website_event imports
missing import prevent cli help display
Antony Lesuisse [Thu, 29 May 2014 16:51:59 +0000 (18:51 +0200)]
[FIX] odoo.py setup deps and readme.md
Antony Lesuisse [Thu, 29 May 2014 16:33:04 +0000 (18:33 +0200)]
[IMP] repository cleanup
- move packaging stuff to setup
- remove historical stuff
- remove oe, odoo-cmd-fme will be merged with the convered commands
- add an odoo.py script to run odo and boostrap it
- simplify README
- prepare to move documentation to the github wiki
sve-odoo [Thu, 29 May 2014 13:48:10 +0000 (15:48 +0200)]
[ADD] "Model" Column in base_action_rule tree view.
Antony Lesuisse [Thu, 29 May 2014 13:02:27 +0000 (15:02 +0200)]
[FIX] ir.attachment mess, restore list view
Josse Colpaert [Thu, 29 May 2014 12:58:48 +0000 (14:58 +0200)]
[IMP] Location barcode
Olivier Dony [Thu, 29 May 2014 00:07:18 +0000 (02:07 +0200)]
[FIX] website_mail_group: restore missing snippet icon
The file was originally added in website_mail at 59b934
in saas-4 but was lost in master since.
Olivier Dony [Wed, 28 May 2014 23:59:47 +0000 (01:59 +0200)]
[FIX] website_mail*: fix + bundlify changes of 0c89ca: move subscription widget from website_mail to website_mail_group
Fabien Meghazi [Wed, 28 May 2014 22:27:54 +0000 (00:27 +0200)]
Merge pull request #263 from odoo-dev/master-fix-asset-fme
[FIX] website_mail.editor.js moved but still referenced
Commit 0c89ca0 moves
website_mail.editor.js but is still referenced in website_mail.xml
Fabien Meghazi [Wed, 28 May 2014 21:13:38 +0000 (23:13 +0200)]
[FIX] website_mail.editor.js moved but still referenced
Commit
0c89ca0f8f2d96e37353348fe33591da8142368b moves
website_mail.editor.js but is still referenced in website_mail.xml
Christophe Matthieu [Wed, 28 May 2014 18:50:20 +0000 (20:50 +0200)]
[FIX] point_of_sale: fix product view layout
Christophe Matthieu [Wed, 28 May 2014 18:49:51 +0000 (20:49 +0200)]
[FIX] membership: increase priority of product view (don't take this view by default).
Christophe Matthieu [Wed, 28 May 2014 17:42:15 +0000 (19:42 +0200)]
[IMP] product: rename fields variant_ids into attribute_line_ids on the template and attribute_value_ids on the product.
Pariket Trivedi [Wed, 28 May 2014 17:05:11 +0000 (19:05 +0200)]
[IMP] event_sale: extra QWeb report for printing event badges, with HTML fields for custom content
Christophe Matthieu [Wed, 28 May 2014 17:04:23 +0000 (19:04 +0200)]
[FIX] product: revert change for price_extra. Need to filter by template to apply the price_extra.
Christophe Simonis [Wed, 28 May 2014 16:45:12 +0000 (18:45 +0200)]
Merge pull request #226 from odoo-dev/master-website_sale-add-vat-chm
[IMP] website_sale: add vat field on checkout + validate it if base_vat module is installed
Christophe Matthieu [Wed, 28 May 2014 16:30:03 +0000 (18:30 +0200)]
[IMP] product: fixes for review
Olivier Dony [Wed, 28 May 2014 15:45:31 +0000 (17:45 +0200)]
[MERGE] Forward-port saas-4 up to bf135ad
Richard Mathot [Wed, 28 May 2014 15:23:28 +0000 (17:23 +0200)]
[FIX] website_blog: display properly (very) long words in comments
Denis Ledoux [Wed, 28 May 2014 13:50:02 +0000 (15:50 +0200)]
[FIX] web: on new ir actions act_window target current, change the active* params from context for the dataset only
This fix is related to
a37bad205b13cec4f19f8e84e28801278e3e36ca
This previous fix did solved the issue of its purpose, but had a side effect for actions using these active* params, e.g. search views
For instance, Go to Project > Projects, click on any project, you are than redirected to tasks/issues of this project
If you reload the page, an error pops up, complaining that active_id cannot be found
Denis Ledoux [Wed, 28 May 2014 12:53:32 +0000 (14:53 +0200)]
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev.
df0ae7e4d155a180f5e49e85f18ce52bf503c22c
Thibault Delavallée [Wed, 28 May 2014 12:10:05 +0000 (14:10 +0200)]
Merge pull request #251 from odoo-dev/saas-4-follower-route-tde
[FIX] website_mail_group: discussion group snippet
- moved into website_mail_group, instead of having the snippet in website_mail and the archives in website_mail_group
- fixed routes to avoid security issues
- better display of email on groups and archive
Denis Ledoux [Wed, 28 May 2014 12:02:56 +0000 (14:02 +0200)]
[FIX] payment_paypal: wrong handling fees computation formula
Christophe Matthieu [Wed, 28 May 2014 10:29:56 +0000 (12:29 +0200)]
[FIX] mrp_sale: move explode product with wrong bom; change product id
Christophe Matthieu [Wed, 28 May 2014 10:26:57 +0000 (12:26 +0200)]
[FIX] mrp: demo data is wrong don't produce ipad but pc
Denis Ledoux [Wed, 28 May 2014 10:04:41 +0000 (12:04 +0200)]
[FIX] website_sale: force changing pricelist on different account signin
opw-607517
Christophe Matthieu [Wed, 28 May 2014 09:46:32 +0000 (11:46 +0200)]
[IMP] product: rename field variants_ids to respect odoo typo; add demo data for mrp
Christophe Simonis [Wed, 28 May 2014 09:43:24 +0000 (11:43 +0200)]
[FIX] logging PostgreSQLHandler: expand message + use contextmanagers to handle exceptions and cursor
Christophe Matthieu [Wed, 28 May 2014 09:29:20 +0000 (11:29 +0200)]
[FIX] product: recursion error when active field on product.template is modified
Thibault Delavallée [Wed, 28 May 2014 09:12:33 +0000 (11:12 +0200)]
[FIX] website_mail, websit_mail_group: moved discussion group snippet to the right module; it should not be available when the mailing list archives module is not installed. Also fixed get_alias_info route to be mail_group specific and to avoid allowing people to browse the database.
Richard Mathot [Wed, 28 May 2014 08:35:58 +0000 (10:35 +0200)]
[ADD] website_crm_partner_assign: display demo data on website
Richard Mathot [Wed, 28 May 2014 08:06:42 +0000 (10:06 +0200)]
[TYPO] in crm_partner_assign
Thibault Delavallée [Wed, 28 May 2014 07:59:31 +0000 (09:59 +0200)]
[FIX] website_mail: fixed is_follower controller, that could leak data about records.
Added instead a controller to get alias data. This controller is called by the
discussion group snippet to have the info about the alias.
Fabien Pinckaers [Tue, 27 May 2014 20:50:14 +0000 (22:50 +0200)]
Merge pull request #238 from odoo-dev/saas-4-ir_qweb-contact-chm
[FIX] ir_qweb: contact field must add 'http://' if the website url value has not any protocol
Christophe Matthieu [Tue, 27 May 2014 18:57:00 +0000 (20:57 +0200)]
[FIX] website_sale: search attributes error when the user select a product with a search
Olivier Dony [Tue, 27 May 2014 18:49:49 +0000 (20:49 +0200)]
[MERGE] Forward-port of latest saas-4 fixes, up to 0452851
Christophe Matthieu [Tue, 27 May 2014 16:56:58 +0000 (18:56 +0200)]
[FIX] website_sale: inherit_option_id must be convert in optional='enabled'
Christophe Simonis [Tue, 27 May 2014 16:46:18 +0000 (18:46 +0200)]
[FIX] website: correct bad code indentation introduced during previous commit
Denis Ledoux [Tue, 27 May 2014 16:39:00 +0000 (18:39 +0200)]
[FIX] event_sale, website_event_sale: ACLs for event.event.ticket
event.event.ticket were set in website_event_sale, while this model is set in event_sale module
Manager acl moved from website_event_sale to event_sale
Created a new acl for event user in event_sale
Left the acl for everyone in website_event_sale, meaning that when this module is installed, everyone can read tickets, event those who aren't event user
Christophe Matthieu [Tue, 27 May 2014 16:28:40 +0000 (18:28 +0200)]
[MERGE] from trunk
Christophe Matthieu [Tue, 27 May 2014 16:20:42 +0000 (18:20 +0200)]
[FIX] website_sale: search by attributes not work for more of one selection
Christophe Matthieu [Tue, 27 May 2014 16:07:26 +0000 (18:07 +0200)]
[FIX] website_sale: fix the product attribute templates to display the comma
Christophe Matthieu [Tue, 27 May 2014 16:03:15 +0000 (18:03 +0200)]
[FIX] product: don't create new variants if the product.template is create by product.product.
Christophe Simonis [Tue, 27 May 2014 15:57:33 +0000 (17:57 +0200)]
[MERGE] Replace inherit_option_id by a selection field (PR #229)
Christophe Matthieu [Tue, 27 May 2014 15:35:52 +0000 (17:35 +0200)]
[IMP] product: add demo data for variants
Olivier Dony [Tue, 27 May 2014 15:18:43 +0000 (17:18 +0200)]
[MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da
Christophe Simonis [Tue, 27 May 2014 15:10:28 +0000 (17:10 +0200)]
Merge pull request #228 from xmo-odoo/extended-view-inheritance
Extended view inheritance
Thibault Delavallée [Tue, 27 May 2014 14:57:31 +0000 (16:57 +0200)]
[MERGE] [ADD] module: payment_buckaroo acquirer: manage payments using Buckaroo.
Olivier Dony [Tue, 27 May 2014 14:50:02 +0000 (16:50 +0200)]
[MERGE] Forward-port of latest 7.0 bugfixes, up to aeaa826
Martin Trigaux [Tue, 27 May 2014 14:37:10 +0000 (16:37 +0200)]
Merge pull request #221 from odoo-dev/7.0-o2m-duplication-issue-msh
[FIX] Fix o2m record duplication when clicking on a button
The button action will execute a write call, creating the new line.
The reload is necessary to avoid recreating the line when using the save button.
Josse Colpaert [Tue, 27 May 2014 14:32:21 +0000 (16:32 +0200)]
[IMP] Package bar code printing from barcode itf
Fabien Meghazi [Tue, 27 May 2014 14:13:43 +0000 (16:13 +0200)]
Merge pull request #239 from odoo-dev/master-revert-bundles
Revert "Merge pull request #225 from odoo-dev/master-frontend-assets"
Fabien Meghazi [Tue, 27 May 2014 14:12:52 +0000 (16:12 +0200)]
Revert "Merge pull request #225 from odoo-dev/master-frontend-assets"
This reverts commit
dd900408ded4ece90df5f80f36daa049bc8f0e5b, reversing
changes made to
4da882d48ffd09651b66e72a6e5c87e76d05a346.
Denis Ledoux [Tue, 27 May 2014 14:11:27 +0000 (16:11 +0200)]
[FIX] website_sale: in the product grid, a product must have min size 1 and max size 4
Mohammed Shekha [Tue, 27 May 2014 14:05:09 +0000 (19:35 +0530)]
[FIX]Refixed the issue of o2m record duplication
Richard Mathot [Tue, 27 May 2014 13:51:09 +0000 (15:51 +0200)]
[BACKPORT][FIX] base_gengo: use supported/up-to-date library
Commit backported from master
8ad97da843bbd5c34f44dc4d5f7a4942179cf7b8
Thibault Delavallée [Tue, 27 May 2014 13:35:17 +0000 (15:35 +0200)]
[CLEAN] website_mail: cleaned a lost console.log and a commented line that should have been removed with pr 213
Christophe Matthieu [Tue, 27 May 2014 13:13:44 +0000 (15:13 +0200)]
[FIX] ir_qweb: contact field must add '' if the website url value has not any protocol
Thibault Delavallée [Tue, 27 May 2014 13:02:26 +0000 (15:02 +0200)]
Merge pull request #234 from odoo-dev/master-fix-sale-test-tde
[FIX] website_sale, website_event_sale: updated JS tests according to the new dom of the checkout page introduced in pull request 232
Martin Trigaux [Tue, 27 May 2014 12:46:31 +0000 (14:46 +0200)]
Merge pull request #202 from lyinfo/master-fix-zero-qweb-field
[FIX]t-field wrong outputs when precision is 0