pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,462 Commits 1 Branch 0 Tags
d660e00a38830a0cfe194309c19a43cbe59e9a53
Commit Graph
76462 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Meghazi ec09c0fa2c [ADD] Added website_id in client side context. 
This allow us to comply to the 'ids' argument of website's model method (if needed)

bzr revid: fme@openerp.com-20131025074343-6nqgte7lzj7uhopj
 2013-10-25 09:43:43 +02:00
Launchpad Translations on behalf of openerp 8bc457816f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131024052057-4ai7sltsmuoke8l5
bzr revid: launchpad_translations_on_behalf_of_openerp-20131025060100-ua2rf6g9urivk8bm
 2013-10-25 06:01:00 +00:00
Fabien Meghazi a597cc59ef [WIP] menus 
bzr revid: fme@openerp.com-20131024141840-ihp2i6huzdlamf94
 2013-10-24 16:18:40 +02:00
Xavier Morel c8dd901b04 [FIX] todo/notes 
bzr revid: xmo@openerp.com-20131024141024-3kdx3jfcsn8vzsyg
 2013-10-24 16:10:24 +02:00
Xavier Morel a2a3f46d72 [FIX] 'inline' set_image_data 
bzr revid: xmo@openerp.com-20131024135730-321532upt3aq5esw
 2013-10-24 15:57:30 +02:00
Christophe Simonis 2859897815 [FIX] allow falsy extra attributes on fields. 
bzr revid: chs@openerp.com-20131024135448-e2bpgaqu7mvg1icn
 2013-10-24 15:54:48 +02:00
Launchpad Translations on behalf of openerp 7345cfb697 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131019052730-g67chkz69pmoi5q4
bzr revid: launchpad_translations_on_behalf_of_openerp-20131020050443-pce4qrtn25h1qir6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131023052203-fvk0akb3avqxkqje
bzr revid: launchpad_translations_on_behalf_of_openerp-20131024052015-8kg0owfhye4ws3xw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131025060039-0t8928ck7dgi8yv6
 2013-10-25 06:00:39 +00:00
Xavier Morel 39fb50d43d [REM] explicit cache clearing, fixing ir.translation instead 
bzr revid: xmo@openerp.com-20131024131613-6hebrxi5dbbs82ph
 2013-10-24 15:16:13 +02:00
Xavier Morel c38f729543 [FIX] auth of pagenew 
bzr revid: xmo@openerp.com-20131024111710-5ghadng4we3p2cgg
 2013-10-24 13:17:10 +02:00
Thibault Delavallée 980ec4bc9e [FIX] website_blog: contact us button in blog leading to 
website.contactus page instead of doing nothing.

bzr revid: tde@openerp.com-20131024121430-ab84qfdulomukkf4
 2013-10-24 14:14:30 +02:00
Thibault Delavallée 9f0dcae234 [FIX] website_blog: read_more link was wrong, leading to a 404. 
The website_blog route is blog/<blog_id>, nothing related to category anymore.

bzr revid: tde@openerp.com-20131024113539-v3e7oi9j67vp27sx
 2013-10-24 13:35:39 +02:00
Thibault Delavallée 2cc18c153e [REV] Reverted a change in _openerp__.py in website_sale, because 
this was just for local tests.

bzr revid: tde@openerp.com-20131024111453-tqjx4st6js5qnoz4
 2013-10-24 13:14:53 +02:00
Thibault Delavallée 0467c8a5ab [FIX] [WIP] website_sale: fix crash when having product templates without variant. 
probably it should not be displayed, but as there does not seem to exist any
clue about what the controller / view should do, I added some protections.

[DOC] added some comments because some methods seems quite weird.

bzr revid: tde@openerp.com-20131024110453-uj4xnrtwst0fdcrb
 2013-10-24 13:04:53 +02:00
Thibault Delavallée 258846a697 [FIX] [WIP] website_sale: Tries to fix method 
that does things not commented on things that do not necessarily exist.

Does it hurt you to put some docstrings ?

bzr revid: tde@openerp.com-20131024105524-eattmf2s52ekztn3
 2013-10-24 12:55:24 +02:00
Xavier Morel b702a9887c [IMP] remove /website/attachment, make attachments go through /website/image 
bzr revid: xmo@openerp.com-20131024103401-yik03je9qm1ge0tp
 2013-10-24 12:34:01 +02:00
Thibault Delavallée fc513a2a1f [IMP] website: publish management 
'Edit' using a wrench is removed, replaced by an entry in the options menu.
The button text size is also increased, because currently in xsmall it is not
matching the website look.

Also re-indented the template.

bzr revid: tde@openerp.com-20131024093420-3vye9g2j11b3y602
 2013-10-24 11:34:20 +02:00
ddm 3ff98b4050 [IMP] eCommerce: remove duplicate button 
bzr revid: ddm@openerp.com-20131024092438-aelgmzbcpvwmf33p
 2013-10-24 11:24:38 +02:00
ddm bffc22b391 [IMP] Consistency 
bzr revid: ddm@openerp.com-20131024092057-p26cnzy9q37zuc6s
 2013-10-24 11:20:57 +02:00
Thibault Delavallée 357676b6de [MERGE] [FIX] tools: mail: fixed shortening of html content. 
Fixed length computation of text in html nodes: multiples successive whitespaces are considered as one whitespaces; better truncate position when adding a read more link; now always protect words (placed after the first word that exceeds the shorten position); pre nodes are preserved about whitespaces; when the read more link should go into a quote, it instead goes at the end of the first parent node not being quoted instead of at a wrong position.

Misc :
- removed an unnecessary loop by merging two root.iter() that do not interfere
- changed occurrences of getiterator to iter, because getiterator is deprecated
- nodes are cleaned after processing, removing all attributes used to tag nodes
- fixed a bug about cleaning span containing only whitespaces not always cleaned

Added tests for shorten position.

bzr revid: tde@openerp.com-20131024084411-pytwt9g1gdmoebzc
 2013-10-24 10:44:11 +02:00
Thibault Delavallée dbe253b0e4 [FIX] Fixed bug due to copy-and-paste: outertext is now valid 
bzr revid: tde@openerp.com-20131024083955-ipbsf8rxbzm0mag3
 2013-10-24 10:39:55 +02:00
Launchpad Translations on behalf of openerp 95bca0c031 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131024052102-y6y20mjt0raox65i
 2013-10-24 05:21:02 +00:00
Launchpad Translations on behalf of openerp 0ae4b7dc93 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131024044442-55ny33bhhxic8yq3
 2013-10-24 04:44:42 +00:00
Olivier Dony 9b7398820e [DOC] stock: for the record, rationale for stock.location.complete_name being stored 
bzr revid: odo@openerp.com-20131023163247-bir34amewsxiby2t
 2013-10-23 18:32:47 +02:00
Olivier Dony 9dce48185f [IMP] portal_hr: avoid shadowing parent _description for no reason 
bzr revid: odo@openerp.com-20131023163108-ic3xp7yt3lx4bmkx
 2013-10-23 18:31:08 +02:00
Olivier Dony 0354391b10 [IMP] crm: defaults can be literals 
bzr revid: odo@openerp.com-20131023163029-z3q0ve4jykanibkv
 2013-10-23 18:30:29 +02:00
Olivier Dony a0fab67694 [FIX] hr_holidays: leave holiday overlap should ignore cancelled/refused ones 
Obviously a cancelled leave does not really
overlap with a new one.

bzr revid: odo@openerp.com-20131023162928-56vdsjxr8sa4n3jv
 2013-10-23 18:29:28 +02:00
Olivier Dony 5add0d31f3 [IMP] hr.employee: default search should includes work emails (useful e.g. for trigrams) 
bzr revid: odo@openerp.com-20131023162807-qjw68383a7612op6
 2013-10-23 18:28:07 +02:00
Christophe Simonis d7f9722a83 [FIX] web: bind RouteMap using environ to allow correct redirections 
bzr revid: chs@openerp.com-20131023162646-9t8iu2okkddg56yi
 2013-10-23 18:26:46 +02:00
Olivier Dony b1c221e9c4 [FIX] hr: notification about new employee joining should only be sent to employees (base.group_user) 
In the future we should directly use the
`Whole Company` mail.group, but this does
not work well enough now, as recipients
will not be able to directly go to the
employee record (e.g. to follow her)

bzr revid: odo@openerp.com-20131023155340-z2e78xo3vb7yq008
 2013-10-23 17:53:40 +02:00
ddm d5379f3b7c [FIX] eCommerce cart layout 
Fixed 'Continue Shopping' button spacing when cart empty

bzr revid: ddm@openerp.com-20131023154639-j7385c9oaka2k3g1
 2013-10-23 17:46:39 +02:00
Martin Trigaux eee78a1803 [FIX] stock_invoice_directly: if picking is not done while doing partial picking, create invoice on this backorder instead of the current picking 
bzr revid: mat@openerp.com-20131023153432-o7p90h9vmsp04ujb
 2013-10-23 17:34:32 +02:00
Martin Trigaux 20b9015339 [FIX] stock_invoice_directly: if picking is not done while doing partial picking, create invoice on this backorder instead of the current picking 
lp bug: https://launchpad.net/bugs/1060259 fixed

bzr revid: mat@openerp.com-20131023151342-328egar30upq5d5u
 2013-10-23 17:13:42 +02:00
Xavier Morel 1eb3d3269c [ADD] parsing of localized date & datetime t-fields 
turns out we use a bunch of them in the events section thing

bzr revid: xmo@openerp.com-20131023145729-tglusl27mt6ajwzn
 2013-10-23 16:57:29 +02:00
ddm 62bdd7bd9c [FIX] Fixed eCommerce pager 
bzr revid: ddm@openerp.com-20131023145152-smhlpc0eydvos7sx
 2013-10-23 16:51:52 +02:00
bth-openerp c7ddd83bb2 [REM]Removed image. 
bzr revid: bth@tinyerp.com-20131023135506-olydfbpmvtq9vt8h
 2013-10-23 19:25:06 +05:30
bth-openerp acc7d965f1 [IMP]Improved. 
bzr revid: bth@tinyerp.com-20131023132529-kvtvs64mnu8so4pr
 2013-10-23 18:55:29 +05:30
bth-openerp 9f098d3e77 [IMP]Add demo data for company slogan. 
bzr revid: bth@tinyerp.com-20131023132004-9vlx3kcpefg1yz81
 2013-10-23 18:50:04 +05:30
bth-openerp f0b7eedd9e [IMP]Name given. 
bzr revid: bth@tinyerp.com-20131023131753-3txmnp97k4smq5fx
 2013-10-23 18:47:53 +05:30
bth-openerp 5810455fec [IMP]Removed code. 
bzr revid: bth@tinyerp.com-20131023131632-k0t4um32ypa0hlyg
 2013-10-23 18:46:32 +05:30
Xavier Morel 1ce3230d13 [IMP] don't completely wedge the RTE in case save fails. This may well break snippets entirely in case of save failure. 
bzr revid: xmo@openerp.com-20131023130918-j5s81t0j60gitr1t
 2013-10-23 15:09:18 +02:00
Thibault Delavallée e14de7a637 [FIX] Fixed previous commit, car go to len of the string. 
bzr revid: tde@openerp.com-20131023123839-gvf9ugft2b2xmo9a
 2013-10-23 14:38:39 +02:00
bth-openerp e84f95360f [MERGE]Merge trunk-website-al. 
bzr revid: bth@tinyerp.com-20131023123435-nfv542f67ndogazl
 2013-10-23 18:04:35 +05:30
bth-openerp 6a1bde2151 [ADD]Added logo which is removed in last revision. 
bzr revid: bth@tinyerp.com-20131023123254-gd1rrqjdbqoj7iya
 2013-10-23 18:02:54 +05:30
Thibault Delavallée 7f61d18ef9 [CLEAN] tools: cleaned modified code 
bzr revid: tde@openerp.com-20131023122744-3b3hayy4f8ss2bjx
 2013-10-23 14:27:44 +02:00
bth-openerp eb3ef77319 [IMP]Put static image as not getting customize option when coming dynamically. 
bzr revid: bth@tinyerp.com-20131023122735-s9had1vgl90g6zz1
 2013-10-23 17:57:35 +05:30
bth-openerp 32169579f2 [IMP]Image and slogan from res company and added image in background. 
bzr revid: bth@tinyerp.com-20131023120354-ltvzoxwby6dbaytv
 2013-10-23 17:33:54 +05:30
Denis Ledoux 6bf5d02627 [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 3859 rev-id: dle@openerp.com-20131023110926-tc2n3oqg0l2ga138 
bzr revid: dle@openerp.com-20131023113414-mlwppd4d7vyh1tyj
 2013-10-23 13:34:14 +02:00
Denis Ledoux 3279b24128 [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 3748 rev-id: dle@openerp.com-20131023103308-18pj2gqq3imrcir7 
bzr revid: dle@openerp.com-20131023110926-tc2n3oqg0l2ga138
 2013-10-23 13:09:26 +02:00
Christophe Simonis 993bff902e [MERGE] forward port of branch 7.0 up to revid 4067 chs@openerp.com-20131114142639-ng7wzfjwvvel2nhv 
bzr revid: dle@openerp.com-20131112134311-h1vsux0ge17bsqkc
bzr revid: chs@openerp.com-20131114134731-n324awyon0spq624
bzr revid: chs@openerp.com-20130823145204-xwpnlwg0gg2259f6
bzr revid: chs@openerp.com-20130906170157-e7m4pjskyi47q82o
bzr revid: dle@openerp.com-20130909170408-wxgoduzggap6o4ng
bzr revid: dle@openerp.com-20130919141212-ridtrvvfwvu6calr
bzr revid: dle@openerp.com-20131018120136-fvoq337kgx74njsy
bzr revid: dle@openerp.com-20131023103308-18pj2gqq3imrcir7
bzr revid: chs@openerp.com-20131030180528-hqsztaujjjqev8ky
bzr revid: dle@openerp.com-20131106100128-mx8mnguvp321wick
bzr revid: chs@openerp.com-20131115104909-3u3mu40g9xnler88
 2013-11-15 11:49:09 +01:00
Christophe Simonis 1e4b2695d5 [MERGE][FIX] web: fix race condition in BufferedDataset. 
Backport of saas-2 commit 3867 nicolas.vanhoren@openerp.com-20131107112017-7omd01ocvnbzx9m6

lp bug: https://launchpad.net/bugs/1248531 fixed

bzr revid: chs@openerp.com-20131114142639-ng7wzfjwvvel2nhv
 2013-11-14 15:26:39 +01:00