Commit Graph
81391 Commits
Author SHA1 Message Date
Christophe Matthieu 9bb4af7d9f [IMP] website snippet: add comment for auto set snippet and remove data-snippet-id in website_sale view
bzr revid: chm@openerp.com-20130924082423-ylzeprl3w4tlb83e
2013-09-24 10:24:23 +02:00
ima-openerp a7e1ae6b61 [IMP]added ticket data for events.
bzr revid: ishwarmalvi13@gmail.com-20130924070446-59j3slvcf8kzgerk
2013-09-24 12:34:46 +05:30
bth-openerp a8cf637b12 [IMP]Add class on requirement field also.
bzr revid: bth@tinyerp.com-20130924065332-mh6dqxl43bocysv2
2013-09-24 12:23:32 +05:30
Paramjit Singh Sahota ce9a7cccce [MERGE] Merged trunk-website-al
bzr revid: psa@tinyerp.com-20130924064913-fgr3btfwwbtb68xn
2013-09-24 12:19:13 +05:30
Paramjit Singh Sahota 8fc3877646 [IMP] Improved code to make small way to change to list view rather than writing the whole product template code twice.
bzr revid: psa@tinyerp.com-20130924064617-40ruht7l15c08p7y
2013-09-24 12:16:17 +05:30
bth-openerp 438f81b4e9 [MERGE]Merge trunk-website-al branch and removed new created snippet and add class oe_structure in description.
bzr revid: bth@tinyerp.com-20130924064129-ss5gi0nxbm26mlfi
2013-09-24 12:11:29 +05:30
Launchpad Translations on behalf of openerp fa502fd9bd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130924063729-1k9xlx0630vx6is5
2013-09-24 06:37:29 +00:00
Rifakat e2e20bae4c [FIX] mrp: improved fix, used DEFAULT_SERVER_DATETIME_FORMAT for date, removed extra AND and _order from search()
bzr revid: rha@tinyerp.com-20130924062648-qshruwnukmtn0b7w
2013-09-24 11:56:48 +05:30
Launchpad Translations on behalf of openerp 081fd4e715 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130924055544-w57gyxsw1rn3gcnd
2013-09-24 05:55:44 +00:00
Vidhin Mehta a723569db7 [MERGE]Parent Merge.
bzr revid: vme@tinyerp.com-20130924051742-54vv0guc5dzxpdvi
2013-09-24 10:47:42 +05:30
Denis Ledoux db84e912bd [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8781 rev-id: dle@openerp.com-20130923165651-0jt823r5wy37enw6
bzr revid: dle@openerp.com-20130923171310-mav1riq3d2rebmv2
2013-09-23 19:13:10 +02:00
Denis Ledoux 274cf1e293 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9475 rev-id: dle@openerp.com-20130923162428-g0s3o9tid09ogfv3
bzr revid: dle@openerp.com-20130923165651-0jt823r5wy37enw6
2013-09-23 18:56:51 +02:00
Denis Ledoux ff3a6ddde6 [FIX]sale_crm: add context to categ_ids for sale order object. Its dummy to set 'crm.lead' for object_name in context while the current object is a 'sale.order', but its less dummy to copy crm.lead tags to sale.order tags while using the convert to quotation wizard
bzr revid: dle@openerp.com-20130923162428-g0s3o9tid09ogfv3
2013-09-23 18:24:28 +02:00
Thibault Delavallée 3862a4e83d [MERGE] website, website_mail, website_blog: Mail/Blog Update part I
[REF] document_page: refactored the module, towards using it in website_blog
Main modifications:
- document.page is now blog.post
- category is now a blog.category object, instead of a document.page with type='category'
- added blog.tag model, to be able to tag posts, and a m2m relationship between blog.post and blog.tag
- cleaned document.page, removing type and unnecessary features
- added chatter on blog.post, blog.category
- added subtypes to enable direct follow of posts when following a category
- updated document.page.history (now blog.post.history)
- commented menu creation, because this does not seem to be necessary anymore considering the new website
- updated wizard.document.page.history.show_diff, now blog.post.history.show_diff
- updated all views accordingly, as well as demo data
- removed the use of document_user group, simplified rules on blog.post
- misc cleaning

[REF] website_mail refactoring; document_page, website_blog: merge of the two modules. document_page is now contained inside website_blog, last part of the refactoring before
cleaning and improving the blog feature. Usefull files have been transfered. Translations have been discarded, they will have to be re-translated again. Document_page module is now dead. Long live website_blog!

The module is now called website_blog, and not based on mail.group anymore. It uses document_page module, previously renamed blog.post (see previous commits). Refactored controllers and views to work with the new model.

[ADD] Added website_mail module, that holds mail-related stuff necessary for the website. This is an auto-install module.

Also added templates, js and css to have a generic follow button. Based on the same principle as publish, there is now a generic button to follow or unfollow objects in openerp. This should replace all custom instance of subscription in other addons.

[FIX] website:
- [FIX] call write with a list of ids because I can't be arsed to handle the other case
- [FIX] turns out a new mandatory positional argument blows things up a bit

bzr revid: tde@openerp.com-20130923155917-ak0gwah9bh3em6ab
2013-09-23 17:59:17 +02:00
Thibault Delavallée ec22dee6d1 [FIX] website_blog: fixed m2m between blog.post and blog.tag
bzr revid: tde@openerp.com-20130923155605-r2x40550sq71mhtx
2013-09-23 17:56:05 +02:00
Thibault Delavallée be1e5bbfed [MERGE] [IMP] tools: mail: improved html_email_clean
- 'read more' links are now in the last container, not after, allowing to have read more
links embedded inside shortened paragraphs
- added expand_options dict allowing to customize the read more

[ADD] qweb: wrapper node for more field types

[FIX] ir_ui_view: don't try to set attributes on comments, it makes no sense

bzr revid: tde@openerp.com-20130923154235-fz0ksnd7i63qqrmu
2013-09-23 17:42:35 +02:00
Thibault Delavallée 65a0fcd394 [MERGE] Sync with main branch
bzr revid: tde@openerp.com-20130923154116-9m974057rmnn542m
2013-09-23 17:41:16 +02:00
Thibault Delavallée a42d020a34 [CLEAN] [IMP] website_blog: cleaned blog.post, blog.post.category and blog.tag models; added basic appearance of tags and base routing method in controllers. Will have to be improved in a future branch.
bzr revid: tde@openerp.com-20130923154039-ppn1loy002tcppun
2013-09-23 17:40:39 +02:00
Frédéric van der Essen 927296a7cb [MERGE] point_of_sale: support for scanning non ean13 barcodes with the internal reference field
bzr revid: fva@openerp.com-20130923151713-xsxgrumasi4iyh0t
2013-09-23 17:17:13 +02:00
Xavier Morel 68d9add6ce [ADD] saving m2o fields
bzr revid: xmo@openerp.com-20130923151633-61v7gw0llol4fvyo
2013-09-23 17:16:33 +02:00
Frédéric van der Essen 68c23991d7 [MERGE] from trunk
bzr revid: fva@openerp.com-20130923151432-rba58178m69ldzgb
2013-09-23 17:14:32 +02:00
Frédéric van der Essen 4f55ff147a [MERGE] point_of_sale: fixing the confirmation dialog in self checkout mode
bzr revid: fva@openerp.com-20130923150611-7ygk47a3w6o7kf93
2013-09-23 17:06:11 +02:00
Frédéric van der Essen 4b90d41e47 [FIX] point_of_sale: order close confirmation was put on all header buttons instead of just the close button
bzr revid: fva@openerp.com-20130923150431-pgri8o2gqup37dpk
2013-09-23 17:04:31 +02:00
Xavier Morel d71a200543 [FIX] handling of multiple children in an HTML field
bzr revid: xmo@openerp.com-20130923145744-3dpta6w2qnqe851b
2013-09-23 16:57:44 +02:00
Frédéric van der Essen 73ba7138c2 [MERGE] from trunk
bzr revid: fva@openerp.com-20130923145408-990mouljuvi5wmxj
2013-09-23 16:54:08 +02:00
Frédéric van der Essen e03f3aa288 [IMP] point_of_sale: support for non ean13 barcodes using the Internal Reference field
bzr revid: fva@openerp.com-20130923145139-iu3ds9tcfzy1ffcf
2013-09-23 16:51:39 +02:00
Thibault Delavallée 5ebd3c5047 [IMP] website_blog: blog_post: public user limited to published posts
bzr revid: tde@openerp.com-20130923144853-unxxa7i5u5zfskhk
2013-09-23 16:48:53 +02:00
Thibault Delavallée 2939c58e72 [CLEAN] ir_ui_view: removed print statement
bzr revid: tde@openerp.com-20130923144830-i5iqzfc1pydm9pge
2013-09-23 16:48:30 +02:00
Thibault Delavallée 0d49f723eb [CLEAN] website_blog: misc cleaning
bzr revid: tde@openerp.com-20130923144422-7vuocxo8bntvuana
2013-09-23 16:44:22 +02:00
Thibault Delavallée f420f98492 [FIX] turns out a new mandatory positional argument blows things up a bit
bzr revid: tde@openerp.com-20130923143534-qnab6bv6upw1vt70
2013-09-23 16:35:34 +02:00
Thibault Delavallée f217813c62 [FIX] call write with a list of ids because I can't be arsed to handle the other case
bzr revid: tde@openerp.com-20130923143501-99onvm218vg222pq
2013-09-23 16:35:01 +02:00
Thibault Delavallée 470179bf80 [ADD] wrapper node for more field types
bzr revid: tde@openerp.com-20130923143416-hmxdll0gi0w0un2j
2013-09-23 16:34:16 +02:00
Thibault Delavallée e07531f451 [FIX] don't try to set attributes on comments, it makes no sense
bzr revid: tde@openerp.com-20130923143349-y922fxtbkotsjzpf
2013-09-23 16:33:49 +02:00
Thibault Delavallée 438c6683d7 [MERGE] Sync with main website branch
bzr revid: tde@openerp.com-20130923135558-rlz33deoydy35gfs
2013-09-23 15:55:58 +02:00
Thibault Delavallée a1ea8bbc8a [MERGE] Sync with main website branch
bzr revid: tde@openerp.com-20130923135527-c385v0ewn0166wrf
2013-09-23 15:55:27 +02:00
Xavier Morel f040cfc7b1 [FIX] placeholder image when edition starts
it's apparently better when it's completely broken and can't be edited. YMMV

bzr revid: xmo@openerp.com-20130923134914-1si4fz8fg72iktvw
2013-09-23 15:49:14 +02:00
Thibault Delavallée 4b0c341f2b [CLEAN] website_blog: cleaned controllers blog code
bzr revid: tde@openerp.com-20130923134702-d426ypzic6g9n1oj
2013-09-23 15:47:02 +02:00
Thibault Delavallée dcdefd0e8d [IMP] website_mail: added override of mail.message search and check_access_rule to restrict messages vsible by public user to have website_published = True
bzr revid: tde@openerp.com-20130923134639-ou1hkwzetm9st95f
2013-09-23 15:46:39 +02:00
ddm 5c9bdf1dcb [IMP] SEO sitemap.xml + robots.txt
bzr revid: ddm@openerp.com-20130923134240-4qx4pyfv2rl65xyz
2013-09-23 15:42:40 +02:00
ddm d910b8c533 [FIX] improve keyword detection
bzr revid: ddm@openerp.com-20130923133703-ysil60j2t08gk0kf
2013-09-23 15:37:03 +02:00
bth-openerp a4ddc28779 [MERGE]Merge trunk-website-al.
bzr revid: bth@tinyerp.com-20130923133427-9y7bf3jrtozou35a
2013-09-23 19:04:27 +05:30
ajay javiya (OpenERP) cbe9d337a5 [IMP]: reduce rpc call , add options 'display_log_button' on field,
[REM]: unwanted record rule

bzr revid: aja@tinyerp.com-20130923133201-zclwecr2n596e989
2013-09-23 19:02:01 +05:30
Paramjit Singh Sahota c931f60bd3 [MERGE] MERGED trunk-website-al
bzr revid: psa@tinyerp.com-20130923133137-heq2s7r9hjlm150g
2013-09-23 19:01:37 +05:30
Paramjit Singh Sahota 7a76a45a50 done the same changes in sass as in css.
bzr revid: psa@tinyerp.com-20130923131611-eoexbw2a9dbxxyum
2013-09-23 18:46:11 +05:30
Fabien Meghazi 4c3afa6078 [IMP] Activate translation when language is not the default one
bzr revid: fme@openerp.com-20130923131301-mjr0tmth2z1qamfa
2013-09-23 15:13:01 +02:00
Xavier Morel 59b46346b1 [FIX] crappy snippets initialization signal
bzr revid: xmo@openerp.com-20130923130321-lpbxy7qckcu0svrp
2013-09-23 15:03:21 +02:00
Paramjit Singh Sahota de41937cfb [IMP] Improved the template id.
bzr revid: psa@tinyerp.com-20130923130238-4it782jesm211t6w
2013-09-23 18:32:38 +05:30
ima-openerp e70f0cdf3a [IMP]added event description and improved code.
bzr revid: ishwarmalvi13@gmail.com-20130923125835-j18ge3q2bmaj0jvl
2013-09-23 18:28:35 +05:30
Christophe Matthieu 7ed222baf3 [IMP] website: name connected user; carousel selection; imp drop zone
bzr revid: chm@openerp.com-20130923125606-b6pcr52dai0yh2ia
2013-09-23 14:56:06 +02:00
bth-openerp 54647f7b01 [IMP]Added description snippet.
bzr revid: bth@tinyerp.com-20130923124829-d5jd6kg4mssn2piz
2013-09-23 18:18:29 +05:30