Commit Graph
81391 Commits
Author SHA1 Message Date
Xavier Morel 9733c396fe [FIX] correctly select range after inserting a link in the document
Apparently same issue as noted in
xmo@openerp.com-20130902105411-ni3klun0k8v1tmjg, RTE and bootstrap
modal fight for focus (oddly not in Firefox), leading to the callstack
blowing up (after a fraction of a second of browser freezing).

Use same remedy, defer focus-manipulating operation to after the
dialog has been removed and destroyed in order to avoid focus fight.

bzr revid: xmo@openerp.com-20130902105637-1y9aogm1yx9z81jt
2013-09-02 12:56:37 +02:00
Xavier Morel 2f97feb322 [ADD] interaction between RTE and bootstrap image modal
bzr revid: xmo@openerp.com-20130902105411-ni3klun0k8v1tmjg
2013-09-02 12:54:11 +02:00
Christophe Matthieu 9183757380 [FIX] website_event vs website_sale: variation of ticket price with pricelist if the ticket have the same price of the product. If the price is different, do not change the price of the ticket
bzr revid: chm@openerp.com-20130902104646-argn1gu8rk2p1w7a
2013-09-02 12:46:46 +02:00
Turkesh Patel (Open ERP) 00711ec5bd [IMP] set defalut cot as per last configuration wizard.
bzr revid: tpa@tinyerp.com-20130902103629-9d1joumo51b7w8qg
2013-09-02 16:06:29 +05:30
ddm f0021c5cc5 SEO keyword bugfix
bzr revid: ddm@openerp.com-20130902102939-mkpf08al9p3tibpp
2013-09-02 12:29:39 +02:00
ddm efc408e3bf SEO keywords improvement
bzr revid: ddm@openerp.com-20130902102621-fd02b3mzkd3fm6wv
2013-09-02 12:26:21 +02:00
niv-openerp 9a8fe95a5c Get back a working version
bzr revid: nicolas.vanhoren@openerp.com-20130902095151-0etexao0jbdiymry
2013-09-02 11:51:51 +02:00
ddm f50b273ae1 SEO dialog (without save)
bzr revid: ddm@openerp.com-20130902093755-05wins912upe47qj
2013-09-02 11:37:55 +02:00
Yannick Vaucher 90999af991 [FIX] hr_expense - merge 2 declarations of method copy for hr_expense_expense
lp bug: https://launchpad.net/bugs/1219691 fixed

bzr revid: yannick.vaucher@camptocamp.com-20130902093234-fyfytwjzexnzc9s3
2013-09-02 11:32:34 +02:00
niv-openerp 4dc6ac8da4 wip
bzr revid: nicolas.vanhoren@openerp.com-20130902093104-pmeo49m2u5mud8bb
2013-09-02 11:31:04 +02:00
Frédéric van der Essen 6f6c59ec1d [IMP] website: made widget manipulator visible on dark areas
bzr revid: fva@openerp.com-20130902092038-2dpxy9fidznaeclz
2013-09-02 11:20:38 +02:00
Frédéric van der Essen c5fa23bffa [IMP] website editor: allow click trough on snippet manipulators
bzr revid: fva@openerp.com-20130902091005-pnhb05fxk29z5q0r
2013-09-02 11:10:05 +02:00
Martin Trigaux b23587cce2 [FIX] base_calendar: avoid duplication of event on invitation acceptance (opw 586763)
bzr revid: mat@openerp.com-20130902082742-gm422qo1qzev9r35
2013-09-02 10:27:42 +02:00
Xavier Morel 1916b769ac [ADD] bootstrap image dialog, behavior missing
bzr revid: xmo@openerp.com-20130902075216-4y83ed2r19z2fgha
2013-09-02 09:52:16 +02:00
Martin Trigaux 5739cac5fb [FIX] membership: set priority on search view to avoid getting it for other modules
bzr revid: mat@openerp.com-20130902075012-y6o3wjgz9qhqm837
2013-09-02 09:50:12 +02:00
alexandre.fayolle@camptocamp.com ad1ed63670 [IMP] document create/delete=false in view definitions
lp bug: https://launchpad.net/bugs/1219655 fixed

bzr revid: alexandre.fayolle@camptocamp.com-20130902062641-f8hzfnfo7ci2b9jy
2013-09-02 08:26:41 +02:00
Nhomar Hernandez 9382f31c7d [FIX] pass correct parameter to compute the balance on partner form with all entries not complete reconciled
lp bug: https://launchpad.net/bugs/1219381 fixed

bzr revid: nhomar@gmail.com-20130901064406-ehfuhwpjq0ti6oed
2013-09-01 02:14:06 -04:30
Launchpad Translations on behalf of openerp fb49bb4fb3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130831052828-a5n010v6fokrjpfc
bzr revid: launchpad_translations_on_behalf_of_openerp-20130901045249-hckidxuc7v6109fp
2013-09-01 04:52:49 +00:00
Fabien Pinckaers 5f2b77d6c0 [IMP] small html/css improvements
bzr revid: fp@openerp.com-20130831090112-3omb9popd0099m5u
2013-08-31 11:01:12 +02:00
Fabien Pinckaers 6569463f67 [IMP] Flex Footer
bzr revid: fp@tinyerp.com-20130830150126-y0qgjwf5sy3fxwdj
2013-08-30 17:01:26 +02:00
Christophe Matthieu de523a011c [IMP] website_sale: add/update product reset the price: NEED FIX website_event for ticket price
bzr revid: chm@openerp.com-20130830145624-vg7oc0c41kdmny78
2013-08-30 16:56:24 +02:00
Christophe Matthieu af547e9925 [IMP] website_sale: add product don't reset the price
bzr revid: chm@openerp.com-20130830144852-cfgc23qsp080s6kj
2013-08-30 16:48:52 +02:00
niv-openerp 58e064d078 Added sessions server-side
bzr revid: nicolas.vanhoren@openerp.com-20130830144824-xabc1du6qss9wjv2
2013-08-30 16:48:24 +02:00
Thibault Delavallée 2cdefa52ef [FIX] resource: fixed computation with a False calendar id (spotted in stock_no_autopicking.py yml tests)
bzr revid: tde@openerp.com-20130830144334-ong666lutkbibtrd
2013-08-30 16:43:34 +02:00
Christophe Matthieu afc2ddd40c [FIX] website_sale: checkout
bzr revid: chm@openerp.com-20130830144204-5x4k7345nmzni65c
2013-08-30 16:42:04 +02:00
ddm a7d956cf93 Fix
bzr revid: ddm@openerp.com-20130830144040-u7ae70fmw545ej7n
2013-08-30 16:40:40 +02:00
Thibault Delavallée 83e0e842c2 [CLEAN] resource: cleaned old API
bzr revid: tde@openerp.com-20130830142736-pd1o12fe40h2vgi2
2013-08-30 16:27:36 +02:00
Christophe Matthieu 65e7948132 [IMP] website_google_map: add helper google_map_json on res.partner
bzr revid: chm@openerp.com-20130830142504-ecogcw4l7r70zidz
2013-08-30 16:25:04 +02:00
Thibault Delavallée 53fe285259 [IMP] resource: old API replacement + first implementation of compute_hours, to compute the number of working hours between two dates.
bzr revid: tde@openerp.com-20130830141610-uu1t88atcvpmkjjb
2013-08-30 16:16:10 +02:00
Christophe Matthieu 5b83f20086 [IMP] website_crm: remove non used code
bzr revid: chm@openerp.com-20130830140858-hqku5ync7gxxzcb2
2013-08-30 16:08:58 +02:00
Bharat R. Devnani (OpenERP) 4bc4547cb9 [ADD] added the functionalities mentioned on pad
bzr revid: bde@tinyerp.com-20130830135643-ehzm0bdtvq8lltdi
2013-08-30 19:26:43 +05:30
Christophe Matthieu dec8c40c11 [IMP] rename website_google_map; add demo for event
bzr revid: chm@openerp.com-20130830134026-88luqb16o6ny6voy
2013-08-30 15:40:26 +02:00
Thibault Delavallée af79a26a1f [IMP] resource: overall fix of hours/days computation + scheduling + added tests
bzr revid: tde@openerp.com-20130830133250-ixehp7imac0duygd
2013-08-30 15:32:50 +02:00
Paramjit Singh Sahota 3f37dabea0 [MERGE] Merged lp:openobject-addons/7.0
bzr revid: psa@tinyerp.com-20130830132612-ekntqdkholcg15sx
2013-08-30 18:56:12 +05:30
ddm 8b0f006398 Mobile preview & SEO: more Bootstrap 3 fixes
bzr revid: ddm@openerp.com-20130830131952-fmmnhvawlrbekxay
2013-08-30 15:19:52 +02:00
Fabien Pinckaers 29735543e4 [MERGE] fixes from india
bzr revid: fp@tinyerp.com-20130830130152-7xrcbeuxh17mhglu
2013-08-30 15:01:52 +02:00
Cecile Tonglet 37ce63ef6f [FIX] Skip register reports that have xsl but no xml
bzr revid: cto@openerp.com-20130830125428-s1ameps865er1r7f
2013-08-30 14:54:28 +02:00
Denis Ledoux 9979078aa8 [FIX]mrp: _bom_explode, rounding used must be max(bom.product_rounding, bom.product_uom.rounding), in order to avoid asking 0.5 Unit
bzr revid: dle@openerp.com-20130830125155-1vedifnupu2xvth7
2013-08-30 14:51:55 +02:00
Paramjit Singh Sahota e726d9e5e5 Removed unused css.
bzr revid: psa@tinyerp.com-20130830120113-wdlo0024vurbozc9
2013-08-30 17:31:13 +05:30
Paramjit Singh Sahota 33d1107dd3 [MERGE] Merged trunk-website-al and done changes according to that.
bzr revid: psa@tinyerp.com-20130830115723-f35ej71osh2axv97
2013-08-30 17:27:23 +05:30
ishwar.malvi-openerp 93667065ae [IMP]improved typo.
bzr revid: ishwarmalvi13@gmail.com-20130830114702-7ehvcpk9rjmwg71k
2013-08-30 17:17:02 +05:30
ddm 3db7d635c0 Mobile preview + SEO: Bootstrap 3
bzr revid: ddm@openerp.com-20130830112124-ht5wnngxa8fwlrdh
2013-08-30 13:21:24 +02:00
Fabien Pinckaers 75f8fe3d1b [IMP] backround independant theme
bzr revid: fp@tinyerp.com-20130830104838-1ryj7uv1trtgp3jr
2013-08-30 12:48:38 +02:00
Darshan Kalola (OpenERP) b3e6145e04 [IMP]improve help in setting/configuration/sales
bzr revid: dka@tinyerp.com-20130830104524-pbxm2p32n1widzqd
2013-08-30 16:15:24 +05:30
Paramjit Singh Sahota f6707c2ee8 [IMP] added margin bottom between textarea and post comment button in website_mail.
bzr revid: psa@tinyerp.com-20130830104312-j25swty2wq1s6cgj
2013-08-30 16:13:12 +05:30
Paramjit Singh Sahota 435b029e59 [MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al
bzr revid: psa@tinyerp.com-20130830103401-43h30myoqb1p0gcd
2013-08-30 16:04:01 +05:30
Fabien Pinckaers 8e63d91a1c [IMP] remove unused files
bzr revid: fp@tinyerp.com-20130830101943-pq3m900clmsgwmc1
2013-08-30 12:19:43 +02:00
Fabien Pinckaers 31c9ddeb44 [IMP] remove unused file
bzr revid: fp@tinyerp.com-20130830101233-7ykfao5z7rf0jqac
2013-08-30 12:12:33 +02:00
ishwar.malvi-openerp c6ed7ccbd4 [FIX]updated record rule for meeting_invitation_personal.
bzr revid: ishwarmalvi13@gmail.com-20130830101222-4ww2h8x9ofyy2wmf
2013-08-30 15:42:22 +05:30
Paramjit Singh Sahota 223717d284 [IMP] Improved some changes for website_event and website_mail.
bzr revid: psa@tinyerp.com-20130830100316-hr0rstxr50uswe9i
2013-08-30 15:33:16 +05:30