pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,511 Commits 1 Branch 0 Tags
46c55500ffe01dfa2e320bbd72c6d4ee3d908e7d
Commit Graph
79511 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibault Delavallée 46c55500ff [MERGE] Sync with website-al 
bzr revid: tde@openerp.com-20140122171321-6r2q42p7ebfv3kb9
 2014-01-22 18:13:21 +01:00
Thibault Delavallée 055932fc6a [IMP] product: cleaned form in create mode. Moreover generally 
changing the template is not possible anymore; create a new tempalte or a new
variant instead. When creating a new product, you will always create a new
template.
Added the link to the template from the product form view.
Cleaned some code (code move).

bzr revid: tde@openerp.com-20140122170218-6j2sixoxvvbbxvhd
 2014-01-22 18:02:18 +01:00
Xavier Morel f70e542556 [CHG] python 2.6 compat' 
bzr revid: xmo@openerp.com-20140122161727-0inchgb570e1r7pi
 2014-01-22 17:17:27 +01:00
Christophe Matthieu 91f44259b6 [FIX] website_sale: ecommerce_change_pricelist context 
bzr revid: chm@openerp.com-20140122151852-ia7x4sd5l2h7oskx
 2014-01-22 16:18:52 +01:00
Christophe Matthieu 0fe979572b [FIX] website_sale: test tour 
bzr revid: chm@openerp.com-20140122145821-da1l5l5bji39j5mv
 2014-01-22 15:58:21 +01:00
Christophe Matthieu 0c5b6caa10 [FIX] website: payment get pricelist 
bzr revid: chm@openerp.com-20140122145328-5xjhu5uublljqdkx
 2014-01-22 15:53:28 +01:00
ddm@openerp.com 3ddf62ac83 [FIX] HTML editor error reporting 
bzr revid: ddm@openerp.com-20140122142537-as7tyryit0ft0p35
 2014-01-22 15:25:37 +01:00
Fabien Meghazi 92f06e7eab [MERGE] server side login 
bzr revid: fme@openerp.com-20140122133757-hougjgwesg9n9s1p
 2014-01-22 14:37:57 +01:00
ddm@openerp.com bdc1266264 [FIX] HTML editor, reopen template 
bzr revid: ddm@openerp.com-20140122132338-4mhth5fzy8iijxja
 2014-01-22 14:23:38 +01:00
Christophe Matthieu 6979de83cb [FIX] website snippet vs widget on drop 
bzr revid: chm@openerp.com-20140122132159-efse87uk30t0tehv
 2014-01-22 14:21:59 +01:00
Christophe Matthieu d724f00198 [FIX] website_sale: promo code 
bzr revid: chm@openerp.com-20140122124809-9xha1jsnnxaod65z
 2014-01-22 13:48:09 +01:00
Thibault Delavallée d944a652dc [FIX] product: when computing lst_price, that is the public price 
computed based on the template price + margin and extra, use the
pricelist currency if a pricelist has been given. This alows for
example to have 'promo' prices on the ecommerce that are in the
same currency.

bzr revid: tde@openerp.com-20140122120042-ovh2mi70q0beeqwq
 2014-01-22 13:00:42 +01:00
Christophe Matthieu 8256bdfe44 [IMP] website: add a log report in tour test 
bzr revid: chm@openerp.com-20140122112041-id595hkptgzoym6w
 2014-01-22 12:20:41 +01:00
Fabien Meghazi df63fcba81 [MERGE] upstream 
bzr revid: fme@openerp.com-20140122102232-77lvvwpzet58sa7p
 2014-01-22 11:22:32 +01:00
Christophe Matthieu e6c54ca924 [REV] website: ui_test_runner log 
bzr revid: chm@openerp.com-20140122100403-6w2pek1cbmhhra0j
 2014-01-22 11:04:03 +01:00
Thibault Delavallée 363f8561af [MERGE] Sync with website-al 
bzr revid: tde@openerp.com-20140122095911-ufqs8cj827dxkajy
 2014-01-22 10:59:11 +01:00
Thibault Delavallée 38d64147d5 [IMP] product: only template child / multiple template childs form view improvements 
- added a is_only_child field on product.product, telling whether the
product is the only child of the product.template
- improved the product form view, to set readonly all fields coming fgrom
the template when the product is not the only child. This way, the user
is more aware that changing a value in the template changes the value
for all child products. He will have to do those changes on the template
form. A link to the template has been added in the product form view.

bzr revid: tde@openerp.com-20140122095826-8k0wl7af57iiyify
 2014-01-22 10:58:26 +01:00
Christophe Matthieu dcb6ccd711 [FIX] website snippet: on_remove column create parent overlay 
bzr revid: chm@openerp.com-20140122094654-mh426x5aqmyjh8pd
 2014-01-22 10:46:54 +01:00
Christophe Matthieu 0e2b946ff3 [IMP] website snippet: convert column widget into visible snippet (in content category) 
bzr revid: chm@openerp.com-20140122094149-pdnc86o0q0v9aywo
 2014-01-22 10:41:49 +01:00
Fabien Meghazi 060cbedfb0 [IMP] Sign in shall not redirect to website 
bzr revid: fme@openerp.com-20140122085948-18tzsgz2p7f2zqpl
 2014-01-22 09:59:48 +01:00
Christophe Matthieu 35b7cd5d51 [WIP] website_sale: test tour debug 
bzr revid: chm@openerp.com-20140122081321-8mtcqnd5yyx6c2nj
 2014-01-22 09:13:21 +01:00
Christophe Matthieu d9582aa9e4 [WIP] website_sale: test tour error 
bzr revid: chm@openerp.com-20140121221438-6j1231868ex479p2
 2014-01-21 23:14:38 +01:00
Christophe Matthieu 98bdaf4a1c [WIP] website_sale: test tour error 
bzr revid: chm@openerp.com-20140121210506-s11tmbdczs34bkuu
 2014-01-21 22:05:06 +01:00
Christophe Matthieu 0f7e290cd6 [WIP] website_sale: test tour error 
bzr revid: chm@openerp.com-20140121203102-btt5bvn0dxnyx9y2
 2014-01-21 21:31:02 +01:00
Fabien Meghazi ef18e601dd [FIX] Reflect endpoints changes introduced in server's Revision: 5153 revid:fme@openerp.com-20140121195348-mcdreqjo3kod0p7i 
bzr revid: fme@openerp.com-20140121195441-ijt2yjv32v8b39kq
 2014-01-21 20:54:41 +01:00
Christophe Matthieu ec0f811bd1 [WIP] website_sale: test tour: try to find errors 
bzr revid: chm@openerp.com-20140121194714-ln6jc2ibqabx3t1l
 2014-01-21 20:47:14 +01:00
Fabien Pinckaers 9d39a2c1b7 [IMP] better formatting of address 
bzr revid: fp@openerp.com-20140121190242-dfs8difj7tey9fts
 2014-01-21 20:02:42 +01:00
Christophe Matthieu d67fa22ea1 [FIX] website_event: test tour 
bzr revid: chm@openerp.com-20140121172708-bht8omflwve3kibz
 2014-01-21 18:27:08 +01:00
ddm@openerp.com d5afe7e5b9 [FIX] move Google Analytics key to correct group 
bzr revid: ddm@openerp.com-20140121165942-yen9xlfgme5u00o6
 2014-01-21 17:59:42 +01:00
ddm@openerp.com 1c3a7a8fd3 [IMP] Add support for Google Analytics 
bzr revid: ddm@openerp.com-20140121163456-i3v3a7oh8qejc9oo
 2014-01-21 17:34:56 +01:00
Christophe Matthieu 87d6f608da [IMP] website: In the top menu, we should see the active page 
bzr revid: chm@openerp.com-20140121154348-1y6uqc6t2oveae7i
 2014-01-21 16:43:48 +01:00
Christophe Matthieu b38d4d8a81 [FIX] website_blog: tour 
bzr revid: chm@openerp.com-20140121152307-kx92ee0za0w0pprr
 2014-01-21 16:23:07 +01:00
Fabien Meghazi fff55213b5 [IMP] auth_signup converted to server side module 
bzr revid: fme@openerp.com-20140121152027-7wch4r7dt2ew0did
 2014-01-21 16:20:27 +01:00
Xavier Morel c35ac33cf1 [IMP] don't lose link label/text if crap element with no href 
bzr revid: xmo@openerp.com-20140121151310-va8e20avgvzy0anz
 2014-01-21 16:13:10 +01:00
Xavier Morel bf262a338e [ADD] hover edit button on FA glyphs, rename 'Edit x' to 'Change' 
bzr revid: xmo@openerp.com-20140121150843-fm2uqxctlejlwe5c
 2014-01-21 16:08:43 +01:00
ddm@openerp.com cccdc808f9 [FIX] SEO bug + label 
bzr revid: ddm@openerp.com-20140121142052-3u9dcu995p1tdu6b
 2014-01-21 15:20:52 +01:00
Xavier Morel a6ad36ef89 [ADD] attempt to correctly initialize ckeditor widgets (fontawesome icon things at the moment) within a dropped snippet 
bzr revid: xmo@openerp.com-20140121131841-u0qzlk1ytng3af2h
 2014-01-21 14:18:41 +01:00
ddm@openerp.com 35b8850ecc [IMP] add SEO preview 
bzr revid: ddm@openerp.com-20140121125325-641psvqr4w96lsci
 2014-01-21 13:53:25 +01:00
Christophe Matthieu 6d320f6f0b [FIX] website_sale: payement button 
bzr revid: chm@openerp.com-20140121125040-r4o7wdys2hd3437d
 2014-01-21 13:50:40 +01:00
Christophe Matthieu 4ff1af4d01 [FIX] website: display or not editor edit button; website_sale: test tour; website: contact qweb widget 
bzr revid: chm@openerp.com-20140121123912-0ya4ziusj09efti3
 2014-01-21 13:39:12 +01:00
Thibault Delavallée 14bdf21b17 [CLEAN] product: cleaned product template copy method improvements 
bzr revid: tde@openerp.com-20140121122139-j4jmr3jfbaoaamyj
 2014-01-21 13:21:39 +01:00
Thibault Delavallée b3fa81982b [IMP] product: group_product_mono is default 
bzr revid: tde@openerp.com-20140121122120-r2m1r927ne2r12mi
 2014-01-21 13:21:20 +01:00
Thibault Delavallée 744810bbb4 [REV] product: unlink method back, no comment about why it has been 
removed. It is therefore added back.

bzr revid: tde@openerp.com-20140121111421-x35gyqwo9jdpr3d7
 2014-01-21 12:14:21 +01:00
Thibault Delavallée 93711b0f91 [MERGE] Sync with website-al main branch 
bzr revid: tde@openerp.com-20140121105805-msfn6i901v7kr2o3
 2014-01-21 11:58:05 +01:00
Thibault Delavallée b3a4778f26 [IMP] product variant: removed override of fields_view_get and use a "one group or another" 
behavior for product variant. Users are either in group_product_mono or
group_product_variant, allowing to tune the form view according to the
group the user belongs to.
product: added group_product_mono group
sale: added set_group_product_variant method that adds or remove the
group_product_mono according to the group_product_variant being unchecked
or checked.
product: updated form view accordingly

bzr revid: tde@openerp.com-20140121105046-zkbs778upjg0lpyr
 2014-01-21 11:50:46 +01:00
Xavier Morel 51f6977f39 [IMP] icons selection dialog 
remove fixed size checkbox
add fayt for icons (by name)

bzr revid: xmo@openerp.com-20140121100408-64e32iio9r77yx9m
 2014-01-21 11:04:08 +01:00
Thibault Delavallée 28eaa636f0 [MERGE] Merged DKA's branch about product variants in the CMS. Review is coming. 
bzr revid: tde@openerp.com-20140121093832-yp3jl36nsuho74vk
 2014-01-21 10:38:32 +01:00
Christophe Matthieu 3b1fec3220 [FIX] website: double reload in tests process 
bzr revid: chm@openerp.com-20140121083038-63cubvi2bu59klaj
 2014-01-21 09:30:38 +01:00
Darshan Kalola (OpenERP) 9ce241349f [MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al and removed temporary solution. 
bzr revid: dka@tinyerp.com-20140121054638-b7hbckj39vsk93tm
 2014-01-21 11:16:38 +05:30
Christophe Matthieu 53d8280f1d [IMP] website: test class with test for website_sale sale process 
bzr revid: chm@openerp.com-20140120182643-tw65rig4qqi3sqqf
 2014-01-20 19:26:43 +01:00