pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,860 Commits 1 Branch 0 Tags
8974e928fa9f9b54ef3fbaf685aedbcccd2c755d
Commit Graph
89860 Commits
This Branch
This Branch
All Branches
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 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
Fabien Meghazi 3458eb3ef7 Add docstring to help command 2014-05-27 17:07:40 +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
Géry Debongnie 1602ba44c9 [FIX] correctly include some inputs in drawer 
The search view has been split into two widgets: SearchView
and SearchViewDrawer.  The addons board and google_spreadsheet need
to be updated to append their input widget to SearchViewDrawer and
not to SearchView.
 2014-05-27 14:44:21 +02:00
Christophe Matthieu 2efb074733 [IMP] website_sale: use company vat_check_vies field to select the method to check the vat id base_vat is installed 2014-05-27 14:35:07 +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
Fabien Meghazi dec8172866 [ADD] odoo deploy 2014-05-27 14:22:28 +02:00
Géry Debongnie 70052e1fd6 [FIX] correct some issues with scrolling area 
the height of the oe_view_manager_header is variable, and the top can't
be positioned correctly with pure css without a lot of work, so this
commit adds a touch of javascript to make sure that the view is
correctly positioned.
 2014-05-27 14:21:52 +02:00
Thibault Delavallée 7c86e2aa30 Merge pull request #232 from odoo-dev/saas-4-mass_mailing-fixes-tde 
[FIX] mass_mailing: fixes in mail (default recipients), mass_mailing (recipients computation), web (chardomain widget)
 2014-05-27 14:16:39 +02:00
Christophe Matthieu 57e6ee4c4e [IMP] website_hr_recruitment: Search by country or/and department or/and by office. Default search by country with GeoIP 2014-05-27 13:50:40 +02:00
Josse Colpaert 04e86a70d9 [IMP] Show quantity available 2014-05-27 13:39:38 +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
Fabien Meghazi 6085a8301b Merge remote-tracking branch 'odoo/master' into master-odoo-cmd-fme 2014-05-27 12:52:08 +02:00
Christophe Matthieu 59be055c37 [IMP] website_sale: if base_vat is installed, when the use try to validate checkout, the vat is checked (VAT Information Exchange System) 2014-05-27 12:49:16 +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
Christophe Matthieu b5833591dc [IMP] website_sale: add vat field on checkout 2014-05-27 12:05:41 +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