Commit Graph
5570 Commits
Author SHA1 Message Date
Antony Lesuisse 4b30f1fcbd [MERGE] trunk-website-al
bzr revid: al@openerp.com-20140131005157-jkf8hz6fh2buml2c
2014-01-31 01:51:57 +01:00
Gery Debongnie 9cdcf812a6 [MERGE] merge from trunk into local branch
bzr revid: ged@openerp.com-20140130135251-ahk515cy0wc87kyr
2014-01-30 14:52:51 +01:00
Gery Debongnie 1edb992857 [IMP] removes the hardcoded Day, Month, Year value in crm.phonecall.report model and updates the corresponding view (addon crm)
bzr revid: ged@openerp.com-20140129095655-xn031hst4yw79kna
2014-01-29 10:56:55 +01:00
Antony Lesuisse 033c38c304 [MERGE] trunk
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
Olivier Dony 39c27c72d0 [MERGE] Sync with trunk rev. 9064 rev-id ged@openerp.com-20140127161718-uo6pperke86pqq5v
bzr revid: odo@openerp.com-20140128175835-jannyh3cv3gi1sxn
2014-01-28 18:58:35 +01:00
Christophe Matthieu 07adc071df [IMP] website_event: split module: remove depends with sale and move event's ticket form into a bridge: website_event_sale
bzr revid: chm@openerp.com-20140128113101-aon81actmpahyn58
2014-01-28 12:31:01 +01:00
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
Frédéric van der Essen 5585a38ecc [MERGE] from trunk, need point_of_sale updates
bzr revid: fva@openerp.com-20140127160946-yeswyv4o7t2tfbqt
2014-01-27 17:09:46 +01:00
Gery Debongnie cbdf16d8b6 [MERGE] merge from trunk into local branch
bzr revid: ged@openerp.com-20140127132514-lqsoj6ypwof1phsm
2014-01-27 14:25:14 +01:00
Denis Ledoux 567be50d0a [FIX] crm: mass assign were not always deduplicating
bzr revid: dle@openerp.com-20140127103816-t9pga6sohbxaw5ux
2014-01-27 11:38:16 +01:00
Fabien Pinckaers 3e2c0c6d64 [FIX] showing help message for leads and its alias
bzr revid: fp@tinyerp.com-20140126093236-9djrusln4wvi3zdx
2014-01-26 10:32:36 +01:00
Gery Debongnie ede4fd8861 [MERGE] merge trunk into local branch
bzr revid: ged@openerp.com-20140124153531-f4ynl627jpssj7dx
2014-01-24 16:35:31 +01:00
Gery Debongnie 3d6a575d03 [IMP] changes the crm_lead graph view in reporting, to use the new groupby interval features of graph view (addon crm)
bzr revid: ged@openerp.com-20140124122439-t8vvgy9zebbhhy2a
2014-01-24 13:24:39 +01:00
Denis Ledoux c76e580da5 [ADD] crm: mass assign apply deduplication
bzr revid: dle@openerp.com-20140123180211-o1ebik36wegmi8mc
2014-01-23 19:02:11 +01:00
Christophe Matthieu 249d16d813 [IMP] crm: remove group sale manager from menu item Lead show the menu lead in multi sales team group
bzr revid: chm@openerp.com-20140123154759-02hdtevhckw380aj
2014-01-23 16:47:59 +01:00
Thibault Delavallée ec2c2d4e86 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140122123237-5rc5fdyau0422fj2
2014-01-22 13:32:37 +01:00
Gery Debongnie 00c6d55ac9 [MERGE] merge trunk into local branch
bzr revid: ged@openerp.com-20140116144326-8kwqab71zp8s7a8e
2014-01-16 15:43:26 +01:00
Christophe Simonis 91aaaec0a5 [MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n
bzr revid: chs@openerp.com-20140115214454-dhl8xzr429co0j5d
2014-01-15 22:44:54 +01:00
jke-openerp 46b0c7aa00 [REF] Rename model crm.meeting into calendar.event
Remove 2 unsused field from calendar.event model (dir,sequence)

bzr revid: jke@openerp.com-20140115093805-1g1j1oymyxsb6kgh
2014-01-15 10:38:05 +01:00
Thibault Delavallée f92f824b30 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140110124928-jz1ie9qyh6n99fi7
2014-01-10 13:49:28 +01:00
Denis Ledoux 05aab83eb1 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9743 revid:qdp-launchpad@openerp.com-20140108160719-9i8xhrat49cn9l5e
bzr revid: chs@openerp.com-20140107141524-xzz39a2ym66swr0t
bzr revid: chs@openerp.com-20140107172248-zic9mqg0rigy2czb
bzr revid: chs@openerp.com-20140108160418-ph17jgy5hlejj9hr
bzr revid: dle@openerp.com-20140108171400-8r0fwv3wi36w2im0
2014-01-08 18:14:00 +01:00
Launchpad Translations on behalf of openerp dc7821ab8f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140108053808-kp6y8v47dolfbvup
bzr revid: launchpad_translations_on_behalf_of_openerp-20140108054028-juvi5k3459lfg0ov
bzr revid: launchpad_translations_on_behalf_of_openerp-20140108054034-xfyjwtdxhq3abo8c
2014-01-08 05:40:34 +00:00
Martin Trigaux aefcacf1f3 [IMP] crm: use %s pattern for variables in translations instead of {}, updated pot file
bzr revid: mat@openerp.com-20140107165840-pxc0rd5ezdnmzip7
2014-01-07 17:58:40 +01:00
Olivier Dony cde05c203b [FIX] crm.pot: duplicate msgid in previous commit
bzr revid: odo@openerp.com-20140107165530-l3iqx5c8ibjfifao
2014-01-07 17:55:30 +01:00
Martin Trigaux b2fa77fd31 [MERGE] [FIX] crm: post message for logged/scheduled call in use timezone instead of utc (opw #600751).
Use <time> html element containing UTC time.
Updated POT to contains new translation value

bzr revid: mat@openerp.com-20140107154942-w3xx5914yzej4jb3
2014-01-07 23:49:42 +08:00
jke-openerp ecca2f99c3 [Merge] Merge With Trunk
bzr revid: jke@openerp.com-20140106082030-e0auqh3l9b2cpuyi
2014-01-06 09:20:30 +01:00
Rifakat 9e8be4175b [FIX] crm: when loggin a phonecall from Opportunity, note added to the opportunity(message) having time as UTC and not in user's timezone
bzr revid: rha@tinyerp.com-20140106053039-83domwm1bvrimq8l
2014-01-06 11:00:39 +05:30
Launchpad Translations on behalf of openerp e0951d6e18 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227053952-0hms21l5679mfv9d
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228053802-9q255pplfsr06jvf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230050715-gywiu51n8ejcvnkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231052701-yjrbqgyv2os2z8gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101054400-7tz7obdh31v8log8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140102054530-gtwf0yp277zkqm0i
2014-01-02 05:45:30 +00:00
Gery Debongnie e21539cb88 [IMP] removes old tree view in reporting/crm and replaces them by the new graph view in pivot mode by default (addon crm)
bzr revid: ged@openerp.com-20131231105348-dzcv1rriy3dwqk54
2013-12-31 11:53:48 +01: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
Gery Debongnie bdcb7fcc17 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20131227152252-5kz11jpespxg1h5w
bzr revid: ged@openerp.com-20131230090844-9vugoov6jsc6z5j0
2013-12-30 10:08:44 +01:00
Gery Debongnie 11aa391100 [IMP] convert the graphs defined in the reporting dashboard of crm to the new style (addon crm)
bzr revid: ged@openerp.com-20131226161609-er28iu6gs14gp7dg
2013-12-26 17:16:09 +01:00
Gery Debongnie 6474a028d2 [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon crm)
bzr revid: ged@openerp.com-20131224102650-rbekdotddbgfylcp
2013-12-24 11:26:50 +01:00
jke-openerp 4ca6502d5e [MERGE] Merge with trunk
bzr revid: jke@openerp.com-20131219193521-gs6ty1p0uju8cc21
2013-12-19 20:35:21 +01:00
jke-openerp dd285d23af [TYPO] Rename base_calendar into calendar
bzr revid: jke@openerp.com-20131219144739-9ic700ycef8uklbc
2013-12-19 15:47:39 +01:00
Martin Trigaux 54be818a3b [MERGE] forward port of latest saas-2 until rev 9051 dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
bzr revid: mat@openerp.com-20131218155715-khb909yy99cbmna8
2013-12-18 16:57:15 +01:00
jke-openerp f60e279f1c [MERGE] Merge with trunk
bzr revid: jke@openerp.com-20131210165643-q9y3um1wkik52aam
bzr revid: jke@openerp.com-20131211085000-k34jnv099p667is4
2013-12-11 09:50:00 +01:00
Denis Ledoux 469cea2805 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9686 rev-id: dle@openerp.com-20131210160505-xdeeyooj07im8vz3
bzr revid: dle@openerp.com-20131210160657-c88vzssdkvfi6n96
2013-12-10 17:06:57 +01:00
Xavier ALT a3b8c3aa4e [FIX] crm: use email widget for email_from field in Opportunities form view
bzr revid: xal@openerp.com-20131210110007-v1bdkrxadwr661yv
2013-12-10 12:00:07 +01:00
Thibault Delavallée 03d7a17880 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131210093307-gxn4g59xba3l82zx
2013-12-10 10:33:07 +01:00
Cecile Tonglet 025657653c [FIX] field email_from in crm.lead form view should have a widget email
bzr revid: cto@openerp.com-20131206102051-cls1gh78ze2olst9
2013-12-06 11:20:51 +01:00
Thibault Delavallée f44b3126f6 [IMP] crm: sales team kanban view: added suffix on opportunity sparkline + fixed the one on leads
bzr revid: tde@openerp.com-20131205151424-kctwivphai3kspkz
2013-12-05 16:14:24 +01:00
Thibault Delavallée 5b6b273c1c [CLEAN] crm: effectively removed commented code
bzr revid: tde@openerp.com-20131205145344-y7ierj85glu439l7
2013-12-05 15:53:44 +01:00
Thibault Delavallée ea62cbacf8 [FIX] crm: sales team kanban view: added an oe_clear beceause of alignment issues when adding things below item_list.
bzr revid: tde@openerp.com-20131205144344-d8616y18n2lvnkgu
2013-12-05 15:43:44 +01:00
Thibault Delavallée 73f663eed0 [CLEAN] crm: cleaned modifications before merging :
- moved css into sass file to standardize the process
- commented some records added in the xml file of crm.case.section that do not seem necessary

bzr revid: tde@openerp.com-20131205124749-3a1quhetgxq2d224
2013-12-05 13:47:49 +01:00
Thibault Delavallée f28d5f47b8 [MERGE] Sync with trunk, notably for bootstrap that landed in trunk
bzr revid: tde@openerp.com-20131205102352-ncx6whb8r0fejgcc
2013-12-05 11:23:52 +01:00
Launchpad Translations on behalf of openerp 379dc8bf98 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054445-5fy8zd7lvnn9mjp2
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055138-hq05otjnuktjpa48
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055601-tbzqqhperzffjbjt
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055642-0rwynvhgvs0r14b3
2013-12-04 05:56:42 +00:00
Launchpad Translations on behalf of openerp 4fd98907ce Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054550-w0k8alfqs2bigurx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055222-2u7o99e48254dceu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131203061621-hyqqh11jt7g0ilqh
2013-12-03 06:16:21 +00:00
jke-openerp c66444b2b1 [Merge] Mergie with trunk
bzr revid: jke@openerp.com-20131202144019-f6zu5ciyirorsjp6
2013-12-02 15:40:19 +01:00
Antony Lesuisse 57ef91409a [MERGE] bootstrap3
bzr revid: al@openerp.com-20131202132445-oux9j63auh4om284
2013-12-02 14:24:45 +01:00