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

72287 Commits

Author SHA1 Message Date
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Christophe Simonis 045285123f [FIX] website: correct bad code indentation introduced during previous commit 2014-05-27 18:46:18 +02:00
Christophe Simonis e16233217c [MERGE] Replace inherit_option_id by a selection field (PR #229) 2014-05-27 17:57:33 +02:00
Olivier Dony fd21abd847 [MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da 2014-05-27 17:18:43 +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
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
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
Thibault Delavallée c93d169fde [FIX] mail: fixed get_default_recipient, trying to call a method even if the target model do not have it; also fixed default recipients generation on the contact model; sending a mass mailing when not having recipient now raise a warning. 2014-05-27 13:33:10 +02:00
Thibault Delavallée a26a0e6d30 [FIX] web: chardomain widget: fixed selection of some records in a list (bad domain formatting), fixed domain evaluation tah is done server-side instead of through a stringigy. 2014-05-27 13:31:12 +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 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
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
Thibault Delavallée a6379e2e67 [IMP] payment addons: fixed submit buttons: now have type=submit (and not image or nothing) and removed name, because this may cause issues when trying to submit a form manually with type=submit and a name. Also improved js code in website_sale to correctly handle the click binding, the asynchronous call to the server to create the transaction, and then submit the form. As form submission is synchronous in javascript, we cannot use the deferred. Instead we prevent the click event from bubbling, wait for the server to create the transaction, adn then manually submit the form. 2014-05-27 11:35:32 +02:00
--global ed51e843a2 [IMP] website_sale: change 'pay now' button behavior. 
Now: intercept the call, make an asynchronous call to create the tx, then continue to the acquirer. Previous this was done by
a redirection, leading to a get request beign done. However it should be a post request.
 2014-05-27 11:35:32 +02:00
Fabien Meghazi 51e10ffbac Indentation 2014-05-27 11:16:57 +02:00
Fabien Meghazi 1744208928 Changed xpath expression from /t to . 2014-05-27 10:45:07 +02:00
Martin Trigaux 14c300bdbd Merge pull request #223 from odoo-dev/7.0-ail-form-context-parent-mat 
account: safer access to parent in invoice line form
 2014-05-27 10:32:53 +02:00
Denis Ledoux c6c8fb06a9 [FIX] account_followup: account_followup_print report, sxw according to rml 2014-05-27 10:29:12 +02:00
Martin Trigaux 222e7915a6 [FIX] account: safer access to parent in invoice line form 
In the account.invoice.line form, do not assume the parent is defined when
evaluating the context to invoice_line_tax_id as we could come from another
view (e.g.: purchase order line form).
Fixes #206
 2014-05-27 10:16:44 +02:00
Richard Mathot af72adcd64 [DIRTY FIX] website_sale: make the runbot green 2014-05-27 10:01:58 +02:00
Thibault Delavallée b26b3f9701 Merge pull request #213 from odoo-dev/saas-4-group-snippet-imp-tde 
[IMP] website_mail: improved snippet to subscribe to a mail.group
 2014-05-27 09:26:10 +02:00
Richard Mathot 88202680ea [FIX] website_event_sale: bad xpath in template 2014-05-27 09:18:31 +02:00
Thibault Delavallée ef2c068ec3 [IMP] website_mail: improved snippet to subscribe to a mail.group. 
Main modifications :
- layout: input - button when not following, links (email - archives - unsubscribe) when following
- when adding your email, update all other subscribe snippets input in the page to avoid havign to re-type it
- management of fields of the record to subscribe to, used to have access to the alias of the group
 2014-05-27 08:54:37 +02:00
Mitesh Savani d89064c73c [IMP]Improved code 2014-05-27 10:45:04 +05:30
Mohammed Shekha 477fa85e55 [FIX]Fixe the issue o2m record duplication. 2014-05-27 10:10:06 +05:30
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