pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
77,850 Commits 1 Branch 0 Tags
18d8368ee11eef0a74bacdb8f293414331bfa8da
Commit Graph
77850 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Paramjit Singh Sahota 18d8368ee1 [MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al 
bzr revid: psa@tinyerp.com-20131224053125-3lrogsrgd3ccp0i6
 2013-12-24 11:01:25 +05:30
Fabien Pinckaers 123185757f [IMP] wording 
bzr revid: fp@tinyerp.com-20131223173304-mvetk8b2494hup93
 2013-12-23 18:33:04 +01:00
ddm 7c695446b8 bzr revid: ddm@openerp.com-20131223165708-3fz1mk6s9bmlvxka 2013-12-23 17:57:08 +01:00
ddm 2648d55033 [IMP] Refactor UI test code for reusability 
bzr revid: ddm@openerp.com-20131223165113-kx4aalzs6las1m2z
 2013-12-23 17:51:13 +01:00
ddm cbfadb48a0 [IMP] UI tests code cleanup (python) 
bzr revid: ddm@openerp.com-20131223162234-2cicx8ffnjrp24s4
 2013-12-23 17:22:34 +01:00
ddm 71a5a4a9f4 [IMP] UI tests: removed useless break 
bzr revid: ddm@openerp.com-20131223161032-ipncw5lfxmdrjz9x
 2013-12-23 17:10:32 +01:00
ddm ddb551cbd6 [FIX] Banner tour test 
bzr revid: ddm@openerp.com-20131223154653-44ws3k6o6u4tegjn
 2013-12-23 16:46:53 +01:00
ddm 39c5b09e6e [IMP] Banner tour automated test 
bzr revid: ddm@openerp.com-20131223152503-saqpy0d8vgvg9p20
 2013-12-23 16:25:03 +01:00
ddm 65f48d0ce7 [IMP] PhantomJS UI test code 
bzr revid: ddm@openerp.com-20131223145436-nqrwtsg5avqml7qw
 2013-12-23 15:54:36 +01:00
ddm faae14704d [IMP] PhantomJS UI error reporting 
bzr revid: ddm@openerp.com-20131223144603-xxuml794a91nt2sc
 2013-12-23 15:46:03 +01:00
ddm dbe5c06d95 [IMP] PhantomJS UI tests code cleanup 
bzr revid: ddm@openerp.com-20131223144100-h8eui7szdj40e2mo
 2013-12-23 15:41:00 +01:00
ddm fbea33821b [IMP] PhantomJS test with authentication 
bzr revid: ddm@openerp.com-20131223143547-sgx2shqf9vg52e9j
 2013-12-23 15:35:47 +01:00
ddm 54224e4f3c [FIX] Remove debugging code 
bzr revid: ddm@openerp.com-20131223135644-8ri2jbco8khjtlyq
 2013-12-23 14:56:44 +01:00
ddm 8fd5fb82a7 [IMP] Added simple DOM UI test as example 
bzr revid: ddm@openerp.com-20131223135425-9hxb4nmvdr0rrb3t
 2013-12-23 14:54:25 +01:00
ddm 4a7143d329 [IMP] Sleep a little between reads 
bzr revid: ddm@openerp.com-20131223102826-u3z9i9ohy7s1d8nb
 2013-12-23 11:28:26 +01:00
ddm 063ebff8f5 [IMP] Code style + doc 
bzr revid: ddm@openerp.com-20131223101701-1o9qvlwk96axpd1l
 2013-12-23 11:17:01 +01:00
ddm 726fd3f2bc [FIX] Handle timeout in UI tests 
bzr revid: ddm@openerp.com-20131223100003-h8qhzmk61dz9bzon
 2013-12-23 11:00:03 +01:00
Fabien Pinckaers cd0913cb6a [IMP] css print 
bzr revid: fp@tinyerp.com-20131222232118-w4ig4wktyeg017d5
 2013-12-23 00:21:18 +01:00
Fabien Pinckaers ba2689e70c [FIX] don't crash on empty dates [IMP] default dates on demo tracks 
bzr revid: fp@tinyerp.com-20131222230021-9a03x3eiwi4e780x
 2013-12-23 00:00:21 +01:00
Fabien Pinckaers 0851024ede [IMP] Removing default application of filters 
bzr revid: fp@tinyerp.com-20131222224753-6nekdnpihl2c9qfc
 2013-12-22 23:47:53 +01:00
Fabien Pinckaers e52b050b2e [IMP] Removing default application of filters 
bzr revid: fp@tinyerp.com-20131222224604-8hun4wxupejuglo4
 2013-12-22 23:46:04 +01:00
Fabien Pinckaers 91b683a50a [IMP] social widget on events 
bzr revid: fp@tinyerp.com-20131222223423-7syxqgff7mswfhh8
 2013-12-22 23:34:23 +01:00
Fabien Pinckaers 2be80c2205 [IMP] Social widget on tracks 
bzr revid: fp@tinyerp.com-20131222223038-5qp9uqytacwfgoo4
 2013-12-22 23:30:38 +01:00
Fabien Pinckaers ca9e6f1905 [IMP] no tracks 
bzr revid: fp@tinyerp.com-20131222222843-2usk92v6prqf37j0
 2013-12-22 23:28:43 +01:00
Fabien Pinckaers 597e50d5c5 [IMP] manifest website_event_track draft, no img 
bzr revid: fp@tinyerp.com-20131222191157-96o3n0g2jwbh7tjv
 2013-12-22 20:11:57 +01:00
Fabien Pinckaers 6348760a1d [IMP] tgemplate agenda 
bzr revid: fp@tinyerp.com-20131222183839-vsurx5kewk8oicfs
 2013-12-22 19:38:39 +01:00
Fabien Pinckaers 59f2888441 [IMP] tgemplate agenda 
bzr revid: fp@tinyerp.com-20131222183757-is0ts4v8lqbajhy1
 2013-12-22 19:37:57 +01:00
Fabien Pinckaers 301085c8fe [IMP] Agenda 
bzr revid: fp@tinyerp.com-20131222183632-jkzhe3muu8gz2h9o
 2013-12-22 19:36:32 +01:00
Fabien Pinckaers 786398cac0 [IMP] speaker on tracks for events 
bzr revid: fp@tinyerp.com-20131222175100-8k8nz355ylso4o7g
 2013-12-22 18:51:00 +01:00
Fabien Pinckaers 1c23347bec [IMP] Well 
bzr revid: fp@tinyerp.com-20131222174957-fxcw5jh0aag8qbkk
 2013-12-22 18:49:57 +01:00
Fabien Pinckaers ef77ac935b [IMP] better tempaltes for talks 
bzr revid: fp@tinyerp.com-20131222174804-2l2yjzk690qjon1q
 2013-12-22 18:48:04 +01:00
Fabien Pinckaers a2d100783b [IMP] Tracks 
bzr revid: fp@tinyerp.com-20131222164711-hwlqosx7gbd60rf8
 2013-12-22 17:47:11 +01:00
Fabien Pinckaers 521e73a679 [IMP] Event tracks, not finished 
bzr revid: fp@tinyerp.com-20131222150229-mhukvwlis5nzbmpl
 2013-12-22 16:02:29 +01:00
Fabien Pinckaers 9cc6b3c30f [IMP] event tracks, done track submission, a few data, some fixes 
bzr revid: fp@tinyerp.com-20131222144057-8vxt7mouxako39wp
 2013-12-22 15:40:57 +01:00
Thibault Delavallée 049f0c26e1 [MERGE] [FIX] payment_acquirer: fixed browsing a transaction using a wrong model 
[FIX] paypal: fixed a typo in transaction validation

Courtesy of Joshua Jan (SHINEIT)

bzr revid: tde@openerp.com-20131220082609-y8d15fb4onck534h
 2013-12-20 09:26:09 +01:00
JoshuaJan 8b84cbeeb4 [fix][typo] 
bzr revid: popkar77@gmail.com-20131219150042-7yyfrpb5m2vsy2be
 2013-12-19 23:00:42 +08:00
JoshuaJan 1d0423b9ad [wrong model]not payment.acquirer but payment.transaction 
bzr revid: popkar77@gmail.com-20131219145716-cybxgkamyyrnn238
 2013-12-19 22:57:16 +08:00
Thibault Delavallée 38e22d1808 [MERGE] [IMP] website_sale_delivery: make the module effectively works. 
- added support in the front-end to choose and carrier and update the quotation
- added override of payment controller in website_sale_delivery to handle the carrier
and recompute the amount and details
- some code cleaning
- added amount_delivery field in sale.order, that is the amount related to the
delivery
- added some wrappers on _amount_all method of the sale.order model, in order to be able to use inheritance for this method
- fixed shipping values management in website_sale + fixed shipping partner finding
- improved the cart to display only product lines, the delivery amount is displayed below the quotation total

[FIX] email_template: fixed a bug with pre-loading the template that was preventing to send a quotation by email

bzr revid: tde@openerp.com-20131219112219-kjvzfukcfur6f8g5
 2013-12-19 12:22:19 +01:00
Thibault Delavallée 86fc66e797 [FIX] website_sale: checkout process: fixed carrier choice redirection 
bzr revid: tde@openerp.com-20131219105122-awib6gys6uklbvxa
 2013-12-19 11:51:22 +01:00
Thibault Delavallée 348a2bda96 [FIX] website_sale: get_total_quantity -> get_number_of_products 
[FIX] website_sale: fixed domain to find the shipping_partner_id

bzr revid: tde@openerp.com-20131219103732-84nrt5xlqyqbwsns
 2013-12-19 11:37:32 +01:00
Thibault Delavallée e2b07d5d7d [MERGE] Sync with website-al 
bzr revid: tde@openerp.com-20131219102240-43nvqj9hkzn5ymt2
 2013-12-19 11:22:40 +01:00
Fabien Meghazi af1e65ffdb [IMP] Use cursor: text for editable .btn's 
bzr revid: fme@openerp.com-20131219093410-lgr1f54nehaz9fk0
 2013-12-19 10:34:10 +01:00
Fabien Meghazi 375e440c2e [ADD] Markers for vim 
bzr revid: fme@openerp.com-20131219093329-s5oumfhwyw0pevfy
 2013-12-19 10:33:29 +01:00
Fabien Meghazi b180d69808 [IMP] Better events naming for EditorBar height related stuff 
bzr revid: fme@openerp.com-20131218201619-vja6dv0sctokep3b
 2013-12-18 21:16:19 +01:00
Fabien Meghazi 9abcc28884 [IMP] Set EditorBar height programmatically 
bzr revid: fme@openerp.com-20131218173915-ds5jeyfypbaefrqf
 2013-12-18 18:39:15 +01:00
ddm 2381c44441 [IMP] UI test runner code doc 
bzr revid: ddm@openerp.com-20131218152352-mclkpnjpzvqsibqh
 2013-12-18 16:23:52 +01:00
ddm 50ab1e551e [IMP] Cleanup UI tests 
bzr revid: ddm@openerp.com-20131218151702-68m9z9wm31rj5g2f
 2013-12-18 16:17:02 +01:00
ddm 245a6aafa9 [FIX] Fix UI test runner 
bzr revid: ddm@openerp.com-20131218150056-xqueu19zpm17nlpj
 2013-12-18 16:00:56 +01:00
ddm 4f0ad3f64a [IMP] Basic support for ui tests 
bzr revid: ddm@openerp.com-20131218145628-9oqxlwy4g05n4jwa
 2013-12-18 15:56:28 +01:00
Thibault Delavallée 9315134b7d [IMP] website_sale_delivery: delivery costs also in review + removed the button to update the sale order as it is now directly updated when choosing a carrier 
bzr revid: tde@openerp.com-20131218142759-j4j7jznjyobyrfy6
 2013-12-18 15:27:59 +01:00