pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
77,137 Commits 1 Branch 0 Tags
ef08891248558bdf7865368cbfc4cc085f55b186
Commit Graph
77137 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Mathot (OpenERP) ef08891248 [REF] moving validation methods from controller to models 
bzr revid: rim@openerp.com-20131129092732-615xgq8z62jyuhd9
 2013-11-29 10:27:32 +01:00
Richard Mathot (OpenERP) 19578dbc7b [MERGE] Merge parents 
bzr revid: rim@openerp.com-20131129085234-3t8kqglqmnabdqf2
 2013-11-29 09:52:34 +01:00
Richard Mathot (OpenERP) 65c9704954 [IMP] Survey Kanban view 
[REM] Unused code in survey.py

[REF] Code cleaning

bzr revid: rim@openerp.com-20131129084914-z76feeg813q38l25
 2013-11-29 09:49:14 +01:00
Fabien Pinckaers b6cb210865 [IMP] Adding sponsorship to events 
bzr revid: fp@tinyerp.com-20131128220546-3kr49k0cmv24qs49
 2013-11-28 23:05:46 +01:00
Christophe Matthieu 0eeb29ac08 [MERGE] trunk-website-demo-partner-bth 
bzr revid: chm@openerp.com-20131128173621-ge78agxfpmxcbytu
 2013-11-28 18:36:21 +01:00
Christophe Matthieu 32ec9cccdd [IMP] website: views for drag and drop snippets 
bzr revid: chm@openerp.com-20131128160851-xmepb4h6n0logclo
 2013-11-28 17:08:51 +01:00
Christophe Matthieu 20a0119ed6 [IMP] website: hide publish/edit button on editable mode 
bzr revid: chm@openerp.com-20131128143646-fl3okv6wisqio8xq
 2013-11-28 15:36:46 +01:00
Christophe Matthieu a58a43632d [IMP] product: add fnct_inv for lst_price field 
bzr revid: chm@openerp.com-20131128101556-1h4h87va3wuk1kd1
 2013-11-28 11:15:56 +01:00
Christophe Matthieu 079aececdf [FIX] website_sale: get_website_sale_domain overited in website_event 
bzr revid: chm@openerp.com-20131128095142-3ez3vaiht8ppr4oh
 2013-11-28 10:51:42 +01:00
Richard Mathot (OpenERP) 92b55fe2a5 [MERGE] Merge parents 
bzr revid: rim@openerp.com-20131128074434-b26j3l7q4kes1xww
 2013-11-28 08:44:34 +01:00
Richard Mathot (OpenERP) a2ed06f6be [IMP] Anwser storage (part) 
bzr revid: rim@openerp.com-20131128074418-gwdavf4iq47jlh2q
 2013-11-28 08:44:18 +01:00
Fabien Meghazi 07eaace3ee [ADD] custom website ir.http#dispatch and rerouting 
bzr revid: fme@openerp.com-20131127170432-z7d1w4ck03d7wwia
 2013-11-27 18:04:32 +01:00
Christophe Matthieu d1d1754ff4 [FIX] website snippet: background of quotes slider 
bzr revid: chm@openerp.com-20131127165914-i4tgbj1fi1q2dqin
 2013-11-27 17:59:14 +01:00
Christophe Matthieu b37be42fd6 [FIX] website: in all popups, always order buttons in the same order 
bzr revid: chm@openerp.com-20131127161627-fwokmahwvp8jxhgl
 2013-11-27 17:16:27 +01:00
Thibault Delavallée 1421d02e59 [IMP] payment_acquirer_paypal: cleaning + addition of basic s2s methods 
The paypal module is now better included in the payment_acquirer process, using standard method naming. Added some logging / cleaning in the code.

Added generic s2s management in payment_acquirer. Implemented basic specific paypal s2s methods.

Updated and cleaned tests.

[MOV] website_sale: payment_acquirer model update is now located in its own models/payment_acquirer.py file

bzr revid: tde@openerp.com-20131127160924-a0fell523ctnaug3
 2013-11-27 17:09:24 +01:00
Thibault Delavallée 27a01b4620 [FIX] website_event: commented Ecommerce.domin line that make crash the ecommerce when website event is not loaded. 
bzr revid: tde@openerp.com-20131127160249-2fmgyte0l1a84dv6
 2013-11-27 17:02:49 +01:00
Thibault Delavallée abb4fdc647 [FIX] payment_acquirer_paypal: fixed return url management in DPN controller 
bzr revid: tde@openerp.com-20131127160218-v4qkzcike1rm8g6b
 2013-11-27 17:02:18 +01:00
Thibault Delavallée c8142a4e8f [FIX] website_sale: fixed call to website.get_order, located on website model 
bzr revid: tde@openerp.com-20131127160154-v5qpxuh70axz9cck
 2013-11-27 17:01:54 +01:00
Thibault Delavallée 648fbb00ef [IMP] payment_acquirer_paypal: dummy data + removed import of tests 
bzr revid: tde@openerp.com-20131127153619-4g8savetjkn8clap
 2013-11-27 16:36:19 +01:00
Thibault Delavallée 0759dcb6c0 [MERGE] Sync with website-al 
bzr revid: tde@openerp.com-20131127152424-wq2gje9d01t2kw34
 2013-11-27 16:24:24 +01:00
Thibault Delavallée 256269242a [FIX] [IMP] payment_acquirer_paypal: fixed get_status (GET request -> give no data to urllib); cleaned a bit the code, extracted paypal contact to a dedicated method that tries 3 times if internal server error is given back by paypal + cleaned tests 
bzr revid: tde@openerp.com-20131127152042-8va86q3zxsenjy6i
 2013-11-27 16:20:42 +01:00
Christophe Matthieu ec17291b19 [FIX] website: snippet cut the defaulut text 
bzr revid: chm@openerp.com-20131127144252-moppy3j5um58e935
 2013-11-27 15:42:52 +01:00
Christophe Matthieu 5304a26eb0 [FIX] website snippet: fix drop widget 
bzr revid: chm@openerp.com-20131127143119-zlp7iytxexznfrt6
 2013-11-27 15:31:19 +01:00
Thibault Delavallée cea8f80476 [MOV] website_sale: moved payment_transaction code into its own model file 
bzr revid: tde@openerp.com-20131127121820-tgulogxz5x0ikdxd
 2013-11-27 13:18:20 +01:00
Christophe Matthieu 3bb30b1337 [IMP] website_sale: clean code and fix for website_event 
bzr revid: chm@openerp.com-20131127111658-qkp3ovoa64n3dwp2
 2013-11-27 12:16:58 +01:00
Thibault Delavallée a61541a86f [MERGE] Sync with website-al, except paypal and ogone tests 
bzr revid: tde@openerp.com-20131127105652-sjy4sff4j1ua7xl2
 2013-11-27 11:56:52 +01:00
Thibault Delavallée 8bb4e4b1ec [IMP] website_sale: removed last occurence of hardocded euro, using monetary widget instead 
bzr revid: tde@openerp.com-20131127105411-qy5vp5yomsmtii6i
 2013-11-27 11:54:11 +01:00
Xavier Morel b45dfac7fe [ADD] correct handling of setting local urls (pre-existing images from /thing/static) in t-fields 
bzr revid: xmo@openerp.com-20131127104638-ooyuu8dobhzc9a7f
 2013-11-27 11:46:38 +01:00
Fabien Meghazi f6e15b4e4d [FIX] root menu first item triggered on / route 
bzr revid: fme@openerp.com-20131127104307-ju8aqu7uuyrfsnpm
 2013-11-27 11:43:07 +01:00
Christophe Matthieu 633e0f5b81 [ADD] website_event_track: event_backend.xml 
bzr revid: chm@openerp.com-20131127104147-3vreavvu55eafepa
 2013-11-27 11:41:47 +01:00
Christophe Matthieu db17d26b3a [IMP] website_event: create tickets inside add_event. (insead of overwrite create in event_sale) 
bzr revid: chm@openerp.com-20131127103816-fn1dse25djmknylj
 2013-11-27 11:38:16 +01:00
Christophe Matthieu 9fc02cfadc [IMP] event_sale: add a deadline equal datebegin on tickets created if deadline is empty 
bzr revid: chm@openerp.com-20131127102514-zu38sazvzzlb9deh
 2013-11-27 11:25:14 +01:00
ddm ffd0f66ad0 [IMP] Event tour: edit price 
bzr revid: ddm@openerp.com-20131127101946-atfk09jm579jw4t9
 2013-11-27 11:19:46 +01:00
ddm bf5c9b2d32 [IMP] Minor fixes/imps before demo 
bzr revid: ddm@openerp.com-20131127100351-l8l3e651zq0l9m8a
 2013-11-27 11:03:51 +01:00
Christophe Matthieu b397aee6dd [WIP] website_event_track 
bzr revid: chm@openerp.com-20131127092223-kiafrdc62is1dher
 2013-11-27 10:22:23 +01:00
Richard Mathot (OpenERP) 7f81685798 [MERGE] Merge parents 
bzr revid: rim@openerp.com-20131127081851-jfge4e2k88lmt2od
 2013-11-27 09:18:51 +01:00
Richard Mathot (OpenERP) cb1626629c [IMP] Surveys - kanban views 
bzr revid: rim@openerp.com-20131127081828-peh0ea6a0ibibop6
 2013-11-27 09:18:28 +01:00
Fabien Pinckaers 183c75a3c7 [IMP] default values on new events 
bzr revid: fp@tinyerp.com-20131126161424-savrp6u63zmpoq5w
 2013-11-26 17:14:24 +01:00
Richard Mathot (OpenERP) 5336441763 [IMP] Surveys Kanban view refactoring (wip) 
bzr revid: rim@openerp.com-20131126160842-iu8dka7eyf1z6khk
 2013-11-26 17:08:42 +01:00
Xavier Morel 44af6d1e09 [IMP] significantly improve handling of trying to create a new page which already exists 
# Through the menu

Rather than output a generic error (500 due to an IntegrityError),
return a templated 409 letting the user either visit the
page-which-already-exists-with-the-name-he'd-picked or open the page
creation dialog again for a second round.

An alternative would be to promote the website.prompt use to
full-blown dialog as a result of selecting "New Page" and handle the
"page already exists" case without even closing the dialog.

# Through the link dialog

Added an RPC call to check if a page already exists (essentially a
cheaper version of opening /page/whatever and checking whether it's a
200 over JSON-RPC), if the page matching the completion term already
exists, do *not* add the choice of creating the page, only provide
completions from existing pages.

bzr revid: xmo@openerp.com-20131126160148-wrk4zvz9istscwa0
 2013-11-26 17:01:48 +01:00
ddm b3061b9103 [IMP] Improve event tour 
bzr revid: ddm@openerp.com-20131126154853-e0hidlsg9xlrfivu
 2013-11-26 16:48:53 +01:00
Richard Mathot (OpenERP) ebb6a6c954 [IMP] Controller splitted among "start a survey" and "fill a survey" 
[IMP] User input admin view

bzr revid: rim@openerp.com-20131126151726-8en9gh9u9ygcp2uz
 2013-11-26 16:17:26 +01:00
Thibault Delavallée b1cbcb5f2b [TEST] payment_acquirer_paypal, ogone: commented import of tests, because they should not run without having acquirer data configured. Also set website_payment as inactive to avoid having it installed by default on runbot. 
bzr revid: tde@openerp.com-20131126145112-1sqoxj4vtwbd3xzw
 2013-11-26 15:51:12 +01:00
ddm 2abe5f3139 My bad... 
bzr revid: ddm@openerp.com-20131126143851-b1m3fsgdde8a2x0p
 2013-11-26 15:38:51 +01:00
ddm 09a54b25de [IMP] Tour: simplify modal handling 
bzr revid: ddm@openerp.com-20131126141324-3aynn0r5sqpttc90
 2013-11-26 15:13:24 +01:00
Richard Mathot (OpenERP) cb9bfd096a [IMP] Enabling jQueryForms & custom error-403 page 
bzr revid: rim@openerp.com-20131126140348-fsvbyzaybrt172xr
 2013-11-26 15:03:48 +01:00
ddm 03f61a078c [IMP] Event should be editable upon creation 
bzr revid: ddm@openerp.com-20131126132424-irz4fzb4o9nza379
 2013-11-26 14:24:24 +01:00
Richard Mathot (OpenERP) fe139acc4d [MERGE] Merge parents 
bzr revid: rim@openerp.com-20131126130141-lu5r2gy5h5l28irv
 2013-11-26 14:01:41 +01:00
Richard Mathot (OpenERP) ff01a81817 - [IMP] Category becomes res_model 
- [IMP] Correct display of simple_ and multiple_choice

- [IMP] Admin and display of matrices

- [REF] Some code cleaning

bzr revid: rim@openerp.com-20131126125303-ff1zhgbko30nvlxx
 2013-11-26 13:53:03 +01:00
Xavier Morel 3731d33852 [FIX] don't perform page creation when no name was provided 
bzr revid: xmo@openerp.com-20131126124739-djk6nbifyo087bmz
 2013-11-26 13:47:39 +01:00