Commit Graph
63903 Commits
Author SHA1 Message Date
Thibault Delavallée 49c0b7a820 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
Christophe Matthieu c4c268c902 [FIX] website_event_track: link
bzr revid: chm@openerp.com-20140106114144-ev9rwmb9zy9eal0c
2014-01-06 12:41:44 +01:00
Christophe Matthieu c4ea06327c [FIX] website: typo
bzr revid: chm@openerp.com-20140106103855-vjd6ro0w4m0xkfrc
2014-01-06 11:38:55 +01:00
Launchpad Translations on behalf of openerp ced63415b7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140103054140-sxa6ru24qvhgz2ve
bzr revid: launchpad_translations_on_behalf_of_openerp-20140104054255-7o6b0x7c1vifv0do
bzr revid: launchpad_translations_on_behalf_of_openerp-20140105052647-pckbu2ehnp5l8217
2014-01-05 05:26:47 +00:00
ddm a408924315 [FIX] Snippets placed below editor bar
bzr revid: ddm@openerp.com-20140102171825-208jw33qlmwj05fd
2014-01-02 18:18:25 +01:00
ddm 0e430008bd [IMP] Added blog UI test
bzr revid: ddm@openerp.com-20140102151115-16mlisduee7zav6g
2014-01-02 16:11:15 +01:00
Thibault Delavallée 2488f78e6d [FORWARD] Forward port of latest saas-2 fixes, until revision 9062 (revid tde@openerp.com-20140102124143-m1qv8koovjcl8mah)
bzr revid: tde@openerp.com-20140102133028-xhvkzstqy5t8dquh
2014-01-02 14:30:28 +01:00
Thibault Delavallée 5e7fdb5bcc [MERGE] [IMP] hr: changed some pictures of employees in demo data to avoid copyright issues
bzr revid: tde@openerp.com-20140102125858-b2r3mntmj5uu15nl
2014-01-02 13:58:58 +01:00
Thibault Delavallée c243854aae [FIX] account_anglo_saxon: fixed yml tests using an hardocded year instead of the current year.
bzr revid: tde@openerp.com-20140102124143-m1qv8koovjcl8mah
2014-01-02 13:41:43 +01:00
Thibault Delavallée 737be08fbf [MERGE] account: cash register view improvements
- now looking like cash control methods from the point of sale module.

point of sale: improved some tooltips + cash control form view improvements

bzr revid: tde@openerp.com-20140102113009-lb1vv2w3g4dz2oqw
2014-01-02 12:30:09 +01:00
ddm c71318e342 [FIX] UI test runner snafu
bzr revid: ddm@openerp.com-20140102103629-r6sjvevgsihricte
2014-01-02 11:36:29 +01:00
ddm 8baadbd7b1 [IMP] code cleanup + comments
bzr revid: ddm@openerp.com-20131231142824-rxyge2oupzaym6mh
2013-12-31 15:28:24 +01:00
ddm 4d24f84615 [IMP] Ensure correct parsing
bzr revid: ddm@openerp.com-20131231132100-jdddbzx2tzpiqmgi
2013-12-31 14:21:00 +01:00
ddm 14cc067b4a [IMP] Mini code cleanup
bzr revid: ddm@openerp.com-20131231131842-pzaqildephzp69xj
2013-12-31 14:18:42 +01:00
ddm f3ef0e15ff [FIX] Fixed popovers in product tour
bzr revid: ddm@openerp.com-20131231104153-fy4sr9d7e0vwlef7
2013-12-31 11:41:53 +01:00
ddm 0753a436b3 [FIX] Fixed popovers in blog tour
bzr revid: ddm@openerp.com-20131231103436-4i70wc0mffbhrujx
2013-12-31 11:34:36 +01:00
ddm 3a8cc41c8e [FIX] Fixed popovers in event tour
bzr revid: ddm@openerp.com-20131231102916-et2mbmtym6mm604s
2013-12-31 11:29:16 +01:00
ddm 7b5f713c93 [FIX] Fixed popovers in banner tour
bzr revid: ddm@openerp.com-20131231101338-91q7yt5d62joldwd
2013-12-31 11:13:38 +01:00
Launchpad Translations on behalf of openerp d963fa888c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231050201-641kcunlgq2qa0ux
2013-12-31 05:02:01 +00:00
Launchpad Translations on behalf of openerp 67e479e96e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131225060225-zss93rqqqz3holkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131226060540-odnnltlm0bobiqp9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227052235-xq201ghozcgucfuq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228051943-jo247cfuiyx4w767
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230043947-d1jcf2vpf9go93ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231044745-8v24a0fydnvde3js
2013-12-31 04:47:45 +00:00
ddm cc197bd895 [IMP] Code cleanup
bzr revid: ddm@openerp.com-20131230172759-c1f8mmangnwtmuny
2013-12-30 18:27:59 +01:00
ddm 5ceabe49db [FIX] Last hope?
bzr revid: ddm@openerp.com-20131230170628-kg6j67rc6v5za7ln
2013-12-30 18:06:28 +01:00
ddm 1bfa357e2c [FIX] Broken test runner
bzr revid: ddm@openerp.com-20131230163032-dbzgro9noo2nbtjc
2013-12-30 17:30:32 +01:00
ddm 1813715892 [FIX] Extra long delay for runbot
bzr revid: ddm@openerp.com-20131230161333-e3ibc6b2v33dx31z
2013-12-30 17:13:33 +01:00
ddm 5b55fa570d [FIX] Larger timeout for UI tests
bzr revid: ddm@openerp.com-20131230144702-2ydq0wfc1it4b43t
2013-12-30 15:47:02 +01:00
ddm 97e0e97c7a [IMP] Cleanup + timeout
bzr revid: ddm@openerp.com-20131230142601-w9zamknj7h4qw9zh
2013-12-30 15:26:01 +01:00
ddm cd45e69769 [IMP] Remove unused data
bzr revid: ddm@openerp.com-20131230142250-315i86pzudhfar8s
2013-12-30 15:22:50 +01:00
ddm 0135ea6f86 [FIX] Better OE url for UI tests
bzr revid: ddm@openerp.com-20131230134659-2ky4zyw0q2i96g6y
2013-12-30 14:46:59 +01:00
ddm b3cf02d123 [FIX] More test params
bzr revid: ddm@openerp.com-20131230131322-5atbn0wyfjlctgyw
2013-12-30 14:13:22 +01:00
ddm 12b5b73312 [DEBUG] More debug info for UI tests
bzr revid: ddm@openerp.com-20131230123229-jf4vfkha16l4poct
2013-12-30 13:32:29 +01:00
ddm fdb6af8805 [FIX] Disable DB selection in UI tests
bzr revid: ddm@openerp.com-20131230110620-18xf9x5dkfr4h362
2013-12-30 12:06:20 +01:00
Martin Trigaux 8146a3ed43 [FIX] note: revert rev 9055 as made impossible to change stage if no rights on other users' relations
bzr revid: mat@openerp.com-20131230104045-2h070kuouz4msz1x
2013-12-30 11:40:45 +01:00
ddm b1de39faf0 [DEBUG] UI tests debug info on runbot
bzr revid: ddm@openerp.com-20131230102754-9411hh64xy6ojoz2
2013-12-30 11:27:54 +01:00
Paramjit Singh Sahota 87291ef069 [MERGE] Merged lp:openobject-addons
bzr revid: psa@tinyerp.com-20131230072718-um169nlnfdblzzyx
2013-12-30 12:57:18 +05:30
Paramjit Singh Sahota 7980ac78ae [IMP] Improved code as per the suggestions on the Merge proposal.
bzr revid: psa@tinyerp.com-20131230072452-zew8ys6lqomzxcsm
2013-12-30 12:54:52 +05:30
ddm 315da9c809 [FIX] Trying long timeout for runbot
bzr revid: ddm@openerp.com-20131227165824-ae2tvwczt5pwq6we
2013-12-27 17:58:24 +01:00
Quentin (OpenERP) f3737b122c [IMP] kanban_gauge: allow to set levelcolors in widget options instead of taking the default ones
bzr revid: qdp-launchpad@openerp.com-20131227164911-tk7og4pf37jmvj0c
2013-12-27 17:49:11 +01:00
ddm 09878aa45a Revert
bzr revid: ddm@openerp.com-20131227161040-wy2s7ydcvt0jxhdb
2013-12-27 17:10:40 +01:00
Thibault Delavallée 0bcd78116f [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131227153517-j278y3hrjj2nzw79
2013-12-27 16:35:17 +01:00
ddm 6e54f0a834 Temporary test
bzr revid: ddm@openerp.com-20131227142933-174si3fpu9jm4cld
2013-12-27 15:29:33 +01:00
ddm d02f8b2d3a bzr revid: ddm@openerp.com-20131227140744-y9pgrkt6qina3sez 2013-12-27 15:07:44 +01:00
ddm 8ea56d266e [IMP] UI tests code cleanup
bzr revid: ddm@openerp.com-20131227135330-z3815qyz4cjaf8zj
2013-12-27 14:53:30 +01:00
ddm e6a0d7bed2 [FIX] Yet another attempt to figure out UI tests on runbot
bzr revid: ddm@openerp.com-20131227134436-mx8a7vid4m70sqtp
2013-12-27 14:44:36 +01:00
ddm 7cf5089cce [FIX] Broke commit
bzr revid: ddm@openerp.com-20131227123502-ysoogk0nwit4c7xv
2013-12-27 13:35:02 +01:00
ddm d3ec7c10dc [IMP] UI test debug info
bzr revid: ddm@openerp.com-20131227122426-debzjgmuc0ge72tq
2013-12-27 13:24:26 +01:00
ddm 3344f5792d [FIX] UI tests timeout extension
bzr revid: ddm@openerp.com-20131227112824-82t16ygv33wt7hfw
2013-12-27 12:28:24 +01:00
ddm 23958c233b [FIX] UI tests config for runbot
bzr revid: ddm@openerp.com-20131227112554-4q839w4xrrnmth0e
2013-12-27 12:25:54 +01:00
ddm 02e944cb8a [FIX] UI tests should not fail on runbot
bzr revid: ddm@openerp.com-20131227100939-dadzuyexl0anrese
2013-12-27 11:09:39 +01:00
Launchpad Translations on behalf of openerp 1e3ebc0285 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131220051750-c2x3cf7wrd35we7a
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227052617-sg1lzd37c8fk1pgm
2013-12-27 05:26:17 +00:00
Martin Trigaux aba5888a34 [MERGE] [ADD] gamification
New modules gamification, hr_gamification, gamification_sale_crm, portal_gamification.

Merry Christmas OpenERP

bzr revid: mat@openerp.com-20131224155138-3bbp8m3gyrfsb3ni
2013-12-24 16:51:38 +01:00