cc7031ec28
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20101125053205-1ttc6aqfdmw3543y
2010-11-25 11:02:05 +05:30
df77cd160e
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20101125050318-9xpv65nstz8i4xwf
2010-11-25 10:33:18 +05:30
9ab34ed691
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101125045745-sqwvemtqcmgijfwk
2010-11-25 04:57:45 +00:00
8642e34846
[MERGE] with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
...
bzr revid: jam@tinyerp.com-20101124114919-zmh5nqpjr3ghuszx
2010-11-24 17:19:19 +05:30
6c060e9c84
[MERGE] trunk
...
bzr revid: tfr@openerp.com-20101124092654-svj569t2xv5m5dvn
2010-11-24 10:26:54 +01:00
e76438c449
[BUG] lp:673895
...
bzr revid: jam@tinyerp.com-20101124090342-mtgw7mkiuc95dtfo
2010-11-24 14:33:42 +05:30
432d5ceeae
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20101123131531-xux3r8ss858aztt6
bzr revid: rpa@tinyerp.com-20101124053028-7pclpk0y5egj5jpb
2010-11-24 11:00:28 +05:30
946e03d64c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101124050727-9r80w33i8dkvyp4d
2010-11-24 05:07:27 +00:00
4195027810
[MERGE] merged the report team branch
...
bzr revid: qdp-launchpad@tinyerp.com-20101123120816-koqpir628xdoxtkd
2010-11-23 13:08:16 +01:00
67aa515be4
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20101123053619-rjs2svl5jnomty66
2010-11-23 11:06:19 +05:30
cc849ed706
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20101123052024-cnfcs010ds7aeswc
2010-11-23 10:50:24 +05:30
192810c7e5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101123050442-0990cj01i5c2fhlt
2010-11-23 05:04:42 +00:00
02533c117a
[I18N] all: additional translations courtesy of swedish translation team (Anders Erikkson <ae@mobilasystem.se>)
...
bzr revid: odo@openerp.com-20101122162607-o4zklu2vo2raq4cj
2010-11-22 17:26:07 +01:00
1442f13817
[MERGE]
...
bzr revid: hmo@tinyerp.com-20101122110334-rsh6dqq9p2in012u
2010-11-22 16:33:34 +05:30
ffe2e74ed2
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20101122054525-426fapmok2566wew
2010-11-22 11:15:25 +05:30
823f6042f3
[Merge]: Merge from lp:openobject-addons.
...
bzr revid: rch@tinyerp.com-20101122045750-d4g9pwmy4vg9zv98
2010-11-22 10:27:50 +05:30
c4dcf78c5c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101120050854-smocbr71l96xrsvh
bzr revid: launchpad_translations_on_behalf_of_openerp-20101121045047-c59v2fg760t2kznf
bzr revid: launchpad_translations_on_behalf_of_openerp-20101122045229-yue08u836l0poqpv
2010-11-22 04:52:29 +00:00
8db844d712
[Merge]: Merge from trunk.
...
bzr revid: rch@tinyerp.com-20101119134029-g7s9fotsw59mx9ww
2010-11-19 19:10:29 +05:30
229eb3120f
[IMP]: Group by works correctly when zoom on graph view of Sale Dashboard and select field's button in group by when zoom on graph view.
...
bzr revid: rch@tinyerp.com-20101119125839-yzspdbfxek7yt15b
2010-11-19 18:28:39 +05:30
6caca89f87
[IMP]: Moved reference of demo user from *_security.xml to demo file
...
bzr revid: rpa@tinyerp.com-20101119102525-8gyj1gmm1w29rwxu
2010-11-19 15:55:25 +05:30
a81ecff2c4
[MERGE]: Merge with lp:~openerp-commiter/openobject-addons/trunk-addons-aag
...
bzr revid: rpa@tinyerp.com-20101119072430-0rgszlgidvyezsvd
2010-11-19 12:54:30 +05:30
1422edad60
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101119045123-tyc766imazo8nemj
2010-11-19 04:51:23 +00:00
6bf27c6c65
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20101119042250-hlgt8xeirm1tc5p6
2010-11-19 09:52:50 +05:30
8e9e0586e7
[I18N] all: Updated translations templates to latest terms, after cleanup
...
bzr revid: odo@openerp.com-20101118162512-t98lj2h5r52k0e59
2010-11-18 17:25:12 +01:00
9dae21ab67
[MERGE] Fix crm bug and project imrovement
...
bzr revid: sbh@tinyerp.com-20101118052119-olc3tq5va7si8lv5
2010-11-18 10:51:19 +05:30
eb2fc05914
[MERGE] MERGE with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20101118034714-yurvk3vtq119rdlz
2010-11-18 09:17:14 +05:30
7eedada6ef
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101117045012-amxy5910bu2gnxkl
bzr revid: launchpad_translations_on_behalf_of_openerp-20101117045237-ocn43d52h55iukmm
2010-11-17 04:52:37 +00:00
1a1977fa18
[MERGE]: Merged with team1.
...
bzr revid: uco@tinyerp.com-20101116091931-cs4fnjlh08jobmio
2010-11-16 14:49:31 +05:30
80cd5613d4
Merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
...
bzr revid: ssi@tinyerp.com-20101116091753-e1mvo6kmv4kf9ner
2010-11-16 14:47:53 +05:30
9ce4c19ddb
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101113045543-gq76fkq68gr8ztn4
bzr revid: launchpad_translations_on_behalf_of_openerp-20101114050617-nexh3bn94sursrgz
bzr revid: launchpad_translations_on_behalf_of_openerp-20101115050022-k7zlh9jzqc8beyz4
bzr revid: launchpad_translations_on_behalf_of_openerp-20101116050554-aaipk5pslwtpiv7i
bzr revid: launchpad_translations_on_behalf_of_openerp-20101116050822-70xxlgdqeenfg117
2010-11-16 05:08:22 +00:00
4eaac76fc2
[MERGE]: Merged with team1.
...
bzr revid: uco@tinyerp.com-20101115133424-pjjzj3oirwod37vv
2010-11-15 19:04:24 +05:30
8d3797a58a
[FIX]CRM: undefined search screen on m2o Stages
...
lp bug: https://launchpad.net/bugs/674411 fixed
bzr revid: ssi@tinyerp.com-20101115123516-ltvt8uf4b2v6zi7h
2010-11-15 18:05:16 +05:30
61440d2346
[IMP] crm: Task ID-1796, historizing lead/opportunity stage changes using write method. Removed code from button click event.
...
bzr revid: uco@tinyerp.com-20101115121736-n4zlvrwh92gl2xj8
2010-11-15 17:47:36 +05:30
58c93f841a
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
...
bzr revid: aag@tinyerp.co.in-20101115072327-t05wyy17bnnsuy45
2010-11-15 12:53:27 +05:30
119e7a11d2
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101115050315-qaclmic5ub5vtdnr
2010-11-15 05:03:15 +00:00
764b9f251e
[FIX] correct regression on intalling module without demo data
...
bzr revid: hmo@tinyerp.com-20101114134821-7djwpr6nmmxu584q
2010-11-14 19:18:21 +05:30
ed96a68c17
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101113045740-ri0zzbis11gzhoej
bzr revid: launchpad_translations_on_behalf_of_openerp-20101114050841-xhjhxe3kwbpnt845
2010-11-14 05:08:41 +00:00
3ce82d3133
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101223050236-jfm5xs0fdmqb9mvs
2010-12-23 05:02:36 +00:00
b845bb4ee1
[MERGE] trunk dev addons1
...
bzr revid: tfr@openerp.com-20101222132330-537grpixmbdtz43s
2010-12-22 14:23:30 +01:00
8be856082e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101222054619-0p561c2n1h18e0tc
2010-12-22 05:46:19 +00:00
d9f2060af1
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20101222040512-6ahyzlwt9fnpdl2r
2010-12-22 09:35:12 +05:30
df25a5570c
[I18N] all: cleanup export after fixing some remaining translation export issues
...
bzr revid: odo@openerp.com-20101221194751-g69ixmtrurd6ewo7
2010-12-21 20:47:51 +01:00
281af8c6ea
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20101221041917-h2zvll8cxnpc2b8q
2010-12-21 09:49:17 +05:30
bfa88a17ef
[FIX] [BUG FIXES]:
...
-------------
* lp:690109 :
-> The Parent Project field gives access to the list of analytic accounts.
* lp:691481 :
-> Bug with the lead converted into opportunity log.
bzr revid: tfr@openerp.com-20101220141323-ijxv4e5clbpbcxjv
2010-12-20 15:13:23 +01:00
cbf56f0cec
[MERGE] merged with main addons branch
...
bzr revid: qdp-launchpad@tinyerp.com-20101220114142-mu1fsg93k9bhq66a
2010-12-20 12:41:42 +01:00
fdc4490860
[IMP] crm, marketing_campaign: usability imp. + [REF] procurement: removed unused variable
...
bzr revid: qdp-launchpad@tinyerp.com-20101220113820-u9a2aewa4bshw9jx
2010-12-20 12:38:20 +01:00
78376fc6a3
[MERGE] merged the dev3 branch
...
bzr revid: qdp-launchpad@tinyerp.com-20101220111253-4vrzuc73l0fogj6b
2010-12-20 12:12:53 +01:00
755614448a
[IMP] meeting recurrency : usability impro
...
bzr revid: tfr@openerp.com-20101220104457-j972m8i38kb5rvbp
2010-12-20 11:44:57 +01:00
b106119a0d
[FIX] none repeat type
...
bzr revid: tfr@openerp.com-20101220103240-vmzmvdhpttxp722x
2010-12-20 11:32:40 +01:00
57e438973c
[FIX] buildbot warning
...
bzr revid: tfr@openerp.com-20101220093905-ki6ohk7htbusymtu
2010-12-20 10:39:05 +01:00
1b44e7e0cd
[FIX] crm_lead : context=None and used in write method
...
bzr revid: tfr@openerp.com-20101220093027-k3zojd2l115p0mf9
2010-12-20 10:30:27 +01:00
fd72b6e57d
[IMP] crm_meeting_view : Layout recurrency
...
bzr revid: tfr@openerp.com-20101220092105-dbpsk6h63esuq6i9
2010-12-20 10:21:05 +01:00
9f4bf0452a
[MERGE]
...
bzr revid: uco@tinyerp.com-20101220091903-djepq9i1n33ulq6s
2010-12-20 14:49:03 +05:30
c2c55d4ddc
[FIX] crm: Fixed log message problem when creating opportunity from lead.
...
lp bug: https://launchpad.net/bugs/691481 fixed
bzr revid: uco@tinyerp.com-20101220091355-5e4d47gphs7uzgop
2010-12-20 14:43:55 +05:30
28b9b7101c
[MERGE]
...
bzr revid: tfr@openerp.com-20101220090540-1doq5iyc1fpmy4o1
2010-12-20 10:05:40 +01:00
43cea783a8
[MERGE]
...
bzr revid: uco@tinyerp.com-20101220090417-9vzm73sa5owwtygn
2010-12-20 14:34:17 +05:30
4030d7f466
[FIX] crm: Added line to record logs on leads.
...
bzr revid: uco@tinyerp.com-20101220085314-1ldp2i1j7mlp3yuk
2010-12-20 14:23:14 +05:30
c2f85df411
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101218050707-tdumvza0nnw0ai4c
bzr revid: launchpad_translations_on_behalf_of_openerp-20101219044813-9lk6hs4sgaut10z1
bzr revid: launchpad_translations_on_behalf_of_openerp-20101220045307-e2nnaoqthf10jhmy
2010-12-20 04:53:07 +00:00
01655b4e9c
[MERGE] merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20101220041756-2avhxf2l3hto04i3
2010-12-20 09:47:56 +05:30
69cadabda6
[Fix] crm: fix problem of duplicate lead
...
bzr revid: sbh@tinyerp.com-20101217093347-6o4fv1uvnxydlom1
2010-12-17 15:03:47 +05:30
7830d7f70e
[MERGE] merge from trunk addons
...
bzr revid: mra@mra-laptop-20101217082709-y82tqu3fa6exellb
2010-12-17 13:57:09 +05:30
1cf0cba464
[Fix] crm: cannot save new lead after have duplicated it
...
lp bug: https://launchpad.net/bugs/691006 fixed
bzr revid: sbh@tinyerp.com-20101217082214-9y3my5ytb3mfotnv
2010-12-17 13:52:14 +05:30
fd9290d4e2
[IMP] project_caladav,crm,base_calendar: improve the view of meeting
...
bzr revid: sbh@tinyerp.com-20101217062516-t38ovx8zys4pxrb3
2010-12-17 11:55:16 +05:30
4028b53efe
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101217055305-qykqycjvpt8fc9q0
2010-12-17 05:53:05 +00:00
7468d02118
[IMP] base_calendar,crm: improve the tooltips and view
...
bzr revid: sbh@tinyerp.com-20101217053121-m7m7oucxl61u7nxk
2010-12-17 11:01:21 +05:30
b0f61a9546
[MERGE] merge from trunk addons
...
bzr revid: mra@mra-laptop-20101214130232-wqsim6966u1hilu9
bzr revid: mra@mra-laptop-20101217043732-ri8dfx38pacpruye
2010-12-17 10:07:32 +05:30
5c45f67081
[MERGE] Merge with team1 branch
...
bzr revid: sbh@tinyerp.com-20101217040849-9c3fgn6mie7quelb
2010-12-17 09:38:49 +05:30
52bc357b47
[FIX] Cleaning
...
bzr revid: tfr@openerp.com-20101216120225-vrios8wceyf3cgrd
2010-12-16 13:02:25 +01:00
23035d5d9d
[MERGE] with addons1
...
bzr revid: tfr@openerp.com-20101216111937-9zj3ii659hr4i7wm
2010-12-16 12:19:37 +01:00
a5363f5d1b
[MERGE] solve conflict
...
bzr revid: tfr@openerp.com-20101216110147-p0db1k0d9ltwna5z
2010-12-16 12:01:47 +01:00
cf13a034f3
[FIX] crm : next and previous fix behavior
...
bzr revid: tfr@openerp.com-20101216105445-cqx8duv6hmto43mn
2010-12-16 11:54:45 +01:00
d5ef9b0b3c
[FIX] crm : button mark won, lost, close, open behave like we define in http://pad.openerp.com/stages-behavior
...
bzr revid: tfr@openerp.com-20101216102840-5haeomzrga2rs1lw
2010-12-16 11:28:40 +01:00
fbfd66a689
[MERGE]
...
bzr revid: uco@tinyerp.com-20101216064741-z15pjjvjzekm58ar
2010-12-16 12:17:41 +05:30
125ca66f81
[Merge] Merge with team1 branch
...
bzr revid: sbh@tinyerp.com-20101216045409-6rllaq60cyuiszg9
2010-12-16 10:24:09 +05:30
1f377cca79
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101216044244-go321rqvup2m8l4y
bzr revid: launchpad_translations_on_behalf_of_openerp-20101216044841-ewqql1al8ld9es0h
2010-12-16 04:48:41 +00:00
f2fd74473a
[Merge] Merge with lp:opeobject-addons
...
bzr revid: sbh@tinyerp.com-20101216043040-ypze2jujqdwvct22
2010-12-16 10:00:40 +05:30
aa0ef3c602
[MERGE] all: added missing contexts in most methods + improved context usage according to guidelines
...
bzr revid: odo@openerp.com-20101215171655-ohuu8uwxzza9jbni
2010-12-15 18:16:55 +01:00
2d89b7a153
[I18N] all: re-exported translation templates after latest translation improvements
...
bzr revid: odo@openerp.com-20101215150748-ypwfuhqk5o7f3g48
2010-12-15 16:07:48 +01:00
c0831a70f8
[Add] base_calendar: Add the option of working day
...
bzr revid: sbh@tinyerp.com-20101215120123-xqapd0qdgk178acn
2010-12-15 17:31:23 +05:30
77f150fb03
[IMP] crm,project_caldav: remove the dulpicate field
...
bzr revid: sbh@tinyerp.com-20101215094233-0y0ycserqvd6kuov
2010-12-15 15:12:33 +05:30
1415c477fc
[IMP] base_calendar,crm: remove Edit All and Exclude range button
...
bzr revid: sbh@tinyerp.com-20101215092601-y7o3ccuoo0961db0
2010-12-15 14:56:01 +05:30
452ff6326c
[IMP] crm, project_caldav, base_calendar: Yaml and view improvements.
...
bzr revid: uco@tinyerp.com-20101215085524-b0u0sie3p7lrtdoc
2010-12-15 14:25:24 +05:30
1088315154
base_calandar,crm: remove the custom option
...
bzr revid: sbh@tinyerp.com-20101215073356-otl5jqsuoawnyjiw
2010-12-15 13:03:56 +05:30
81f4edc981
base_calandar,crm: Merge the freq option with rule
...
bzr revid: sbh@tinyerp.com-20101215073136-qhlcf7mqv3n7u38x
2010-12-15 13:01:36 +05:30
3a8f6c2437
[REVERT] Reapplied changes of crm and project_caldav reverted during merge.
...
bzr revid: uco@tinyerp.com-20101215072745-3hskg8z1pf0q15u0
2010-12-15 12:57:45 +05:30
c0509b23cc
[MERGE] project_caldav: Removed Edit All and Exclude range button
...
bzr revid: sbh@tinyerp.com-20101215064056-j79ujyg1be2ocd37
2010-12-15 12:10:56 +05:30
481d1a516b
[MERGE] merge with team1 branch
...
bzr revid: sbh@tinyerp.com-20101215063057-8x4icuelo0ejotnk
2010-12-15 12:00:57 +05:30
9bcfd67d81
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20101215054706-mgwy0cxf5tct6qz5
2010-12-15 11:17:06 +05:30
9b10499abe
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101215043854-s3j1x291m7kl3dig
bzr revid: launchpad_translations_on_behalf_of_openerp-20101215052125-i0y5f9gpuhsjreax
2010-12-15 05:21:25 +00:00
63ace6bb80
[MERGE]
...
bzr revid: uco@tinyerp.com-20101215051143-g5qmevkmic66q0ip
2010-12-15 10:41:43 +05:30
9227b2ced6
[MERGE]
...
bzr revid: uco@tinyerp.com-20101215045126-oyvn206ryyzfi3ci
2010-12-15 10:21:26 +05:30
ab8c38b279
[IMP] access rights improvements + small usability fixes
...
bzr revid: qdp-launchpad@tinyerp.com-20101214160729-lc1q0oy76dygh5s2
2010-12-14 17:07:29 +01:00
cb2c085f9e
[FIX, IMP] crm/scripts : maintenance of the php script, add a contact form
...
bzr revid: tfr@openerp.com-20101214153115-bh7sy2ofgt97tvin
2010-12-14 16:31:15 +01:00
c24f65a8c7
[MERGE]
...
bzr revid: tfr@openerp.com-20101214134149-l0oyg65xzxstwqiw
2010-12-14 14:41:49 +01:00
23ce5a59ff
[FIX] stages_view :type invisible, each stage type has his menu and sales team are display only if needed
...
bzr revid: tfr@openerp.com-20101214133835-wxihjl7g4mqam96r
2010-12-14 14:38:35 +01:00
1c501f8912
[IMP] stage view : type depend on module installed, and stage view give the opportunity to choose the sales team
...
bzr revid: tfr@openerp.com-20101214131959-gzire7hxl07o1g3q
2010-12-14 14:19:59 +01:00
4fd5a48403
[IMP] crm: Removed 'Edit All' and 'Exclude range' buttons without changing the functionality on Meetings.
...
bzr revid: uco@tinyerp.com-20101214120954-fk7hv5ct4dqxbopz
2010-12-14 17:39:54 +05:30
37a3a4fbf4
[BUG-FIX] lp:689536 1) the sales and purchase tab of customer should place salesman and salesteam next to each other.
...
bzr revid: jam@tinyerp.com-20101214111230-w33krss4ryabi5qi
2010-12-14 16:42:30 +05:30
85aecd5eee
[Fix] crm: Fix the problem of create a Inbound call from the history tab of the partner form
...
lp bug: https://launchpad.net/bugs/689574 fixed
bzr revid: sbh@tinyerp.com-20101214105014-lf1yfz914wahsyhc
2010-12-14 16:20:14 +05:30
690fbff411
[MERGE]
...
bzr revid: uco@tinyerp.com-20101214073712-b51lj9zyba9p1bp9
2010-12-14 13:07:12 +05:30
rpa (Open ERP)
Sbh (OpenERP)
Launchpad Translations on behalf of openerp
jam-openerp
Thibault Francois
Olivier Dony
Harry (OpenERP)
rch-openerp
uco (OpenERP)
ssi
aag (OpenERP)
Mustufa Rangwala