pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,746 Commits 1 Branch 0 Tags
f61339b82cd6993f00a91149fb5dca7a2bfb8ab1
Commit Graph
89746 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Fabien Meghazi 4b8814fa9e Prevent scaffold --init to be executed in another module 2014-05-28 19:32:55 +02:00
Fabien Meghazi a9eba4dc40 Detect if controller name correspond to a model name 2014-05-28 19:16:50 +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
Fabien Meghazi 6b678f376e Use ast module against __init__.py's for import discovery 2014-05-28 18:49:16 +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
Denis Ledoux 3f6f43214f [FIX] replace .bzrignore by .gitignore, as we are now working with git 2014-05-28 18:17:33 +02:00
Denis Ledoux 65d7cc524d [FIX] purchase: Do not allow to delete a purchase order line which is validated 
This restriction behavior copied from the sale.order model
Moreover, the purchase.order lines state were not set to cancel when the purchase order was cancelled.
This is now the case, this behavior is also coped from the sale.order model
When the purchase order is reset to draft, we also reset the order lines state to draft
 2014-05-28 18:00:11 +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
Fabien Meghazi ce764477e6 [WIP] models and controllers for scaffolding 2014-05-28 17:10:56 +02:00
Géry Debongnie f4bcf5fa28 [FIX] adjust viewtop when breadcrumbs are involved 
due to the way breadcrumbs work, the method adjust_view_top was
not called at the correct time.  This had the unfortunate consequence
that the main view was on top of the header.
 2014-05-28 16:44:54 +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
Géry Debongnie 24f0e80e2e Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-05-28 13:18:07 +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
Fabien Meghazi ba85b80f32 Basic scaffolding 2014-05-28 11:31:00 +02:00
Fabien Meghazi ac0b9d066c Added odoo.py command 2014-05-28 11:29:54 +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
Géry Debongnie 5cc8f9ca42 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-05-28 10:37:16 +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 Meghazi 397784cef0 reuse cls.__doc__ for deploy command 2014-05-28 09:25: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
Martin Trigaux 41c5ceb8eb [FIX] stock: clean previous commit 2014-05-27 17:56:30 +02:00
Martin Trigaux 1ef2c18103 [FIX] stock: auto_validate move not set to done when multiple parent move set to done at the same time (opw 607970) 2014-05-27 17:47:28 +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