pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,720 Commits 1 Branch 0 Tags
32897bf4eef7dd10c6ff3e19e13bd87985f6062d
Commit Graph
76720 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibault Delavallée 32897bf4ee [MERGE] Sync with website-al 
bzr revid: tde@openerp.com-20131121132413-lyngpz4c23kocmye
 2013-11-21 14:24:13 +01:00
Christophe Matthieu dc8ef4da30 [FIX] website_sale: fix product editor and move edit code in website_sale.editor.js 
bzr revid: chm@openerp.com-20131121132317-ysa25sdqqx8dg1wo
 2013-11-21 14:23:17 +01:00
Christophe Matthieu 07819834bb [FIX] website_sale: filter controller and shop/?category=37 --> shop/category/37 
bzr revid: chm@openerp.com-20131121130529-1zs3ioih5156ceit
 2013-11-21 14:05:29 +01:00
Christophe Matthieu 31f64313c0 [IMP] website snippet: create website.snippet.StyleEditor to add styles with html class and other logical process into snippet options 
bzr revid: chm@openerp.com-20131121123439-wvvcdegvc1bornux
 2013-11-21 13:34:39 +01:00
Xavier Morel a9b228880b [FIX] hacky image edit button to be less hacky, fix image fields edition/save 
bzr revid: xmo@openerp.com-20131121121731-4ux9gxt8ltluw9e5
 2013-11-21 13:17:31 +01:00
Xavier Morel 82b40bf84c [FIX] urlparse.parse_qs returns a dict *of lists*, eq test on values with a string is always false 
bzr revid: xmo@openerp.com-20131121121235-hafy7n61h3v6kb0k
 2013-11-21 13:12:35 +01:00
Thibault Delavallée bc726e4da7 [MERGE] Sync with website-al 
bzr revid: tde@openerp.com-20131121120935-srk3s4qhxar0k5l5
 2013-11-21 13:09:35 +01:00
Thibault Delavallée 2693636989 [IMP] website_sale: improved checkout process 
- confirmation is now a page displaying a sale order, which polls on the
related transaction to have its status
- when receiving an incoming notification thorugh the acquirer controller
the sale order is updated, then the confirmation page is displayed
- this allows to have a confirmation page that is independant from the 
rest of the checkout process
- cleaned confirmation page, removed order details

bzr revid: tde@openerp.com-20131121120902-fm8b7u94gmepohgi
 2013-11-21 13:09:02 +01:00
Thibault Delavallée 3ee84c32d2 [IMP] payment_acquirer_transfer: better logging 
bzr revid: tde@openerp.com-20131121120745-1j7p7pl5u6yv1g20
 2013-11-21 13:07:45 +01:00
Thibault Delavallée bfc226c4ae [REM] payment_acquirer: removed name field, only using reference 
bzr revid: tde@openerp.com-20131121120722-uxjqdn5ibnrs0k10
 2013-11-21 13:07:22 +01:00
ddm 56e19c374f [FIX] Avoid reserved keywords as method names 
bzr revid: ddm@openerp.com-20131121114922-w731pvjnnvqzxu42
 2013-11-21 12:49:22 +01:00
ddm 135345bf2a [IMP] Tour: better modal handling 
bzr revid: ddm@openerp.com-20131121113507-qmz5inlge2ixkib8
 2013-11-21 12:35:07 +01:00
ddm 77c60a94be [IMP] Tour: method names 
bzr revid: ddm@openerp.com-20131121112312-2n8kd2tja6upji3i
 2013-11-21 12:23:12 +01:00
ddm ec4372ac23 [IMP] Tour: better defaults 
bzr revid: ddm@openerp.com-20131121111102-l66jzdysdkqm7fje
 2013-11-21 12:11:02 +01:00
Xavier Morel fee8cb0fff [FIX] reimplement [Edit] button on images 
Button implementation turned out to be crap:

* Didn't work at all in Firefox (!)

* Unreliable in webkit, some types of image selection wouldn't
  correctly activate the button

->

* changed RTEImageDialog to take an (optional) image element, used as
  the "source element" if provided. This allows greater reliability
  for events which may leave selection in debatable or variable
  (across browsers) state

* setup and teardown button on hover, using selection triggered issues
  with oe_overlay thing where e.g. the first click on the button would
  work but the second one would not (it'd be intercepted by the
  overlay as far as I can tell).

  This also saves a click for user, they will see the [Edit] button
  immediately when putting the cursor over the image.

bzr revid: xmo@openerp.com-20131121110748-s5e2ne3etpzwi2a6
 2013-11-21 12:07:48 +01:00
Xavier Morel 2985681366 [FIX] fixup snippets json controller for lazyresponse changes 
bzr revid: xmo@openerp.com-20131121095959-lwi6mnge684pxi1q
 2013-11-21 10:59:59 +01:00
Thibault Delavallée 04818e7584 [FIX] website_sale: fixed some 'add cart' buttons not working 
bzr revid: tde@openerp.com-20131121094816-w8ulontnt9kv5zbf
 2013-11-21 10:48:16 +01:00
Fabien Meghazi 7d43b226ab [IMP] Use LazyResponse for website.render() 
bzr revid: fme@openerp.com-20131120202842-zethge8jykzlzjjy
 2013-11-20 21:28:42 +01:00
ddm 2f0f411b43 [FIX] Tour bug with snippet editor 
bzr revid: ddm@openerp.com-20131120155444-yn5fovlq0q3dkpau
 2013-11-20 16:54:44 +01:00
ddm eb23569c9e [IMP] Blog tour add first section 
bzr revid: ddm@openerp.com-20131120154042-8byh7l4eifchcfe8
 2013-11-20 16:40:42 +01:00
ddm ba8364c717 [IMP] Better file naming 
bzr revid: ddm@openerp.com-20131120142631-e4fsdx2vw7q3u3pp
 2013-11-20 15:26:31 +01:00
Thibault Delavallée d5ac601823 [MERGE] Sync with website-al 
bzr revid: tde@openerp.com-20131120140414-zf1qiepxueyrhn4j
 2013-11-20 15:04:14 +01:00
Thibault Delavallée 5dcb10fc01 [IMP] website_sale: end of checkout process improvements 
- added a controller that validates the payment: confirm the quotation (if paid)
and send it by email
- some fixes in payment routes
- some cleaning in payment template, removed unnecessary code, added a class on a
div to ease the submit button management

bzr revid: tde@openerp.com-20131120140321-mderltwy8xp2vfn4
 2013-11-20 15:03:21 +01:00
Thibault Delavallée 91be9da35b [CLEAN] payment_acquirer_ogone: removed unnecessary call to self.pool.get 
bzr revid: tde@openerp.com-20131120140158-rrb439gnx4rs5zyg
 2013-11-20 15:01:58 +01:00
Thibault Delavallée 9bca2bbaac [IMP] payment_acquirer, payment_acquirer_transfer 
- payment_acquirer: added base method for form-based validation
calling various model-dependant methods.

[FIX] payment_acquirer: fixed tx values not given to form to render
when having no custom method for a specific acquirer

- payment_acquirer_transfer: added form validation, using the new
acquirer method. Updated controllers. Updated generated form to include
tx details. Fixed method for form_action_url taht was missing.

bzr revid: tde@openerp.com-20131120140119-8zuvm2ypr5arvf5y
 2013-11-20 15:01:19 +01:00
Thibault Delavallée 4fb0880259 [IMP] email_template: already generate tmeplate values in default_get 
bzr revid: tde@openerp.com-20131120135904-r630n937txivqak9
 2013-11-20 14:59:04 +01:00
ddm bdafd44f06 [IMP] Tour cleanup 
bzr revid: ddm@openerp.com-20131120133234-s0r81qnqg74l4wlt
 2013-11-20 14:32:34 +01:00
Xavier Morel aa2208f580 [IMP] sass/compass use in website.sass 
bzr revid: xmo@openerp.com-20131120124451-25m26kao051x6tam
 2013-11-20 13:44:51 +01:00
Christophe Matthieu 6b10be15b2 [IMP] website snippet: add group for styles snippets, add custom picture with style snippet, mouseover and mouseout preview, fix dark css class in demo data 
bzr revid: chm@openerp.com-20131120115250-etqv5ofqguze0zsj
 2013-11-20 12:52:50 +01:00
ddm 00580f106e [IMP] Event tour continue 
bzr revid: ddm@openerp.com-20131120111841-vrei1vmt14trw5kh
 2013-11-20 12:18:41 +01:00
ddm 2420f814e8 [IMP] Event tour steps 
bzr revid: ddm@openerp.com-20131120111817-0c9s61c433mlw901
 2013-11-20 12:18:17 +01:00
ddm f5fc2dd4ff [IMP] Event tour scaffholding 
bzr revid: ddm@openerp.com-20131120111721-uw7xiizsh0wd7n3y
 2013-11-20 12:17:21 +01:00
ddm c706db9b79 [IMP] Tour code cleanup 
bzr revid: ddm@openerp.com-20131120110757-lq4gnmxj9nf1e7p0
 2013-11-20 12:07:57 +01:00
ddm e8858b02a6 [IMP] Simplify tour declaration II 
bzr revid: ddm@openerp.com-20131120110233-1hoc40q2wrs0739d
 2013-11-20 12:02:33 +01:00
ddm 10e7a76ae4 [IMP] Simplify tour declaration 
bzr revid: ddm@openerp.com-20131120105205-u5w4167rposrfazd
 2013-11-20 11:52:05 +01:00
ddm be6c14c5b6 [IMP] Shop tour code cleanup 
bzr revid: ddm@openerp.com-20131120104107-hoiu7n6cq68qf69u
 2013-11-20 11:41:07 +01:00
ddm 6e043bca3b [IMP] Blog tour code cleanup 
bzr revid: ddm@openerp.com-20131120103907-06dfmxjhq7ad18wz
 2013-11-20 11:39:07 +01:00
ddm e7872e0f93 [IMP] Blog tutorial first steps 
bzr revid: ddm@openerp.com-20131120102420-idavehs3hgb8y7v6
 2013-11-20 11:24:20 +01:00
ddm bb15c21dc9 [IMP] Blog tour scaffolding 
bzr revid: ddm@openerp.com-20131120094423-ra4e6xmmty6pmpk2
 2013-11-20 10:44:23 +01:00
Thibault Delavallée d1bc4d3766 [MERGE] Sync with website-al 
bzr revid: tde@openerp.com-20131120091851-mtln13mmv8amuau7
 2013-11-20 10:18:51 +01:00
Xavier Morel fd02a389e9 [REM] apparently unnecessary icons 
bzr revid: xmo@openerp.com-20131120091147-4vshzojq6mwhvice
 2013-11-20 10:11:47 +01:00
Xavier Morel 36b21e3eca [REM] CKEDITOR development source, 4.3 final added to web client 
bzr revid: xmo@openerp.com-20131120080142-x5vewroum39jwn3g
 2013-11-20 09:01:42 +01:00
Thibault Delavallée e4443ee3ce [IMP] payment_acquirer_transfer: WIP about makign this module actually work. 
- improved form: using acquirer.message to display custom message, like the account number
- added controllers; form will directly send to a controller that will validate the
sale order, then back to the payment checkout process.

bzr revid: tde@openerp.com-20131119180400-m6okb7empnpnre2p
 2013-11-19 19:04:00 +01:00
Thibault Delavallée d598c988ff [CLEAN] payment_acquirer_transfer: module cleaning, removed dummy tests, simplified form button to only display the acquirer message 
bzr revid: tde@openerp.com-20131119173302-6plxxftcivjapnd4
 2013-11-19 18:33:02 +01:00
Thibault Delavallée 5fddd6b6f2 [CLEAN] payment_acquirer_ogone: misc cleaning + code cleaning in controller 
bzr revid: tde@openerp.com-20131119172645-h4d2iiesp8wi1z7f
 2013-11-19 18:26:45 +01:00
Thibault Delavallée ff8498fff0 [ADD] payment_acquirer: added message field, displaying information about the process specific to the acquirer 
bzr revid: tde@openerp.com-20131119172516-peyefk8ciz2hip57
 2013-11-19 18:25:16 +01:00
Thibault Delavallée 18e45e9c1e [CLEAN] payment_acquirer: mise cleaning 
bzr revid: tde@openerp.com-20131119164428-sq30m2jg1lcps00t
 2013-11-19 17:44:28 +01:00
Thibault Delavallée fe1841e23a [DOC] payment_acquirer: added comments in payment_acquirer and payment_transaction models, removed unnecessary licence 
bzr revid: tde@openerp.com-20131119164102-dzhiynea3dgtad53
 2013-11-19 17:41:02 +01:00
Christophe Matthieu e41e8f3957 [IMP] website_hr_recruitment: clear url path 
bzr revid: chm@openerp.com-20131119161403-wsqwgfi9w3ythjeg
 2013-11-19 17:14:03 +01:00
ddm 7a91653e50 [IMP] Changed tour message based on apr's request 
bzr revid: ddm@openerp.com-20131119161311-33to93uqz7mr2t5m
 2013-11-19 17:13:11 +01:00