odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
88,635 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

88635 Commits

Author SHA1 Message Date
etenesaca 2097af20b7 * Deleted: oe_m2o_dropdown_option_no_results_to_show AND REUSED oe_m2o_dropdown_option 
* Deleted: manually translation in es.po
 2014-05-26 11:51:24 -05:00
etenesaca b6189b4d5a Merge remote-tracking branch 'odoo/master' 2014-05-26 11:29:48 -05:00
Fabien Meghazi a91a12e67f Merge pull request #216 from odoo-dev/master-import-module-wizard-tpa 
[IMP] Add 'Import Module' wizard to base_import_module
 2014-05-26 17:30:29 +02:00
Fabien Meghazi fc9d0d9ab0 [FIX] typo 2014-05-26 17:26:19 +02:00
Martin Trigaux 8b546d20ad Merge pull request #203 from buke/7.0 
[FIX] delivery: when computing the weight and volume, use the quantity converted to the product uom instead of the uom of the purchase order.
 2014-05-26 17:07:14 +02:00
Denis Ledoux a37bad205b [FIX] web: on launching ir_actions_act_window, reset the active_* params if the target is current 
This commit is related to 8d49639933 and b88755c431
When hitting buttons of type object, the active_model and active_id(s) were kept, and, therefore, when calling a feature using the active* args, this feature used the active* args from the previous action.
Nevertheless, concerning wizards, the active* args should be indeed the active* args of the previous action, as wizards expects to have the active* args from the previous action. Thus, we reset these active* args only when this is not a wizard (target === 'current')
For example, from a sales order, hit the 'view invoice' button, and on the invoice, hit the 'send by email' button: The active_id in the send by email wizard were the id of the sale order, not of the invoice
 2014-05-26 17:05:02 +02:00
Richard Mathot e137a7713b [FIX] website_sale: test did not load js properly and failed 2014-05-26 16:58:14 +02:00
etenesaca 0aa4203d41 Merge remote-tracking branch 'odoo/master' 2014-05-26 09:55:11 -05:00
Fabien Meghazi 06b10a8ef2 Merge remote-tracking branch 'odoo/master' into master-import-module-wizard-tpa 2014-05-26 16:52:41 +02:00
Martin Trigaux 1779495f79 Merge pull request #188 from blaggacao/patch-2 
Removed confusing doubled check box "child_depend" in the tax view
 2014-05-26 16:28:57 +02:00
Fabien Meghazi 532b979f60 Merge pull request #210 from odoo-dev/saas-4-fix-partner-grade-access-fme 
[FIX] access rights for public user on res.partner.grade
 2014-05-26 16:12:15 +02:00
Fabien Meghazi 1e68947a16 Merge pull request #212 from odoo-dev/master-fix-sitemap-urls-fme 
[FIX] sitemap.xml urls
 2014-05-26 15:03:19 +02:00
Fabien Meghazi 5cc1317a5f [FIX] sitemap.xml urls 2014-05-26 14:58:30 +02:00
Martin Trigaux c4d63fe364 Merge pull request #207 from joshuajan/7.0 
'invoiced' fields help message is wrong
the purchase order is set as invoiced when every line has a validated invoiced.
 2014-05-26 14:35:04 +02:00
Martin Trigaux ba4ce723fd Merge pull request #209 from odoo-dev/master-forum-users-row-mat 
[FIX] website_forum: display the users as a table in block of 3 cols
 2014-05-26 14:26:18 +02:00
Fabien Meghazi 125ec49099 [FIX] duplicate xmlid 2014-05-26 14:25:37 +02:00
Martin Trigaux dcb4b610e2 [FIX] website_forum: display the users as a table in block of 3 cols 2014-05-26 13:37:58 +02:00
Martin Trigaux 49d29cd2e0 Merge pull request #208 from odoo-dev/master-contributing-mat 
Add contributing.md file
 2014-05-26 13:05:20 +02:00
Martin Trigaux c0e326eb9b Update contributing.md 2014-05-26 12:55:58 +02:00
Martin Trigaux 41c4090d20 typo 2014-05-26 12:22:59 +02:00
Martin Trigaux 34c490e40f Adding bug report example and fixing typos 2014-05-26 12:21:23 +02:00
JoshuaJan e6973e2c64 'invoiced' fields help message is wrong 2014-05-26 17:55:26 +08:00
Denis Ledoux 1e84f72899 [FIX] website_forum: do not check if the user has the group comment 
This access rights checks is meaningful for website_blog only
 2014-05-26 11:49:26 +02:00
Martin Trigaux ecffb93f76 Adding basic contribution guidelines 2014-05-26 11:39:48 +02:00
Fabien Meghazi aa3009bb27 [FIX] access rights for public user on res.partner.grade 2014-05-26 11:24:58 +02:00
Denis Ledoux fa5cfcd67e [FIX] hr_recruitment: default company set according to department company 2014-05-26 11:20:40 +02:00
buke 1971141dc5 Fixed delivery grid get_price 
It's wrong for cal weight in delivery gird . It's use product.weight * qty.
 2014-05-26 17:12:38 +08:00
kevin wang 9bfa02386c [FIX]t-field wrong outputs when precision is 0 2014-05-26 17:06:49 +08:00
Richard Mathot 2a2f7af62e Merge pull request #200 from odoo-dev/saas-4-w3validation-rim 
[FIX] website: DOM fixes according to W3C Validator
 2014-05-26 10:42:24 +02:00
Richard Mathot b4c47bcf85 [FIX] website: SEO js 2014-05-26 09:43:01 +02:00
Richard Mathot e01725d15a [FIX] website: SEO promote box 2014-05-26 08:53:54 +02:00
Richard Mathot b0e263d00f [REF] website: shorter tag for charset 2014-05-26 08:51:38 +02:00
Richard Mathot 2012ee998d [FIX] website: remove illegal HTML attribute 2014-05-26 08:51:38 +02:00
Richard Mathot 8fb320e86f [FIX] website: remove illegal HTML attribute 2014-05-26 08:51:38 +02:00
Richard Mathot e28c810123 [FIX] website: convert non-standard HTML metatag to data attribute 2014-05-26 08:51:38 +02:00
Richard Mathot df94bddac8 [FIX] website: not well-formed HTML 2014-05-26 08:51:38 +02:00
etenesaca d97b044274 Merge remote-tracking branch 'odoo/master' 2014-05-23 16:05:49 -05:00
David Arnold 6e8e22f1be Removed confusing doubled check box "child_depend" 
This checkbox caused greate confusion, as it was doubled in the tax form view. Field is already present in line 937

Thanks for merging.
 2014-05-23 14:01:16 -05:00
Denis Ledoux be0ce80f5f [FIX] account_analytic_analysis: set false to price_unit in product_id_change in form view, so the price unit is reset when the product id is changed 2014-05-23 17:58:00 +02:00
sle-odoo 3a3590b6f7 Merge pull request #119 from odoo-dev/saas-4-report-fixes-sle 
[FIX] Multiple report fixes including better handling of rendering a report with one worker (and the removal of the workers creation) and some report views changes (address block more to the left)
 2014-05-23 17:37:23 +02:00
Denis Ledoux c59427d23f [FIX] purchase: po email template, the currency could be different than the pricelist currency 2014-05-23 17:13:42 +02:00
Denis Ledoux 7ccd8fdcc7 [FIX] mail: push to breadcrumb on subject, author or notified partners links click 
opw-608251: When coming from website > My account, and clicking on a lead link from a message in the inbox, and then deleting the lead, the history_back is triggered and we come back in the website, while we should have come back in the inbox. This is because the action performed was not pushed in the breadcrumb
 2014-05-23 15:54:43 +02:00
Simon Lejeune 2d7c890939 Merge remote-tracking branch 'odoo/saas-4' into saas-4-report-fixes-sle 2014-05-23 15:38:56 +02:00
xmo-odoo 14fb733ab2 Merge pull request #183 from odoo-dev/urlencodify 
Improve handling of website image fields
 2014-05-23 15:13:13 +02:00
Xavier Morel 327dda0bde [FIX] correctly handle invalid max_width/max_height passed to website._image 2014-05-23 15:11:13 +02:00
Xavier Morel 4362c6127f [IMP] use url_encode when building url query string 
I have no idea why I originall implemented that crap via string munging.
 2014-05-23 15:03:23 +02:00
Mitesh Savani daba406886 [IMP]Move assetss to frontend template. 2014-05-23 18:31:01 +05:30
Thibault Delavallée f7e0b2dd15 Merge pull request #125 from odoo-dev/saas-4-website-mail-group-tde 
[MERGE] website_mail_group: cleaning and usability improvement of this web module
- refactored the website templates that were basically impossible to use
- fixed display by thread / date and navigation
- added information about group email, participants, messages, ...
 2014-05-23 13:43:00 +02:00
Thibault Delavallée 9fadd0b04c [IMP] website_mail_group: display previous / next message when browsing + take into account thread or date mode. 2014-05-23 13:17:33 +02:00
Denis Ledoux 51c7b55da0 [FIX] request.handle_exception: cleanup override logic, fixed chain broken by commit a096ae0 
handle_exception() is supposed to try handling an exception and if it cannot,
re-raise it. Overridden methods must therefore call super() within a try/except
block, and only attempt to handle the exception if super() raised.
 2014-05-23 13:15:52 +02:00