pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,391 Commits 1 Branch 0 Tags
92b8aafe97d94deacb06b37503a05d80b25dbba8
Commit Graph
81391 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric van der Essen eae9b15731 [IMP] helpful exception message 
bzr revid: fva@openerp.com-20130924151913-mq8sj2a8hahylmig
 2013-09-24 17:19:13 +02:00
Thibault Delavallée f702cafdc5 [FIX] [CLEAN] website_project: added controller and dummy template for task. Will have to be improved, but at least we have a controller. Some cleaning has been performed, notably about indentation. 
bzr revid: tde@openerp.com-20130924145445-udqk94zvwq72mr24
 2013-09-24 16:54:45 +02:00
Xavier Morel 0cfd15ff72 [IMP] remove unnecessary intermediate updating of values parameter to render 
bzr revid: xmo@openerp.com-20130924144018-dz68g882mpj4rmt8
 2013-09-24 16:40:18 +02:00
Xavier Morel 2c4560aca6 [ADD] edition of link labels via dialog 
bzr revid: xmo@openerp.com-20130924135120-epq1w7wb1a6jfxqn
 2013-09-24 15:51:20 +02:00
ajay javiya (OpenERP) 2f708369cb [IMP][REM]: Improve code and remove unused method 
bzr revid: aja@tinyerp.com-20130924133041-0j2k8qc5ubjxwghx
 2013-09-24 19:00:41 +05:30
Thibault Delavallée 0c040ae237 [MERGE] [IMP] [DEMO] event, website_event improvements 
[IMP] [DEMO] event: cleaned demo data. Also renamed note field into description, and moved it out of groups_noone, in order to effectively use it to hold the html description of the event.

[IMP] event_sale: cleaned demo data

[ADD] website_mail: added mail_thread file that hold website_message_ids field, holding published comments. Use it for public objects. However as inheritance seems to be still buggy, this field is redefined in website_blog and website_event (at least) to be able to use it. Remove specific declarations when the bug is fixed.

[IMP] [ADD] website_event:
- added skeleton directory for doc
- added skeleton directory for tests
- added dependency towards website_mail module, to benefit from follow feature
- cleaned demo data
- use website_mail for follow / unfollow mechanism
- added website_message_ids field, use it in view
- some improvements in website view (title, event description)

[FIX] website_sales: somewhat fixed partner information fetch in checkout; whole code of those controllers is really obfuscated and very dubious.

bzr revid: tde@openerp.com-20130924130517-hzi2qm108ec65viq
 2013-09-24 15:05:17 +02:00
Thibault Delavallée 1442420f79 [MERGE] [IMP] res_partner: demo data: have one partner coming from LA, to be able to use this town in various demo data 
bzr revid: tde@openerp.com-20130924125254-3dor3q1ue4h8be01
 2013-09-24 14:52:54 +02:00
Fabien Meghazi 3ddeaee79c [MERGE] upstream 
bzr revid: fme@openerp.com-20130814164422-l0h0ueue0fwk94uu
bzr revid: chm@openerp.com-20130828165815-a901l9gx66lj0pj1
bzr revid: fme@openerp.com-20130924125103-65bngr3rnm6k7u3a
 2013-09-24 14:51:03 +02:00
bth-openerp 78101abec8 [IMP]Add demo data. 
bzr revid: bth@tinyerp.com-20130924124809-r83vfpz47g2vkmlq
 2013-09-24 18:18:09 +05:30
ajay javiya (OpenERP) 5d95224114 [IMP]: change type from comment to email when send a compose mail 
bzr revid: aja@tinyerp.com-20130924124751-aiofmruy99ruah3h
 2013-09-24 18:17:51 +05:30
Denis Ledoux 447dec696b [FIX]base, ir_translation: in _get_src, if model or record id does not exist anymore, do not apptempt to read it 
bzr revid: dle@openerp.com-20130924124654-9lz76t6hx0cmxnx5
 2013-09-24 14:46:54 +02:00
Thibault Delavallée 39726ffe2d [CLEAN] removed print statement 
bzr revid: tde@openerp.com-20130924124426-7pz7a9cinllcnspn
 2013-09-24 14:44:26 +02:00
Thibault Delavallée ac2384ee47 [IMP] website_sale: basic cleaning of checkout method about getting partner data. In view, do not use get when the data, use brackets, this helps tracking issues in your process. 
bzr revid: tde@openerp.com-20130924124253-gld6lwzm3dc8bhwn
 2013-09-24 14:42:53 +02:00
Martin Trigaux 89848bce01 [FIX] mrp: don't select bom out of current date range, replace sql query by orm request 
lp bug: https://launchpad.net/bugs/1049415 fixed

bzr revid: mat@openerp.com-20130924122123-v4sgyx5v08ikqzsx
 2013-09-24 14:21:23 +02:00
Thibault Delavallée 90eba9e022 [MOVE] Do not be afraid to put different models in different files. Stop putting shit everywhere. 
bzr revid: tde@openerp.com-20130924121944-ifjosr5yol6b9tsy
 2013-09-24 14:19:44 +02:00
Martin Trigaux b325c63309 [FIX] account_analytic_analysis: expected browse record instead of id for map_account call (opw #597966) 
bzr revid: mat@openerp.com-20130924121326-tb4jr7nqttsxbddu
 2013-09-24 14:13:26 +02:00
Christophe Matthieu f181f21cf4 [IMP] website: publish button with link to backend 
bzr revid: chm@openerp.com-20130924115004-xjpy6sayze2she1w
 2013-09-24 13:50:04 +02:00
Xavier Morel 8b06e72716 [FIX] block-level links 
bzr revid: xmo@openerp.com-20130924112402-twcgdh0b18vzdwru
 2013-09-24 13:24:02 +02:00
Thibault Delavallée d2e2c6065b [ADD] website_mail: added forgotten mail_thread file 
bzr revid: tde@openerp.com-20130924112152-2n1h04qaicmvocqa
 2013-09-24 13:21:52 +02:00
Thibault Delavallée b1f327c985 [MERGE] Merged with main website branch 
bzr revid: tde@openerp.com-20130924112050-yzrhf7pm32ikzb31
 2013-09-24 13:20:50 +02:00
Thibault Delavallée 6a3939f932 [IMP] website_event: title of the main events page summarises the search 
bzr revid: tde@openerp.com-20130924111957-mzxnibdgbb8d09zo
 2013-09-24 13:19:57 +02:00
Christophe Simonis 38a2ca7f3f [MERGE] back port of branch trunk up to revid 8924 fva@openerp.com-20130924094515-j605mg8lozzli3u2 
bzr revid: chs@openerp.com-20130924110701-a5h94knbm279d1m0
 2013-09-24 13:07:01 +02:00
Xavier Morel 7533fe77b4 [FIX] paste in webkit-ish browsers 
clipboard plugin was getting lost due to method used to get a readonly
toplevel editor with editable sub-sections in it.

The clipboard plugin creates a hidden pasteboard element to safely get
a the clipboard data before inserting it at paste point, this
clipboard may have to be made @contenteditable if it's created in a
readonly area. Which was the case here: the pasteboard was inserted at
the root of the editor, which is not editable.

But because of @data-cke-editable being explicitly set, ckeditor would
believe it had inserted the pasteboard in an editable section and thus
would *not* set its @contenteditable leading to a useless readonly
pasteboard.

The purpose of @data-cke-editable was to make the editor itself
"editable" for cke (in order for the toolbar to not be disabled) while
it would not actually be editable (@contenteditable) for users.

This is better reimplemented by calling API methods to make the editor
editable but its root element not editable, one of the improvements
being that commands (and thus toolbar buttons) now switch state
correctly based on context.

bzr revid: xmo@openerp.com-20130924110601-gfvc395rsedpnoh3
 2013-09-24 13:06:01 +02:00
Ravi Gohil (OpenERP) 87ca8ad41b [FIX] account_analytic_analysis: fix the traceback, AttributeError: 'long' object has no attribute 'account_ids' when automatic recurring invoice is enabled.(Maintenance Case : 597966) 
bzr revid: rgo@tinyerp.com-20130924105728-gtmc1862gcazs7lb
 2013-09-24 16:27:28 +05:30
ajay javiya (OpenERP) 712eee6e3d [ADD]: Warning message if user try to post a internal comment and he/she is not an employee 
bzr revid: aja@tinyerp.com-20130924105210-rrfk2z6du7hiblr6
 2013-09-24 16:22:10 +05:30
Thibault Delavallée 95e7c0f61c [IMP] website_event: use website_mail follow template and controller instead of redefining it 
bzr revid: tde@openerp.com-20130924105206-9fhzpd3f3os1eyar
 2013-09-24 12:52:06 +02:00
Thibault Delavallée 5a0236e014 [IMP] event: added oe_structure in demo data 
bzr revid: tde@openerp.com-20130924105133-69gr0610fnc7310z
 2013-09-24 12:51:33 +02:00
Christophe Simonis d4162cc0af [FIX] @route compatibility with version 7.0: 
*/ add request.debug property
 */ inject request at first argument at runtime, do not use wrapper method.
 */ force slashes in routes (do not use os.path.join() for urls)
 */ routes defined using the legacy decorator httprequest and jsonrequest uses auth="none"
 */ avoid registring web module routes twice

bzr revid: chs@openerp.com-20130924104101-h1dexy6m74b56gvi
 2013-09-24 12:41:01 +02:00
Christophe Matthieu 02f2f28b42 [FIX] website/image controller display image if website_published 
bzr revid: chm@openerp.com-20130924102921-ca83jve77j0su2zu
 2013-09-24 12:29:21 +02:00
Christophe Matthieu 51fae1fcf8 [IMP] website_sale display only non empty category in non editable mode 
bzr revid: chm@openerp.com-20130924102834-op0bm475w20x35j4
 2013-09-24 12:28:34 +02:00
DBR (OpenERP) d636d3deb8 [Merge] lp:openobject-addons 
bzr revid: dbr@tinyerp.com-20130924102731-bkh9bgamdhl60whk
 2013-09-24 15:57:31 +05:30
Thibault Delavallée 620e527116 [IMP] website_event: removed description_website, now using standard description field. 
Cleaned demo data.

bzr revid: tde@openerp.com-20130924102651-fym6t9mgq6mpy3kz
 2013-09-24 12:26:51 +02:00
Fabien Meghazi bcd3f471ad [IMP] persistence of dialog opt out 
bzr revid: fme@openerp.com-20130924102305-dxyxq56imz1xeul8
 2013-09-24 12:23:05 +02:00
Thibault Delavallée 754fbd0d79 [IMP] event_sale: cleaned demo data, using standard xml_ids. 
Also removed website_published and description website fields, not necessary at all.

bzr revid: tde@openerp.com-20130924101924-0onpypxq0806dzb7
 2013-09-24 12:19:24 +02:00
Thibault Delavallée 4c7d96e33d [IMP] event: 
- note (Description field) is renamed into Description and set to an html field
- added demo data from website_event to base event, no need to add a new field and to delay demo data
- updated form view

bzr revid: tde@openerp.com-20130924101020-b1xx96vdgcfd2mz2
 2013-09-24 12:10:20 +02:00
Thibault Delavallée 71653438eb [IMP] res_partner: demo data: have one partner coming from LA, to be able to use this town in various demo data 
bzr revid: tde@openerp.com-20130924095602-u6q5u0c0jpnlc6nk
 2013-09-24 11:56:02 +02:00
Fabien Meghazi f46550fa27 [IMP] Use t-href in main template 
bzr revid: fme@openerp.com-20130924095242-2fzuptg63h63t79y
 2013-09-24 11:52:42 +02:00
Fabien Meghazi 5c3806d2f2 [ADD] Usable url_for 
bzr revid: fme@openerp.com-20130924095109-5e6tvd34amns0t84
 2013-09-24 11:51:09 +02:00
Frédéric van der Essen 7997fcf452 [MERGE] point_of_sale: fix to avoid internal references shadowing EAN13 barcodes 
bzr revid: fva@openerp.com-20130924094515-j605mg8lozzli3u2
 2013-09-24 11:45:15 +02:00
Frédéric van der Essen 63a5aef83a [MERGE] from trunk 
bzr revid: fva@openerp.com-20130924094429-mce20di3xwu13ig0
 2013-09-24 11:44:29 +02:00
Frédéric van der Essen b4e57aa481 [FIX] point_of_sale: make sure that internal reference barcodes don't conflict with ean barcodes 
bzr revid: fva@openerp.com-20130924093410-c1yh72t4jd9667ia
 2013-09-24 11:34:10 +02:00
Frédéric van der Essen cd4b0853b2 [MERGE] from trunk 
bzr revid: fva@openerp.com-20130924093250-u8ws3yojh3irj3tg
 2013-09-24 11:32:50 +02:00
bth-openerp 4828e239af [IMP]String All Departments added. 
bzr revid: bth@tinyerp.com-20130924092708-qu7842ceb55i3ssz
 2013-09-24 14:57:08 +05:30
Christophe Matthieu abc273e9a1 [IMP] website_sale: change size y when category is displayed 
bzr revid: chm@openerp.com-20130924085507-9m1gsdnlsfgn4fj4
 2013-09-24 10:55:07 +02:00
Thibault Delavallée 7896b7e43b [ADD] website_event: added dependency towards website_mail 
bzr revid: tde@openerp.com-20130924084751-v1447wgjyo1dkg8t
 2013-09-24 10:47:51 +02:00
Thibault Delavallée 5bcd05aaba [ADD] website_event: added skeleton directories for doc and tests 
bzr revid: tde@openerp.com-20130924084630-p1lw7b9lj2ijqti3
 2013-09-24 10:46:30 +02:00
Fabien Meghazi 56ca9e9105 [ADD] Qweb: added t-href and t-src using url_for 
bzr revid: fme@openerp.com-20130924084620-dpnpwpehok7r863b
 2013-09-24 10:46:20 +02:00
Christophe Matthieu 458121ab5c [IMP] website_sale: when the products is displayed from a search, use the same size x,y for all products 
bzr revid: chm@openerp.com-20130924084100-y6pgvislcpdo9izx
 2013-09-24 10:41:00 +02:00
Thibault Delavallée 2c9f267d31 [MERGE] [IMP] [DEMO] event: demo data improvements 
bzr revid: tde@openerp.com-20130924083721-8j81hwtqdx8eykxp
 2013-09-24 10:37:21 +02:00
Christophe Matthieu b1cf178978 [MERGE] website_sale: add layout options and css 
bzr revid: chm@openerp.com-20130924083349-1woicpx50668272g
 2013-09-24 10:33:49 +02:00