pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,422 Commits 1 Branch 0 Tags
b50a5bd40c9bf5d3fa4fd2d3d84daa7fc0e36b7e
Commit Graph
79422 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Paramjit Singh Sahota b50a5bd40c [Add] Added the description of the product in the demo data. 
bzr revid: psa@tinyerp.com-20140122071036-dqyxzfohy01idmkp
 2014-01-22 12:40:36 +05:30
Pooja Zankhariya (OpenERP) 6d105922bd [IMP]Removed . near Allow online quotation, Added Partner to Quotation view. 
bzr revid: pza@tinyerp.com-20140121135849-59hs0usf3i36efox
 2014-01-21 18:58:49 +05:00
ajay javiya (OpenERP) 5b976496e1 [IMP]: Add optional product scroll to the pricing instead of top 
-> Hide History and Edit button when print quotation
-> Add signature in customization option and order should not validate if sign is empty
-> Add options to the left menu and remove/hide it if no options available
-> Add sidenav to template
-> Improve Options view(table like pricing)

bzr revid: aja@tinyerp.com-20140121125314-1tom0sjcltegi57c
 2014-01-21 18:23:14 +05:30
Fabien Pinckaers e33c70a318 [IMP] Small improvements: messages 
bzr revid: fp@tinyerp.com-20140120222228-pj7xhlui2cwmnrxw
 2014-01-20 23:22:28 +01:00
Fabien Pinckaers cd3be26606 [IMP] Merge Trunk + Deisgn Improvements 
bzr revid: fp@tinyerp.com-20140120205229-b9726jvb5tfmj3fc
 2014-01-20 21:52:29 +01:00
Fabien Meghazi 4d6e7e2d2e [REM] Remove testing route 
bzr revid: fme@openerp.com-20140120161237-m96w38qd6zqajc12
 2014-01-20 17:12:37 +01:00
Fabien Meghazi 14bb6060d7 [REM] Removed @website.route() decorator 
Need trunk-website-al Rev#5151

bzr revid: fme@openerp.com-20140120153733-ve3dn2kwvha7n3yl
 2014-01-20 16:37:33 +01:00
Christophe Matthieu 46e7638d81 [FIX] website tour: add 'url' triggers 
bzr revid: chm@openerp.com-20140120151637-ac1orinuq49rcqx9
 2014-01-20 16:16:37 +01:00
Christophe Matthieu d175a4fd00 [IMP] website tour: add 'url' triggers; triggers emitter raise an exception if emmitter is undefined 
bzr revid: chm@openerp.com-20140120150614-ra8najdd9hp24y18
 2014-01-20 16:06:14 +01:00
Xavier Morel 620652c420 [FIX] excessive horizontal and vertical offsetting of edition button on images in webkit browsers 
Manually adding margins to offsets was necessary due to
http://bugs.jquery.com/ticket/5445#comment:6 and the original code
using $.fn.position().

When edition buttons were moved to being children of the body (rather
than siblings of the image), $.fn.position() was replaced by
$.fn.offset() (to get the position of the image/link relative to the
body/page toplevel), the adjustment (addition of marginLeft/marginTop)
was left in, even though #5445 does not apply to $.fn.offset().

bzr revid: xmo@openerp.com-20140120144610-nu8q2naemzzhekv2
 2014-01-20 15:46:10 +01:00
Antony Lesuisse 3ad6be4466 point_of_sale restore pristine files 
bzr revid: al@openerp.com-20140120140333-sxg3gh4lgh20teal
 2014-01-20 15:03:33 +01:00
Christophe Matthieu 97da0a2e52 [IMP] website tour: add 'reload' triggers 
bzr revid: chm@openerp.com-20140120133919-hvdsqax5h6n8mlp3
 2014-01-20 14:39:19 +01:00
Pooja Zankhariya (OpenERP) 1c127ac6b9 [MERGE]Merge with Parent 
bzr revid: pza@tinyerp.com-20140120122859-ody7gvh40e3ey0q2
 2014-01-20 17:28:59 +05:00
Christophe Matthieu 7651b8f700 [IMP] website snippet: activate margin bottom resizing for colmd snippet 
bzr revid: chm@openerp.com-20140120111042-nn76p9roezqgdehr
 2014-01-20 12:10:42 +01:00
Christophe Matthieu 9730663537 [IMP] website snippet: add background option on quote slider 
bzr revid: chm@openerp.com-20140120101310-zam2fqzhfegu8rys
 2014-01-20 11:13:10 +01:00
ajay javiya (OpenERP) ffe9398651 [FIX]: add extra canvas on modal 
bzr revid: aja@tinyerp.com-20140120061843-90oxmn16dgi29mtw
 2014-01-20 11:48:43 +05:30
ajay javiya (OpenERP) 5cd399721d [MERGE]: with main 
bzr revid: aja@tinyerp.com-20140120051407-qor80rgyq7ll4xwp
 2014-01-20 10:44:07 +05:30
Fabien Pinckaers 57505a1b24 [IMP] better about us page 
bzr revid: fp@tinyerp.com-20140119203319-ctai57l7kd4v2qxq
 2014-01-19 21:33:19 +01:00
Fabien Pinckaers 986546ae16 [IMP] improved footer CSS, 8 pixels more 
bzr revid: fp@tinyerp.com-20140119200952-6cfsm3wwwv8b6x3x
 2014-01-19 21:09:52 +01:00
Fabien Pinckaers c8919713bf [IMP] left alignment in navbar logo 
bzr revid: fp@tinyerp.com-20140119194441-ug22bg0n3q89nowr
 2014-01-19 20:44:41 +01:00
Fabien Pinckaers c1b96e7ebf [IMP] better demo data logo 
bzr revid: fp@tinyerp.com-20140119194205-z7vossf1x30yftt8
 2014-01-19 20:42:05 +01:00
Fabien Pinckaers a83f1282fa [IMP] CSS for logo, one pixel better 
bzr revid: fp@tinyerp.com-20140119193527-8e7oc1umebqkqxgx
 2014-01-19 20:35:27 +01:00
Fabien Pinckaers 0d20248861 [IMP] typo english 
bzr revid: fp@tinyerp.com-20140119185018-q36c9bwfju38mmwm
 2014-01-19 19:50:18 +01:00
Fabien Pinckaers 40d490f507 [iMP] CSS langs 
bzr revid: fp@openerp.com-20140119182208-owtazt6q3hn3v7wm
 2014-01-19 19:22:08 +01:00
Jojo le bricolo 03606aa347 QWeb cleanups 1 sql query less per page 
bzr revid: jojo_le_bricolo-20140119174642-q2ix8p27ospjkuf4
 2014-01-19 18:46:42 +01:00
Fabien Pinckaers a571dd0849 [IMP] CSS Logo 
bzr revid: fp@tinyerp.com-20140119125357-v5yta1lltm4yo6q4
 2014-01-19 13:53:57 +01:00
Fabien Pinckaers b77b487c4a [IMP] CSS 
bzr revid: fp@tinyerp.com-20140119124958-qz5dsz8m325upphl
 2014-01-19 13:49:58 +01:00
Fabien Pinckaers 71df4bd1db [IMP] CSS logo 
bzr revid: fp@tinyerp.com-20140119123225-f5og62iymz2kacm2
 2014-01-19 13:32:25 +01:00
Fabien Pinckaers d554f09ca7 [IMP] Logo 
bzr revid: fp@openerp.com-20140119122959-etp99cwiuuagws30
 2014-01-19 13:29:59 +01:00
Fabien Pinckaers 5c5334ea4c [IMP] CSS logo 
bzr revid: fp@tinyerp.com-20140119122503-ngjotynnvtvv0rqd
 2014-01-19 13:25:03 +01:00
Fabien Pinckaers 7fb925b095 [IMP] CSS 
bzr revid: fp@tinyerp.com-20140119121715-zmo9x5r234wmqvdj
 2014-01-19 13:17:15 +01:00
Fabien Pinckaers 49d5c0bf1b [IMP] size of logo 
bzr revid: fp@tinyerp.com-20140119121147-frnx3zh9hnayn24z
 2014-01-19 13:11:47 +01:00
Fabien Pinckaers 9cc5ca1672 [IMP] CSS for logo 
bzr revid: fp@tinyerp.com-20140119120949-8pzoe8kx4y612nav
 2014-01-19 13:09:49 +01:00
Fabien Pinckaers 270a25c7f5 [IMP] Allow logo in header 
bzr revid: fp@openerp.com-20140119120858-43rgeymrjmt42f11
 2014-01-19 13:08:58 +01:00
Fabien Pinckaers d7b81d7607 [IMP] Better Snippets 
bzr revid: fp@openerp.com-20140119095213-sd6n0us6mm2o7wt3
 2014-01-19 10:52:13 +01:00
ajay javiya (OpenERP) b6f2b04358 [ADD]: jSignature lib to draw a singnature , and attached it to sale order 
bzr revid: aja@tinyerp.com-20140118104634-r4ss0n01erpyh34j
 2014-01-18 16:16:34 +05:30
Christophe Matthieu 379f3fa3ff [FIX] website_sale: auto set or remove carrier in function of product (service or not) 
bzr revid: chm@openerp.com-20140117173836-s5mpospo9g5xifew
 2014-01-17 18:38:36 +01:00
Christophe Matthieu cf79ae7635 [FIX] website: access for portal user 
bzr revid: chm@openerp.com-20140117154648-sxfisxqcv8o3fvzt
 2014-01-17 16:46:48 +01:00
Christophe Matthieu bcc307560c [FIX] website_sale: update price in payement when the user change the delivery method 
bzr revid: chm@openerp.com-20140117150602-0rdmf0pd2eiocg66
 2014-01-17 16:06:02 +01:00
Christophe Matthieu 163364e5fe [FIX] website_event: event.event.ticket access right 
bzr revid: chm@openerp.com-20140117143752-0jpkcbhjsyavl08j
 2014-01-17 15:37:52 +01:00
ajay javiya (OpenERP) ff51645e03 [MERGE] : with main 
bzr revid: aja@tinyerp.com-20140117101958-k0zkb3dunl5yjf94
 2014-01-17 15:49:58 +05:30
ajay javiya (OpenERP) c707b0edca [IMP]: show alert only post a new message by user 
[FIX] : z-index issue when scroll down to footer
[IMP] : demo data

bzr revid: aja@tinyerp.com-20140117100746-zaa2rgkfp288nl8f
 2014-01-17 15:37:46 +05:30
Fabien Pinckaers a559aca8d1 [IMP] better images for library 
bzr revid: fp@tinyerp.com-20140117082813-7wa345r76txiin97
 2014-01-17 09:28:13 +01:00
Pooja Zankhariya (OpenERP) 722aee5336 [MERGE]Merge with Parent 
bzr revid: pza@tinyerp.com-20140117062056-yaw069hktnsk3iwj
 2014-01-17 11:20:56 +05:00
Fabien Pinckaers c253330993 [IMP] snippets cleaned feature grid 
bzr revid: fp@tinyerp.com-20140116190026-rtkluyf1kh0xisny
 2014-01-16 20:00:26 +01:00
Christophe Matthieu 4ff74cbf99 [IMP] website: editor menus is displayed in function of users groups (event, blog...) 
bzr revid: chm@openerp.com-20140116180535-c736cuxn12qghiea
 2014-01-16 19:05:35 +01:00
Xavier Morel d54544e317 [FIX] portal_crm: access rights merge error 
bzr revid: xmo@openerp.com-20140116161803-22drqqp2srxxknuq
 2014-01-16 17:18:03 +01:00
ajay javiya (OpenERP) c0ce225122 [IMP]: typo and layout 
bzr revid: aja@tinyerp.com-20140116125403-tsabglmi17ge09h1
 2014-01-16 18:24:03 +05:30
Thibault Delavallée a1748260de [MERGE] Due to some issues with the trunk being merged 
in my branch, I merge the legacy website-al branch, in order to perform an fp-style
merge.

Revisions included :
10487 and 10498 from fme that are null (commit and revert)
10488 from xmo: [ADD] dialog for fontawesome glyph manipulation

bzr revid: tde@openerp.com-20140116120949-27dnoa9n2pz0ms6q
 2014-01-16 13:09:49 +01:00
Thibault Delavallée a00d24988f [FIX] product: fixed file whose conflicts markers where still alive. Alive bzr diff 
bzr revid: tde@openerp.com-20140116105508-qfxgox7rvo1ifjtj
 2014-01-16 11:55:08 +01:00