Commit Graph

88635 Commits

Author SHA1 Message Date
Christophe Matthieu 138274e30d [FIX] point_of_sale: fix product view layout 2014-05-28 20:50:20 +02:00
Christophe Matthieu 0017d02469 [FIX] membership: increase priority of product view (don't take this view by default). 2014-05-28 20:49:51 +02:00
Christophe Matthieu 435b5b9ca3 [IMP] product: rename fields variant_ids into attribute_line_ids on the template and attribute_value_ids on the product. 2014-05-28 19:42:15 +02:00
Pariket Trivedi 09dd6e3da6 [IMP] event_sale: extra QWeb report for printing event badges, with HTML fields for custom content 2014-05-28 19:05:11 +02:00
Christophe Matthieu 152ec5bf50 [FIX] product: revert change for price_extra. Need to filter by template to apply the price_extra. 2014-05-28 19:04:23 +02:00
Christophe Simonis d42840a6f8 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
2014-05-28 18:45:12 +02:00
Christophe Matthieu 6958d56a66 [IMP] product: fixes for review 2014-05-28 18:30:03 +02:00
Olivier Dony e276ac33f6 [MERGE] Forward-port saas-4 up to bf135ad 2014-05-28 17:45:31 +02:00
Richard Mathot bf135ad057 [FIX] website_blog: display properly (very) long words in comments 2014-05-28 17:23:28 +02:00
Denis Ledoux 6ed774de61 [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 a37bad205b
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
2014-05-28 15:50:02 +02:00
Denis Ledoux f085274d5f [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. df0ae7e4d1 2014-05-28 14:53:32 +02:00
Thibault Delavallée 57c85a8b7a 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
2014-05-28 14:10:05 +02:00
Denis Ledoux df0ae7e4d1 [FIX] payment_paypal: wrong handling fees computation formula 2014-05-28 14:02:56 +02:00
Christophe Matthieu 3f1e459430 [FIX] mrp_sale: move explode product with wrong bom; change product id 2014-05-28 12:29:56 +02:00
Christophe Matthieu be8e10097d [FIX] mrp: demo data is wrong don't produce ipad but pc 2014-05-28 12:26:57 +02:00
Denis Ledoux 00dc3a59df [FIX] website_sale: force changing pricelist on different account signin
opw-607517
2014-05-28 12:04:41 +02:00
Christophe Matthieu 256a17d419 [IMP] product: rename field variants_ids to respect odoo typo; add demo data for mrp 2014-05-28 11:46:32 +02:00
Christophe Simonis b4283f0271 [FIX] logging PostgreSQLHandler: expand message + use contextmanagers to handle exceptions and cursor 2014-05-28 11:43:24 +02:00
Christophe Matthieu 3f69628f96 [FIX] product: recursion error when active field on product.template is modified 2014-05-28 11:29:20 +02:00
Thibault Delavallée 0c89ca0f8f [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. 2014-05-28 11:12:33 +02:00
Richard Mathot 57e1cc4edd [ADD] website_crm_partner_assign: display demo data on website 2014-05-28 10:35:58 +02:00
Richard Mathot 5f94504c08 [TYPO] in crm_partner_assign 2014-05-28 10:06:42 +02:00
Thibault Delavallée 02018563b3 [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.
2014-05-28 09:59:31 +02:00
Fabien Pinckaers b4adf79ea7 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
2014-05-27 22:50:14 +02:00
Christophe Matthieu c6f0699435 [FIX] website_sale: search attributes error when the user select a product with a search 2014-05-27 20:57:00 +02:00
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Christophe Matthieu 585511d36e [FIX] website_sale: inherit_option_id must be convert in optional='enabled' 2014-05-27 18:56:58 +02:00
Christophe Simonis 045285123f [FIX] website: correct bad code indentation introduced during previous commit 2014-05-27 18:46:18 +02:00
Denis Ledoux cadf582d78 [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
2014-05-27 18:39:00 +02:00
Christophe Matthieu abab5c2e94 [MERGE] from trunk 2014-05-27 18:28:40 +02:00
Christophe Matthieu bb669f82c8 [FIX] website_sale: search by attributes not work for more of one selection 2014-05-27 18:20:42 +02:00
Christophe Matthieu e987cd6c75 [FIX] website_sale: fix the product attribute templates to display the comma 2014-05-27 18:07:26 +02:00
Christophe Matthieu d24aede8d7 [FIX] product: don't create new variants if the product.template is create by product.product. 2014-05-27 18:03:15 +02:00
Christophe Simonis e16233217c [MERGE] Replace inherit_option_id by a selection field (PR #229) 2014-05-27 17:57:33 +02:00
Christophe Matthieu aacde7984f [IMP] product: add demo data for variants 2014-05-27 17:35:52 +02:00
Olivier Dony fd21abd847 [MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da 2014-05-27 17:18:43 +02:00
Christophe Simonis 05fe3ca7e3 Merge pull request #228 from xmo-odoo/extended-view-inheritance
Extended view inheritance
2014-05-27 17:10:28 +02:00
Thibault Delavallée d22e515d52 [MERGE] [ADD] module: payment_buckaroo acquirer: manage payments using Buckaroo. 2014-05-27 16:57:31 +02:00
Olivier Dony 30f43daa3b [MERGE] Forward-port of latest 7.0 bugfixes, up to aeaa826 2014-05-27 16:50:02 +02:00
Martin Trigaux aeaa826d2f 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.
2014-05-27 16:37:10 +02:00
Josse Colpaert 81222bc47f [IMP] Package bar code printing from barcode itf 2014-05-27 16:32:21 +02:00
Fabien Meghazi bb2760d3cc Merge pull request #239 from odoo-dev/master-revert-bundles
Revert "Merge pull request #225 from odoo-dev/master-frontend-assets"
2014-05-27 16:13:43 +02:00
Fabien Meghazi 0544fc2929 Revert "Merge pull request #225 from odoo-dev/master-frontend-assets"
This reverts commit dd900408de, reversing
changes made to 4da882d48f.
2014-05-27 16:12:52 +02:00
Denis Ledoux 63b7f678f3 [FIX] website_sale: in the product grid, a product must have min size 1 and max size 4 2014-05-27 16:11:27 +02:00
Mohammed Shekha 26cb208903 [FIX]Refixed the issue of o2m record duplication 2014-05-27 19:35:09 +05:30
Richard Mathot b2ff7ef41d [BACKPORT][FIX] base_gengo: use supported/up-to-date library
Commit backported from master 8ad97da843
2014-05-27 15:53:25 +02:00
Thibault Delavallée 61d27543c5 [CLEAN] website_mail: cleaned a lost console.log and a commented line that should have been removed with pr 213 2014-05-27 15:35:17 +02:00
Christophe Matthieu fe74741594 [FIX] ir_qweb: contact field must add 'http://' if the website url value has not any protocol 2014-05-27 15:13:44 +02:00
Thibault Delavallée c24848fea9 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
2014-05-27 15:02:26 +02:00
Martin Trigaux 3b32464ed2 Merge pull request #202 from lyinfo/master-fix-zero-qweb-field
[FIX]t-field wrong outputs when precision is 0
2014-05-27 14:46:31 +02:00