Commit Graph
82144 Commits
Author SHA1 Message Date
niv-openerp abe6df638d [FIX] Reverted modification of behavior in 3858 and replaced it with a fix that solves the core problem
(the fact that the function redirect_with_hash() didn't produced the expected effect in safari). To solve
that problem, the method was simply modified to use the same trick already used in IE that has the same
problem than safari.

bzr revid: nicolas.vanhoren@openerp.com-20131029085356-hb2sk4g7j3xh4zar
2013-10-29 09:53:56 +01:00
Fabien Meghazi 2d0158d8cc [ADD] Menu drag'n dro
bzr revid: fme@openerp.com-20131029083718-e6jrinmh6z48vn5j
2013-10-29 09:37:18 +01:00
bth-openerp fe5a0843d0 [IMP]oe_small class appied on background of parallax.
bzr revid: bth@tinyerp.com-20131029072856-3zow9iscbw6qoutd
2013-10-29 12:58:56 +05:30
bth-openerp 7604f13b46 [IMP]Removed grades.
bzr revid: bth@tinyerp.com-20131029070849-49daiij4jtv5yey2
2013-10-29 12:38:49 +05:30
bth-openerp 2d3cafbe2a [MERGE]Merge trunk-website-al.
bzr revid: bth@tinyerp.com-20131029065923-v1oizv7bf8f5krj5
2013-10-29 12:29:23 +05:30
bth-openerp cb3198370d [IMP]Removed some grades.
bzr revid: bth@tinyerp.com-20131029063935-tq7xf7v7t5wl03li
2013-10-29 12:09:35 +05:30
bth-openerp 90024802ce [IMP]Assigned grades to partners.
bzr revid: bth@tinyerp.com-20131029060951-kn9eqs17td3bkp17
2013-10-29 11:39:51 +05:30
bth-openerp f3c651007f [MERGE]Merge trunk-website-al.
bzr revid: bth@tinyerp.com-20131029054640-zx77k35uidcwy3d1
2013-10-29 11:16:40 +05:30
bth-openerp aef82f1652 [IMP]Removed assigned grades.
bzr revid: bth@tinyerp.com-20131029052342-vwcrusqhqwb87131
2013-10-29 10:53:42 +05:30
bth-openerp f6e262c955 [IMP]Removed assigned partners & assigned grade.
bzr revid: bth@tinyerp.com-20131029051131-m2olmhu23u37l17e
2013-10-29 10:41:31 +05:30
Paramjit Singh Sahota 3065d4dc27 [MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al
bzr revid: psa@tinyerp.com-20131029050653-528vjzg4rpbo3l62
2013-10-29 10:36:53 +05:30
bth-openerp d4325ac933 [MERGE]Merge trunk-website-al.
bzr revid: bth@tinyerp.com-20131017054433-5a8vax2nyuwwwzuw
bzr revid: bth@tinyerp.com-20131021065916-qpffh3kfkz0n8v8k
bzr revid: bth@tinyerp.com-20131022112314-50vj16z4rva3ngi9
bzr revid: bth@tinyerp.com-20131025073225-s8crvmd65oji11fl
bzr revid: bth@tinyerp.com-20131028050304-2n6yktosjstlm45y
bzr revid: bth@tinyerp.com-20131029045254-ggwaarzd6zsakq40
2013-10-29 10:22:54 +05:30
Denis Ledoux 108eea6524 [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8797 rev-id: dle@openerp.com-20131028202715-uinjafcgpnw1nucx
bzr revid: mat@openerp.com-20131028163349-hr0ul2uf18fcvg4b
bzr revid: dle@openerp.com-20131028202944-eddqtgtikjq93nil
2013-10-28 21:29:44 +01:00
Denis Ledoux 71c11fdbdb [FIX]account_followup: revert commit 8795 (dle@openerp.com-20131028131851-q6x6rljvjs25vlng), because it requires some more access rights, a proper fix is needed for the group by
bzr revid: dle@openerp.com-20131028202715-uinjafcgpnw1nucx
2013-10-28 21:27:15 +01:00
Thibault Delavallée 7da7f0bd63 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131028165203-wgt2qfzhw3kr1pqi
2013-10-28 17:52:03 +01:00
Thibault Delavallée 97f164ba99 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131028163325-2hpks3hp23zop40n
2013-10-28 17:33:25 +01:00
Thibault Delavallée 5bb4fa2b43 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131028163321-5o81wa1m7rzdp1dz
2013-10-28 17:33:21 +01:00
Fabien Meghazi 2fc5da3f95 [WIP] Add menu
bzr revid: fme@openerp.com-20131028162815-2nou1okxovo8thkr
2013-10-28 17:28:15 +01:00
Fabien Meghazi b7ed1d3e6d [FIX] Translation shall not prevent website administration
bzr revid: fme@openerp.com-20131028162704-gm1o64e6ww1zurj2
2013-10-28 17:27:04 +01:00
Fabien Meghazi 82c749c91d [IMP] Refactor LinkDialog -> RTELinkDialog
bzr revid: fme@openerp.com-20131028162623-i2a4cixspm8q1crx
2013-10-28 17:26:23 +01:00
Martin Trigaux d5211929b8 [MERGE] forward port of 7.0 until revision 9546 (launchpad_translations_on_behalf_of_openerp-20131028054233-15znliqv2eh2jq0i)
bzr revid: mat@openerp.com-20131028161227-rpv6d0unjmg12jgk
2013-10-28 17:12:27 +01:00
Olivier Dony d1d35b3f57 [FIX] mail.thread: message_redirect_action should not crash when the message has been deleted
bzr revid: odo@openerp.com-20131028160100-yhebao3adbzz00cn
2013-10-28 17:01:00 +01:00
Olivier Dony 5db5d655d6 [IMP] res.users: default search field should match emails too
bzr revid: odo@openerp.com-20131028155639-it1q12xt5iul1oac
2013-10-28 16:56:39 +01:00
Olivier Dony 06a3255576 [IMP] res_partner: default search field can be based on display_name + have email matching by default
This more closely matches the behavior of name_search,
until name_search is actually available in search views.

bzr revid: odo@openerp.com-20131028155600-1dwd35sjht2of63m
2013-10-28 16:56:00 +01:00
Fabien Meghazi 4f3e17ba33 [ADD] jquery-sortable
bzr revid: fme@openerp.com-20131028152725-70hqe2xjeuuhqt2i
2013-10-28 16:27:25 +01:00
Xavier Morel 0db0f20bda [ADD] WIP link combo
bzr revid: xmo@openerp.com-20131028152342-5clhbwwwfcdxxxq0
2013-10-28 16:23:42 +01:00
niv-openerp 7c3ae6a157 [FIX] Rare problem in select fields related to previous improvement in that widget.
Sometimes, the value of the field was resetted to false.

bzr revid: nicolas.vanhoren@openerp.com-20131028150019-i0nllpqu1i7wpxbr
2013-10-28 16:00:19 +01:00
Christophe Simonis 12690a7cfe [FIX] project_issue: correct issue escalation
bzr revid: chs@openerp.com-20131028145712-a6egn04g1g2va5cs
2013-10-28 15:57:12 +01:00
ddm 2196a69a61 [FIX] eCommerce: duplicate product price
bzr revid: ddm@openerp.com-20131028145043-ek0rnvatu2ab4avx
2013-10-28 15:50:43 +01:00
Martin Trigaux dcf15108f0 [FIX] list: force to recompute the selection as closing group reset items and would lead to an incorrect count of ids (eg: not hidding sidebar when no item is selected) (opw #599969)
bzr revid: mat@openerp.com-20131028144738-qpanf41yu1i92klh
2013-10-28 15:47:38 +01:00
Martin Trigaux 9edf16f669 [FIX] list: force recompute the selection as closing group reset properties (opw #599969)
bzr revid: mat@openerp.com-20131028141647-j6wkvl6plwblh077
2013-10-28 15:16:47 +01:00
Stephane Wirtel a7ff75f94a [FIX] Remove unused menu item in the mrp_securify file
bzr revid: stw@openerp.com-20131028140545-xr3mav7cb3gk45qn
2013-10-28 15:05:45 +01:00
Quentin (OpenERP) d6e3f655b5 [IMP] base, res_currency: changed the type of name of res_currency_rate from date to datetime for those who need to update the rate of a currency several times per day
bzr revid: qdp-launchpad@openerp.com-20131028140333-nmvm07ay5xllo2zi
2013-10-28 15:03:33 +01:00
niv-openerp f312303734 [IMP] Added doc
bzr revid: nicolas.vanhoren@openerp.com-20131029150105-4l3hys56zt2dpmcc
2013-10-29 16:01:05 +01:00
Christophe Simonis 6b7ccc16b7 [FIX] mail: mail_message: avoid crash when checking access rules against invalid ids
bzr revid: chs@openerp.com-20131028135050-4hqx129ouy7z5b03
2013-10-28 14:50:50 +01:00
bth-openerp 36991e7019 [MERGE]Merge trunk-website-al branch.
bzr revid: bth@tinyerp.com-20131028132942-o6uk559f2lgjyrk8
2013-10-28 18:59:42 +05:30
Denis Ledoux bf29caa576 [FIX]account_followup: latest_followup_level_id was missing from tree view, in order to make work the group by Follow Up Level from searchview
bzr revid: dle@openerp.com-20131028131851-q6x6rljvjs25vlng
2013-10-28 14:18:51 +01:00
Fabien Meghazi 26e62b0e0e [IMP] Menu tree from client side
bzr revid: fme@openerp.com-20131028112350-9or1z3e3ndgk4mfg
2013-10-28 12:23:50 +01:00
bth-openerp a9f0eb015f [IMP]Add grade to some partners.
bzr revid: bth@tinyerp.com-20131028112216-8axfjacetnbver5m
2013-10-28 16:52:16 +05:30
bth-openerp 53edab2931 [IMP]Add grade to res_partner_5.
bzr revid: bth@tinyerp.com-20131028104729-95my0k1szaz42bdq
2013-10-28 16:17:29 +05:30
bth-openerp e247662ed7 [IMP]Add grade to res_partner_3.
bzr revid: bth@tinyerp.com-20131028101230-oe12wtban85cm99e
2013-10-28 15:42:30 +05:30
Amit Bhavsar (Open ERP) e80dd25141 [MERGE] lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb-dka
bzr revid: amb@tinyerp.com-20131028094412-512svv3vbqpl55g9
2013-10-28 15:14:12 +05:30
Fabien Meghazi 321bf56b99 [MERGE] upstream
bzr revid: fme@openerp.com-20131028091527-hbki8epj0oh4s821
2013-10-28 10:15:27 +01:00
Darshan Kalola (OpenERP) 02dec945de [IMP]improve view,label and help of product.
bzr revid: dka@tinyerp.com-20131028090644-fkmxjbbu5pze5f7h
2013-10-28 14:36:44 +05:30
bth-openerp a6cc45e385 [IMP]Comment on assigned grade.
bzr revid: bth@tinyerp.com-20131028084447-q8b09q25phs12xwy
2013-10-28 14:14:47 +05:30
bth-openerp 93bcef7229 [IMP]Remove assigned partners in demo.
bzr revid: bth@tinyerp.com-20131028073942-gqtybkjuvpbunxqm
2013-10-28 13:09:42 +05:30
Turkesh Patel (Open ERP) 0de56fb780 [MRG] merge with lp:openerp-web
bzr revid: tpa@tinyerp.com-20131028072004-6r02ngzdzjcckno4
2013-10-28 12:50:04 +05:30
Turkesh Patel (Open ERP) 669d7e890c [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20131028071445-aa1gbnuaj485ue5i
2013-10-28 12:44:45 +05:30
Paramjit Singh Sahota 5d800abfdb [MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al
bzr revid: psa@tinyerp.com-20131022115302-t5a9ftki0yt2pxvk
bzr revid: psa@tinyerp.com-20131024051639-ijmy82htxvy3c23r
bzr revid: psa@tinyerp.com-20131028063631-7ndbt6c4x09ad283
2013-10-28 12:06:31 +05:30
Darshan Kalola (OpenERP) bc14d3e659 [ADD]test case for computation of price margin.
bzr revid: dka@tinyerp.com-20131028053025-4h9ftnaqtmbzp2yl
2013-10-28 11:00:25 +05:30