pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,456 Commits 1 Branch 0 Tags
b8af4775e3acffcea5746361a33494d0bcbf80bb
Commit Graph
88456 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Christophe Simonis b8af4775e3 [IMP] product: improve field labels about variant/attributes distinction 2014-05-30 10:00:54 +02:00
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
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 Matthieu 6958d56a66 [IMP] product: fixes for review 2014-05-28 18:30:03 +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
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 Matthieu 3f69628f96 [FIX] product: recursion error when active field on product.template is modified 2014-05-28 11:29:20 +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
Christophe Matthieu 585511d36e [FIX] website_sale: inherit_option_id must be convert in optional='enabled' 2014-05-27 18:56:58 +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
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
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
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
Thibault Delavallée 4fecb29c51 [FIX] website_sale, website_event_sale: updated tests according to the new dom of the checkout page introduced in pull request 232 2014-05-27 14:22:29 +02:00
Xavier Morel abc50d1041 [IMP] application field doc 2014-05-27 12:26:38 +02:00
Xavier Morel ab7dd57771 [IMP] make mode handling more regular 
Before this commit, @mode=primary would be sorta-ignored[0] if the current
view and its parent had the same model: the current view would *still* get
applied (as an extension) when asking OpenERP for its parent. This commit
makes mode=primary views behave regularly, they are *never* applied when
asking for their parent, only when asking for them or their children.

This allows "forking" views, and using extended views in some contexts without
breaking or duplicating the original view

[0] there was actually a problem when asking for the current view directly,
    first its parent would be resolved by applying it, then it would be
    applied to resolve itself, the view would thus get applied twice (oops)
 2014-05-27 12:23:02 +02:00
Xavier Morel 0f5424eac4 [IMP] replace check_mode python-level constraint by an SQL CHECK constraint 2014-05-27 12:21:52 +02:00
Xavier Morel 9555b32c7b [IMP] add some more explanations for the behavior of the mode attribute on views 2014-05-27 12:20:04 +02:00
Xavier Morel cdd89f4ae6 [FIX] forgot to add primary attribute support to <template> in schema 2014-05-27 12:19:13 +02:00
Xavier Morel 833f5894d2 [FIX] typos 2014-05-27 12:18:22 +02:00
Xavier Morel e06f5b414b [IMP] inherit_option_id -> application 2014-05-27 12:13:51 +02:00
Thibault Delavallée b5a7156f7d Merge pull request #224 from odoo-dev/master-payment-post-tde 
[IMP] website_sale: correctly submit the payment form using a post request, correctly create the tx asynchronously
 2014-05-27 12:09:01 +02:00
Xavier Morel e2f41d09ba [IMP] prevent changing a view from application: always to application: disabled 
not sure that's actually useful, and can still go always -> enabled -> disabled...
 2014-05-27 11:57:07 +02:00
Xavier Morel d82ffb8728 [ADD] application field & check during inheriting views read 2014-05-27 11:57:07 +02:00
Xavier Morel d67161b649 [IMP] renamed some stuff for clarity 2014-05-27 11:57:06 +02:00
Xavier Morel 80c7b6defc [IMP] dict(int: True) -> set(int) 2014-05-27 11:57:06 +02:00
Xavier Morel da4441246e [IMP] use set to collect inherit_id and inherit_option_id 
Also add a few comments to note understanding of code
 2014-05-27 11:57:05 +02:00
Xavier Morel b5cce44dd2 [IMP] use sets to check for groups/ACL 
rco notes that group tests are generally intersections, if the user has *any*
group set on the object he can see/use it. This change is a literal
translation of the original semantics, which may be wrong.
 2014-05-27 11:57:05 +02:00
Xavier Morel 4e3864c1fb [IMP] no need to ensure an actual context if the method does not use it 
just forwarding the context object does not count as using it, if callees want
a context they can ensure they've got one on their own
 2014-05-27 11:57:04 +02:00
Xavier Morel 85c466611a [IMP] don't pointlessly recreate view_obj every time _views_get is called, better use of pool & data APIs 2014-05-27 11:57:04 +02:00
Xavier Morel ad33728043 [IMP] use sorted + key instead of sort + cmp 2014-05-27 11:57:03 +02:00
Xavier Morel 3d91b2dfa2 [REM] unused stack_result parameter 2014-05-27 11:57:03 +02:00
Xavier Morel 8b9f774a22 [ADD] support for primary mode in <template> 
should probably validate that there's an inherit_id (?)
 2014-05-27 11:57:02 +02:00
Xavier Morel da345aaa2d [ADD] use of explicit primary mode in read_combined 2014-05-27 11:57:02 +02:00
Xavier Morel 4e3dbb96b3 [FIX] default_view should be based on mode=primary, not on inherit_id=False 2014-05-27 11:57:01 +02:00
Xavier Morel 434be479f9 [ADD] mode attribute to views 
Not used yet, only defined its relation to inherit_id:

not inherit_id + primary -> ok
not inherit_id + extension -> error
inherit_id + primary -> ok
inherit_id + extension -> ok
 2014-05-27 11:57:01 +02:00
Xavier Morel d9ce012d29 [IMP] simplify handling of callable _constraint message 2014-05-27 11:57:00 +02:00
Xavier Morel d8377a931e [REM] idiotic _invalids attribute, as well as get_invalid_fields 2014-05-27 11:56:59 +02:00
Fabien Meghazi dd900408de Merge pull request #225 from odoo-dev/master-frontend-assets 
[IMP] Move website assets to frontend bundle
 2014-05-27 11:49:28 +02:00