bdeb623399
[IMP]: resolved all conflicts
...
bzr revid: cha@tinyerp.com-20120530133024-ex0xf9142j8cn34o
2012-05-30 19:00:24 +05:30
7a7661fa79
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20120530052856-dk8mfa6h6i5shs95
2012-05-30 10:58:56 +05:30
d18cb96c97
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20120528062205-ukjcxs41f917dsk2
2012-05-28 11:52:05 +05:30
1227741b5a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120526050749-nakl3x59zsy0e3ln
bzr revid: launchpad_translations_on_behalf_of_openerp-20120527044006-4kmo9posveuumgsz
2012-05-27 04:40:06 +00:00
47cc03c954
[MERGE] merge with main addons
...
bzr revid: cha@tinyerp.com-20120523111541-o1o60ncctasc5t41
2012-05-23 16:45:41 +05:30
7418558d1d
[IMP] : removed button from tree
...
bzr revid: cha@tinyerp.com-20120523110047-3403esloff9i98ki
2012-05-23 16:30:47 +05:30
5a78049c7a
[merge] removed complexity and update applications
...
bzr revid: fp@tinyerp.com-20120523063913-kn324m7u80o5dgol
2012-05-23 08:39:13 +02:00
42b96c577a
[FIX] bad merge
...
bzr revid: fp@openerp.com-20120522180936-tzzmbc7ypfd471o3
2012-05-22 20:09:36 +02:00
58b4853c7e
[FIX] bad merge
...
bzr revid: fp@tinyerp.com-20120522162809-ip04ohnzpz39omzz
2012-05-22 18:28:09 +02:00
5c791531aa
[IMP] improved typos
...
bzr revid: fp@tinyerp.com-20120522161055-6013qr1s4p773hoj
2012-05-22 18:10:55 +02:00
31a851ad15
[IMP] marketing_campaign : Removed all filters related to a date field and added the related date field in the search view.
...
bzr revid: mdi@tinyerp.com-20120522100416-vxto8fumhcnil9hz
2012-05-22 15:34:16 +05:30
b3fa4ccf5c
[IMP] removed icons from topbar
...
bzr revid: fp@tinyerp.com-20120522091445-mpiknieg2v8sd31f
2012-05-22 11:14:45 +02:00
ee566d388c
[IMP] merged topbar status widgets
...
bzr revid: fp@tinyerp.com-20120522085037-oktkq3td2hg9lvzr
2012-05-22 10:50:37 +02:00
ea859f54c8
[IMP]all: remove a complexity in openerp and move asset management and Payroll in extra modules
...
bzr revid: mma@tinyerp.com-20120518052605-e6sdmicwtb4kcoq0
2012-05-18 10:56:05 +05:30
a2a05cfc19
[IMP]:improved titles State by Status everywhere
...
bzr revid: ssu@tinyerp.com-20120504115748-2vd1dns7bxptg384
2012-05-04 17:27:48 +05:30
70c7252b2c
[IMP]
...
bzr revid: apa@tinyerp.com-20120502055006-yhsd5qwpc0asfn7b
2012-05-02 11:20:06 +05:30
d1147c51e9
[IMP]
...
bzr revid: apa@tinyerp.com-20120501123446-kykbs2zi3pj0kq9u
2012-05-01 18:04:46 +05:30
13efdaf8a3
[MERGE]:set order while merging. lp:~openerp-dev/openobject-addons/trunk-marketing_campaign-topbar-tpa
...
bzr revid: apa@tinyerp.com-20120427112326-32tickb5k6rtoxck
2012-04-27 16:53:26 +05:30
baa8158e77
[IMP] market_campaign: improved view of market campaign activities
...
bzr revid: tpa@tinyerp.com-20120426071237-ev10lthxgp0pb4pm
2012-04-26 12:42:37 +05:30
bdeac6b5f3
[IMP] market_campaign: improved view of segments
...
bzr revid: tpa@tinyerp.com-20120426070923-jttlccs7hoesx2xj
2012-04-26 12:39:23 +05:30
83b6b2a1e5
[IMP] market_campaign: improved view of campaign
...
bzr revid: tpa@tinyerp.com-20120426070655-sz8wz151snmlx5yd
2012-04-26 12:36:55 +05:30
549e2f5064
[IMP] association, auction, event, idea, marketing, membership, subscription, survey: remove group_extended
...
bzr revid: rco@openerp.com-20120425143528-gat2f4cdotqv1x06
2012-04-25 16:35:28 +02:00
e9f015e217
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120424045336-z7vvlldbzqcxlzbg
bzr revid: launchpad_translations_on_behalf_of_openerp-20120425044636-947k9ddma8u81o50
2012-04-25 04:46:36 +00:00
e17dee3a5e
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120323052530-l9fsd06fbma1l3gz
2012-03-23 10:55:30 +05:30
a4a2696fb3
[MERGE] branch merged with lp:openobject-addons
...
bzr revid: jap@tinyerp.com-20120321065621-rr4ehnehog9aq4d2
2012-03-21 12:26:21 +05:30
5615911303
[MERGE] Latest bugfixes from 6.1
...
bzr revid: odo@openerp.com-20120320182912-g2ylze2qsqv93y4i
2012-03-20 19:29:12 +01:00
79ff0e3424
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120321065319-pj7o5oz8pdr0v2jm
2012-03-21 12:23:19 +05:30
dd16fb2819
[FIX] marketing_campaign: correct search view, today should not be OR'ed with states
...
In 6.1 a group of filters in a search view are
OR'ed together if toggled when they are contained
within the same 'separator' group.
bzr revid: odo@openerp.com-20120309011312-zcn29o4r3uqjxiow
2012-03-09 02:13:12 +01:00
bfe0f1a489
[IMP] markeeting_campaign removed the address_id in rer
...
bzr revid: jam@tinyerp.com-20120307064650-9u0y0w9wt60pucqi
2012-03-07 12:16:50 +05:30
b26fdadccc
[MERGE] branch merged with trunk-menus-improvements-reporting-mtr
...
bzr revid: mtr@tinyerp.com-20120305095729-33g12fp1jqajhgbr
2012-03-05 15:27:29 +05:30
5c0a90f410
[IMP] marketing_campaign: remove default filter on list view
...
bzr revid: jap@tinyerp.com-20120229133318-vwubk2qp7cl1eh8v
2012-02-29 19:03:18 +05:30
609b704c9f
[IMP] marketing: renamed menu Events Organisation => Events and change the sequence of Campaign Followup and Campaigns
...
bzr revid: jap@tinyerp.com-20120229132135-qjvwh8utbd3ndoap
2012-02-29 18:51:35 +05:30
fefba7d11e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120229052746-lhfn0qjqmzuqz1js
2012-02-29 05:27:46 +00:00
3d0cc26eb0
[IMP] association, marketing_campaign:-changed menu sequence for reporting
...
bzr revid: mtr@tinyerp.com-20120228095158-82f6s0qoo9lh396a
2012-02-28 15:21:58 +05:30
f210e73f21
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120225055251-o6ajm1k0ya17sd2j
bzr revid: launchpad_translations_on_behalf_of_openerp-20120226052201-liykx2ue4jufkcwc
bzr revid: launchpad_translations_on_behalf_of_openerp-20120227055617-7bb3evbppqedlx8p
bzr revid: launchpad_translations_on_behalf_of_openerp-20120228063037-0nhyn4iid36dorfs
2012-02-28 06:30:37 +00:00
ab9ee8c656
[IMP] marketing_campaign:- reorganise menu
...
bzr revid: mtr@tinyerp.com-20120228052847-cvzip3xp1oi4n7ju
2012-02-28 10:58:47 +05:30
9b0c341975
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120222065619-wdj17h21k8iuy3w6
bzr revid: launchpad_translations_on_behalf_of_openerp-20120222065704-3l8az0alwzd2mrmk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120222065707-hp0u1vljdfgyjqxf
2012-02-22 06:57:07 +00:00
a3ac698fe8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120218071328-fl3yjw2gawigfooh
bzr revid: launchpad_translations_on_behalf_of_openerp-20120219063344-7w5y8nkweukg0f88
bzr revid: launchpad_translations_on_behalf_of_openerp-20120220061321-0z254064e8vsx286
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221063558-wc526qfv4ko5s6q0
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221063603-medp0cjt2z5vy70x
2012-02-21 06:36:03 +00:00
88c25488a5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120218050004-fsjgcm68ejwkyila
bzr revid: launchpad_translations_on_behalf_of_openerp-20120219054401-1933r0e5ukykqh0h
bzr revid: launchpad_translations_on_behalf_of_openerp-20120220054126-hug47vk8c43pxbqk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221055612-pdqteum51dyapu2e
2012-02-21 05:56:12 +00:00
9f65e1565e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120217050201-xlguleciidhnkxln
bzr revid: launchpad_translations_on_behalf_of_openerp-20120217051344-6opxazcgg875mypq
2012-02-17 05:13:44 +00:00
74b3b0bc69
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214054303-2gawtr1s4zulhhhs
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214054630-925y7kotw7axa7z4
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214061906-2g5kxwe0xle5u54c
2012-02-14 06:19:06 +00:00
2aa2378015
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120211050953-f8t9zos3qjzmnj3t
bzr revid: launchpad_translations_on_behalf_of_openerp-20120212044319-nxuw0h7g5aqrqy4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20120213045042-jyku2inv3wkcae91
2012-02-13 04:50:42 +00:00
0e2e9ddd78
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209055558-qfwy9bg1km791dys
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209071015-0jykfhbo8iamzpzk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209072746-stmwycdircyzrxn4
2012-02-09 07:27:46 +00:00
3afecc7604
[ADD] es_CR.po: added po to all modules, copy from es.po or from pot
...
bzr revid: carlos.vasquez@clearcorp.co.cr-20120208145917-aaai0irh68omlzmb
2012-02-08 08:59:17 -06:00
320b2d2e2e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120208060921-wir47e717rh04xxn
bzr revid: launchpad_translations_on_behalf_of_openerp-20120208063913-vg9qdu30tx09ojrl
2012-02-08 06:39:13 +00:00
0a63ecb0cf
[I18N] all: updated translation template
...
This should be the last major template sync
before the final release of 6.1.
bzr revid: odo@openerp.com-20120208010830-zchnkg48u7s40nw2
2012-02-08 02:08:30 +01:00
ad4b6fcc21
[IMP] manifest: renamed active to auto_install.
...
bzr revid: vmt@openerp.com-20120130101837-zyebtyhfjypg2b4w
2012-01-30 11:18:37 +01:00
ffbff476df
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120128050312-sep3uryazw4j1xz6
bzr revid: launchpad_translations_on_behalf_of_openerp-20120129052156-67wqllfafijp6h1m
bzr revid: launchpad_translations_on_behalf_of_openerp-20120130044112-h04p0g5ne16y1nav
bzr revid: launchpad_translations_on_behalf_of_openerp-20120128050513-ncpdbsqyyk18pc67
bzr revid: launchpad_translations_on_behalf_of_openerp-20120129052226-dfcf7sm2r00y1s3s
bzr revid: launchpad_translations_on_behalf_of_openerp-20120130044131-sdsyvt62gvyzo0e3
2012-01-30 04:41:31 +00:00
7dfe3e3413
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120126052824-8ja030g3lhanp8g7
2012-01-26 05:28:24 +00:00
d49c7de24d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120119045114-1uzft0w0d45gb143
2012-01-19 04:51:14 +00:00
a61762c71f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120114051310-6sj2xkv5gwq8cr0p
2012-01-14 05:13:10 +00:00
1ba5e0ae7c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120113044029-g5gennaovbmjxfut
bzr revid: launchpad_translations_on_behalf_of_openerp-20120113050144-no4194ciwerac0dr
2012-01-13 05:01:44 +00:00
ed8233ed22
[FIX] marketing_campaign: readded required attribute because of model violations it could generate
...
bzr revid: tde@openerp.com-20120110110418-miw9pgwcyhfhzdfx
2012-01-10 12:04:18 +01:00
5e9d022fcb
[MERGE] marketing_campaign: fixed bug 911769: removed required attribute of campaign activity to be able to create activities when creating a campaign
...
bzr revid: tde@openerp.com-20120110103130-7v7t5b2pz6s7k7pq
2012-01-10 11:31:30 +01:00
e813a62b29
[MERGE] lp:908739 (marketing_campaign: improve activity view)
...
bzr revid: rco@openerp.com-20120110095743-nd5p8spvvl27bgj2
2012-01-10 10:57:43 +01:00
1b9f78308b
[IMP] marketing_campaign :- improve view in marketing.campaign.activity object.
...
bzr revid: support@serpentcs.com-20120110082549-9p0as341u3ijl4he
2012-01-10 13:55:49 +05:30
717b59c00c
[FIX] marketing_campaign :- fix view related problem change col 1 to 2.
...
lp bug: https://launchpad.net/bugs/908739 fixed
bzr revid: support@serpentcs.com-20120107072731-bzk1ub5dk36z31s9
2012-01-07 12:57:31 +05:30
dd2f75849e
[FIX] remove the required attribute from m2o compaign_id of marketing.campaign.activity .
...
bzr revid: nco@tinyerp.com-20120106113353-o3to6e2kos0acdxn
2012-01-06 17:03:53 +05:30
8aff5209ea
[IMP] improved error message, constraints must allways propose a solution
...
bzr revid: fp@fp-laptop-20111231075720-4kak7o320td4wxqc
2011-12-31 08:57:20 +01:00
55446d0097
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20111230054000-0ygl1bapby2gy0pt
2011-12-30 05:40:00 +00:00
a6c649dd4e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20111223054503-il515335tdfkghbw
bzr revid: launchpad_translations_on_behalf_of_openerp-20111223073609-mpe8e232ykba47y0
2011-12-23 07:36:09 +00:00
cb28f8de07
[I18N] all: update translation templates
...
bzr revid: odo@openerp.com-20111222185539-9gn06tu38ynoc416
2011-12-22 19:55:39 +01:00
8e2457efe8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20111220045056-kxmsczkxkgf5ffe1
bzr revid: launchpad_translations_on_behalf_of_openerp-20111220045629-sx3btepqeei2nq1k
2011-12-20 04:56:29 +00:00
5cfeb7ddba
[FIX] bug 902131 close instead of done
...
bzr revid: fp@tinyerp.com-20111219215028-5ukoagwjnpo0x48k
2011-12-19 22:50:28 +01:00
68ff6cb98a
[MERGE] marketing_campaign: improve tests
...
bzr revid: rco@openerp.com-20111215103225-8rlbof75uxnqjkrw
2011-12-15 11:32:25 +01:00
fbea42e45e
[IMP] changed the name of button from Close to Done.
...
bzr revid: tpa@tinyerp.com-20111213091854-vc8z7catofgklmbw
2011-12-13 14:48:54 +05:30
82e232fc4e
[MERGE] merged
...
bzr revid: hmo@tinyerp.com-20111213074305-0x72r6vv7fuvnok0
2011-12-13 13:13:05 +05:30
359f0b42e2
[MERGE] merged with trunk development branch.
...
bzr revid: hmo@tinyerp.com-20111213074129-0frej7vvaefubybe
2011-12-13 13:11:29 +05:30
f9524f5dba
[IMP] improvement in YML test cases in marketing_campaign module
...
bzr revid: tpa@tinyerp.com-20111213052238-kuk13vidnoa3fwhq
2011-12-13 10:52:38 +05:30
f27318c8af
[IMP] Security Rule: removed duplicates due to inheritancies of groups
...
bzr revid: fp@tinyerp.com-20111212181113-mhnnbps3ip8ls6pp
2011-12-12 19:11:13 +01:00
5030f3e6d1
[IMP] solved the error in yml test case
...
bzr revid: tpa@tinyerp.com-20111212062225-pjqkhlz7nbg1k09h
2011-12-12 11:52:25 +05:30
5bb0bf0441
[IMP] Core applciations update
...
bzr revid: fp@tinyerp.com-20111211212510-d61afdy0nyw74j6c
2011-12-11 22:25:10 +01:00
3f74a7f2c8
[FIX] Fix issue of button in marketing_campaign module
...
bzr revid: tpa@tinyerp.com-20111209132555-gjh7a5d33d98l7q0
2011-12-09 18:55:55 +05:30
eb4c08585d
[MERGE]: Merged with trunk-addons.
...
bzr revid: uco@tinyerp.com-20111209110252-u2ai6i63icpwblhc
2011-12-09 16:32:52 +05:30
9e6a6b6d28
[MRG]
...
bzr revid: tpa@tinyerp.com-20111209104836-kp4jy0pl60vakmc3
2011-12-09 16:18:36 +05:30
69f685f386
[IMP] rename is_application to application
...
bzr revid: al@openerp.com-20111208222543-avte2h9qit5zfvht
2011-12-08 23:25:43 +01:00
1831cddc7e
[FIX] core -> is_application
...
bzr revid: chs@openerp.com-20111208151455-d7pffuiwxdns76ec
2011-12-08 16:14:55 +01:00
0eab577b40
[IMP] Core modules for apps
...
bzr revid: fp@tinyerp.com-20111206112127-5lir7aovygx4a4oi
2011-12-06 12:21:27 +01:00
82753bfc6a
[IMP] marketing_campaign: clenup yml again
...
bzr revid: hmo@tinyerp.com-20111202111524-wk0wnrki1b0bm3po
2011-12-02 16:45:24 +05:30
370e0c6510
[IMP] marketing_campaign: cleanup demo and yml to test process of compaign
...
bzr revid: hmo@tinyerp.com-20111202110118-3w1h2z38d844f04i
2011-12-02 16:31:18 +05:30
4e99a743b3
[MERGE] merged with trunk development branch: lp:~openobject-addons
...
bzr revid: hmo@tinyerp.com-20111202084648-mhvwmmu2k83fg2vd
2011-12-02 14:16:48 +05:30
0a28852979
[IMP] marketing_campaign: improve yml to test process of campaign segmentation, add new demo data for partner channel in marketing_campaign module
...
bzr revid: hmo@tinyerp.com-20111130113652-uqxjdy7icybq2h4g
2011-11-30 17:06:52 +05:30
779fa653c1
[IMP] Added missing vim mode lines
...
lp bug: https://launchpad.net/bugs/524279 fixed
bzr revid: ls@numerigraphe.fr-20111122085138-x6u2lcl6vrpyybp9
2011-11-22 09:51:38 +01:00
c465e9c3f7
merge: better year/month OR separations
...
bzr revid: fp@tinyerp.com-20111111151839-3dai448l29o0gwov
2011-11-11 16:18:39 +01:00
6cbf19d815
[Merge] es_MX from Vauxoo
...
bzr revid: fp@tinyerp.com-20111111144930-5o37idpxdvyhtfri
2011-11-11 15:49:30 +01:00
afe2cdb3c7
[MERGE] Merged with lp:addons
...
bzr revid: ron@tinyerp.com-20111111110356-gas4sfpm9knt104h
2011-11-11 16:33:56 +05:30
02cfa857f5
[REF] marketing_campaign: Used get_object_reference instead of _get_id from data got from ir.model
...
bzr revid: ron@tinyerp.com-20111111094142-r50oajp8fhe3nzjl
2011-11-11 15:11:42 +05:30
20a06c35ca
[IMP]marketing:improvement analysis report
...
bzr revid: kbh@tinyerp.com-20111111084358-6xxzvw3x1bfmreo8
2011-11-11 14:13:58 +05:30
207e964b2b
[IMP]marketing:improvement analysis report
...
bzr revid: kbh@tinyerp.com-20111110102059-oijxnmbsfxk1uz42
2011-11-10 15:50:59 +05:30
fd9ec559cb
[IMP] marketing_campaign, marketing_campaign_crm_demo: Traceback generate when processing workitem, and Improved demo data of Email template
...
bzr revid: ron@tinyerp.com-20111108112023-1fwd5vdez50lmiiw
2011-11-08 16:50:23 +05:30
2393cbcaab
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20111108054936-o85vdc79709844pf
bzr revid: launchpad_translations_on_behalf_of_openerp-20111108061220-ayp19sctv6uvxl1u
2011-11-08 06:12:20 +00:00
6f77ce98c7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20111105055805-1lmgpe8dot0mqkd3
bzr revid: launchpad_translations_on_behalf_of_openerp-20111105060437-gd0ilsg6cdytkvq2
2011-11-05 06:04:37 +00:00
e3ffcd94d6
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20111019044609-vzsrc1a6nn17ahbo
bzr revid: launchpad_translations_on_behalf_of_openerp-20111019055343-7s4rmkn8lpxvyt4n
bzr revid: launchpad_translations_on_behalf_of_openerp-20111019060521-3smagczfoys4j5wl
2011-10-19 06:05:21 +00:00
52b23d7040
[ADD] added es_MX.po translation files for each module
...
bzr revid: israel@openerp.com.ve-20111007201144-kap9ou7w8g92ai02
2011-10-07 16:11:44 -04:00
9b189d5a90
[ADD] added the es_VE.po translation files for each module
...
bzr revid: israel@openerp.com.ve-20111007193500-i7k8h9t28nhxioap
2011-10-07 15:35:00 -04:00
3dc8168974
[FIX] Set the categories
...
bzr revid: stw@openerp.com-20111005141902-72du0lku4x176ix9
2011-10-05 16:19:02 +02:00
7c93366eab
[FIX] Update the categories of some modules
...
bzr revid: stw@openerp.com-20110930154646-9tr60seb389nw3yd
2011-09-30 17:46:46 +02:00
1ba826a4ea
[REF] Rename the categories
...
bzr revid: stw@openerp.com-20110928141258-9hfn5rfhboar2e5z
2011-09-28 16:12:58 +02:00
0e861ae34a
[MERGE]: Merge with latest trunk-addons and resolved conflicts in bank statement as new state was added in statement
...
bzr revid: rpa@tinyerp.com-20110922061419-cvaza3f5050o0b85
2011-09-22 11:44:19 +05:30
1be371c851
[IMP]account_voucher,crm_claim,crm_fundraising,marketing_campaign,stock,purchase_requisition:removed a quote from statusbar_colour as per suggestion
...
bzr revid: mma@tinyerp.com-20110921051720-ag458lyz42o64bhb
2011-09-21 10:47:20 +05:30
05d6d35cc8
[Merge]
...
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
364f9aefa9
[IMP]stock,purchase_requisition,crm:statusbar Improvement is Done
...
bzr revid: mma@tinyerp.com-20110914131111-3o0jykg61r5eq98c
2011-09-14 18:41:11 +05:30
d22c3043aa
[FIX] marketing_campaign: typos and cleanup
...
bzr revid: odo@openerp.com-20110912180025-scdjvcnquo07zcha
2011-09-12 20:00:25 +02:00
983a7d2fd2
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110912123152-xswj0jlmhp7qpoz8
2011-09-12 14:31:52 +02:00
178fec5c64
[FIX] str 'in' str (singletons missing tuple-building comma), in @colors attributes. Replace by string equality
...
bzr revid: xmo@openerp.com-20110911135025-v9yct8pnjfj21tyj
2011-09-11 15:50:25 +02:00
f42126df0e
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110906080846-lyi3haucchsaz7uo
2011-09-06 10:08:46 +02:00
752df5acbd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110905055933-cld0r3vv3jmiu5bx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110906044018-ajk9u7zfqoiatufs
2011-09-06 04:40:18 +00:00
b0bed63351
[IMP] mail.thread: renaming methods to avoid collisions with objects that use the mixin
...
bzr revid: odo@openerp.com-20110823175809-hw81fkptg90702vh
2011-08-23 19:58:09 +02:00
50507512cb
[MERGE] latest trunk
...
This was a helluva merge, with hundreds of conflicts resolved manually!!
I hope I did not break too many things, but a full review of the mail-related
features (where most of the conflicts occurred) must still be done before
this feature branch can be merged.
bzr revid: odo@openerp.com-20110809234428-3dsvxrt6t54ju0cf
2011-08-10 01:44:28 +02:00
292b4683b6
[MERGE] add field 'complexity' in modules
...
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
2011-07-08 12:03:07 +02:00
1f5aa0643f
[IMP]: module is defined by its complexity
...
bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
2011-07-06 17:59:28 +05:30
5a823350e0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110702050634-xl59j3cyqucb2xbr
bzr revid: launchpad_translations_on_behalf_of_openerp-20110703044707-mjrlbh7l81jm56z7
bzr revid: launchpad_translations_on_behalf_of_openerp-20110705043321-ij8r6auabm4cptt6
2011-07-05 04:33:21 +00:00
06fb14130a
[IMP] removed method=True params from all fields.function
...
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields,
so this is the equivalent addons fix, removing it everywhere.
Please be careful from now on, and do not pass it anymore!
bzr revid: odo@openerp.com-20110701234124-a61zl0idvdfz3hyb
2011-07-02 01:41:24 +02:00
f1ea42e230
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110701045457-prq3cv67drfa19xt
2011-07-01 04:54:57 +00:00
f08cf2f85f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110507045323-azozpfkhj7vaix3f
bzr revid: launchpad_translations_on_behalf_of_openerp-20110507045352-2mjk93fx426eijy4
bzr revid: launchpad_translations_on_behalf_of_openerp-20110508043753-3bcytaz1rrn2vvbh
bzr revid: launchpad_translations_on_behalf_of_openerp-20110509043658-oyhxuwreey6yc4r1
2011-05-09 04:36:58 +00:00
d553615695
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110429055618-q15rvfmlvfsl2im5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110430045341-qzlphdlvqf2aa1zx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110501045420-py2vl38b1o3mfs7o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110502043731-ym2tvgj2djoitk8f
2011-05-02 04:37:31 +00:00
0577796333
[MERGE] merged addons trunk development branch after resolving conflicts
...
bzr revid: hmo@tinyerp.com-20110421080156-3c8gg29i01089rgo
2011-04-21 13:31:56 +05:30
b11a71fd87
[MERGE] improvement project-issue
...
bzr revid: tfr@openerp.com-20110407114145-xvr27pjquxwk9ff0
2011-04-07 13:41:45 +02:00
1a45ff614d
[MERGE] crm improvement
...
bzr revid: tfr@openerp.com-20110407092730-bjm0pwq9mewpvzc0
2011-04-07 11:27:30 +02:00
63de8740bc
[FIX] csv file semicolon error
...
bzr revid: rha@tinyerp.com-20110405061713-b9qmkeqqg64er6lf
2011-04-05 11:47:13 +05:30
47a85e9f8f
[IMP] mail: rename module email to mail because of parsing error
...
bzr revid: rha@tinyerp.com-20110404094552-j2rdq2sbeqrbffgn
2011-04-04 15:15:52 +05:30
cf7c73310d
[MERGE] merged with trunk addods development branch
...
bzr revid: hmo@tinyerp.com-20110329122736-78igudbed2jz7lf4
2011-03-29 17:57:36 +05:30
1b7854503d
[IMP] Improvements to the screenshots for some modules.
...
bzr revid: nicolas.vanhoren@openerp.com-20110322131214-g4h9rzpam67k2ym9
2011-03-22 14:12:14 +01:00
cf07e58016
[MERGE] Other improvements of descriptions in module manifests.
...
bzr revid: nicolas.vanhoren@openerp.com-20110318140618-jg2jumv3gyacfb74
2011-03-18 15:06:18 +01:00
437ed909c2
[IMP]: Module descriptions.
...
bzr revid: vro@tinyerp.com-20110318114737-znh9wtipt84hc5jd
2011-03-18 17:17:37 +05:30
a898038b47
[MERGE] Merged module screenshots and improvements to module descriptions.
...
bzr revid: nicolas.vanhoren@openerp.com-20110318110816-f8bnmmlfzc9eqyu7
2011-03-18 12:08:16 +01:00
edbb2d7168
[MERGE] Improvements to manifests.
...
bzr revid: nicolas.vanhoren@openerp.com-20110317122126-q1vxxy287aykxv6h
2011-03-17 13:21:26 +01:00
117d3f75a0
[MERGE]: Merge with latest trunk
...
bzr revid: rpa@tinyerp.com-20110317095800-l0sc4mj3uktsm8wa
2011-03-17 15:28:00 +05:30
f74b1bafe0
[IMP] marketing_campaign: added unique field for duplicate prevention on the campaign form
...
bzr revid: odo@openerp.com-20110316182903-9qh08k4wu2wb14hr
2011-03-16 19:29:03 +01:00
0045ab984c
[IMP] marketing_campaign: duplicate prevention for segments can now use a unique field set on the campaign
...
bzr revid: odo@openerp.com-20110316182356-r7xqcmz42se6n4ms
2011-03-16 19:23:56 +01:00
d4672f80ac
[ADD]: Images: lunch, mail_gateway, marketing, marketing_campaign
...
bzr revid: vro@tinyerp.com-20110316074733-rlpnvdspeguh3fnc
2011-03-16 13:17:33 +05:30
4e6a9ea55c
[REM] all @col and @colspan attributes on groups in search views: search views are not laid out by columns, therefore these attributes do not belong
...
bzr revid: xmo@openerp.com-20110315140859-uh9w3exdit84qz47
2011-03-15 15:08:59 +01:00
8141573dee
[REM] attribute 'select' on field elements in search views, this attributes makes no sense
...
bzr revid: xmo@openerp.com-20110315124111-c79fxotsc0tk011q
2011-03-15 13:41:11 +01:00
488200e0c9
[FIX] marketing_campaign: avoid exception when resource linked to workitem was deleted
...
bzr revid: odo@openerp.com-20110312011401-qy5lmffp4owfsxf6
2011-03-12 02:14:01 +01:00
cbb98b719b
[FIX] marketing_campaign: fixed search on res_name on workitems + minor tweaks
...
bzr revid: odo@openerp.com-20110312000705-rbjet1wg30y79v12
2011-03-12 01:07:05 +01:00
599d655465
[FIX] marketing_campaign: workitem.process_all() must respect campaign states
...
bzr revid: odo@openerp.com-20110311104831-ewujjdgwg1jd5qhc
2011-03-11 11:48:31 +01:00
02a703770a
[IMP] marketing_campaign: activity now passes workitem to server actions via context
...
bzr revid: odo@openerp.com-20110311104300-ka3616hqa8ad52qg
2011-03-11 11:43:00 +01:00
e1afe5828a
[IMP] change module name emails to email and related to changes in addons all module. move email_gateway module file in email module and also related changes in related module..
...
bzr revid: ysa@tinyerp.com-20110310073900-ivesygpb7cdwpp43
2011-03-10 13:09:00 +05:30
e3e979a498
[MERGE] default value in act_window
...
bzr revid: tfr@openerp.com-20110309130345-uraw50vl1xlzqy6t
2011-03-09 14:03:45 +01:00
a69c473f52
[IMP] Changed all module categories, limited number of categories
...
bzr revid: evv@openerp.com-20110309100505-mwxe08davyzdkfis
2011-03-09 11:05:05 +01:00
1e681a15bc
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110305045627-sks4s3i42qo2oj3p
bzr revid: launchpad_translations_on_behalf_of_openerp-20110306045008-pcson59t3bl9r6ax
bzr revid: launchpad_translations_on_behalf_of_openerp-20110307044936-g60qlnsbhllrba7h
bzr revid: launchpad_translations_on_behalf_of_openerp-20110308044752-1i8vh7qa5baootby
bzr revid: launchpad_translations_on_behalf_of_openerp-20110309044026-i5o7lki6yoc0wwol
2011-03-09 04:40:26 +00:00
4c3c85a945
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110304044528-3aw0bq4jyxvz4gyb
2011-03-04 04:45:28 +00:00
53dc88ecaa
[IMP+FIX] emails: menu name improvement for Incomming server and Outgoing Server and fix regression in markertin compain module
...
bzr revid: hmo@tinyerp.com-20110215073150-q3r9hyk41ryn1jjx
2011-02-15 13:01:50 +05:30
6eaf481c6c
[MERGE] merged work from ysa-addons branch
...
bzr revid: hmo@tinyerp.com-20110214060627-z3lnvmp02dkhw374
2011-02-14 11:36:27 +05:30
30bfcd2574
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110211045958-qw2uif8guhebh48q
2011-02-11 04:59:58 +00:00
25d6bc3f95
[MERGE] Merge with lp:~openerp-dev/openobject-addons/emails-framework-addons
...
bzr revid: ysa@tinyerp.com-20110209070516-yfqydt9y21qk40mx
2011-02-09 12:35:16 +05:30
7b6e366a5f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110208043710-75bxojtr8ox15lgb
bzr revid: launchpad_translations_on_behalf_of_openerp-20110209045556-98ev5i679ddf25uu
2011-02-09 04:55:56 +00:00
05336df19f
[IMP] change module name email to emails.
...
bzr revid: ysa@tinyerp.com-20110208094016-7svkud5dzdf8a2uc
2011-02-08 15:10:16 +05:30
0ee0948e88
[MERGE] merge with lp:openobject-addons
...
bzr revid: ysa@tinyerp.com-20110207091748-s2fasyxlx5h5zi8k
2011-02-07 14:47:48 +05:30
93f54b8f03
[IMP] email, email_template and email_gateway related changes done in addons module..
...
bzr revid: ysa@tinyerp.com-20110207072906-knh218shj8ufyxu7
2011-02-07 12:59:06 +05:30
Ajay Chauhan (OpenERP)
Divyesh Makwana (Open ERP)
Launchpad Translations on behalf of openerp
Fabien Pinckaers
Fabien Pinckaers
Mayur Maheshwari (OpenERP)
Saurang Suthar (OpenERP)
Amit Patel (OpenERP)
Turkesh Patel (Open ERP)
Raphael Collet
Sbh (Openerp)
Jagdish Panchal (Open ERP)
Olivier Dony
Jigar Amin - OpenERP
Meera Trambadia (OpenERP)
Carlos Vásquez
Vo Minh Thu
Thibault Delavallée
Serpent Consulting Services
Nimesh (Open ERP)
fp
Harry (OpenERP)
Ujjvala Collins (OpenERP)
Antony Lesuisse
Christophe Simonis
Numerigraphe - Lionel Sausin
Khushboo Bhatt (Open ERP)
Israel Fermin Montilla
Stephane Wirtel
Rucha (Open ERP)
Xavier Morel
Hardik Ansodariy (OpenERP)
Thibault Francois
Rifakat Haradwala (Open ERP)
niv-openerp
vro
Yogesh (OpenERP)
Els Van Vossel