Commit Graph

147 Commits

Author SHA1 Message Date
Fabien Pinckaers 623fd428bd [IMP] xml of topbars, removed oe_right, oe_clear
bzr revid: fp@tinyerp.com-20120604105056-xvos3jwt3i9wsqrb
2012-06-04 12:50:56 +02:00
Divyesh Makwana (Open ERP) e98eb11510 [Merge] Merge with main branch.
bzr revid: mdi@tinyerp.com-20120601094937-575f84vxwljlgkpv
bzr revid: mdi@tinyerp.com-20120601123900-0ozu8nlq02upa8xb
bzr revid: mdi@tinyerp.com-20120601124121-oz0cr3gv4acejs7b
2012-06-01 18:11:21 +05:30
Fabien Pinckaers 2458fa04fb [merge] improved list view: removed some buttons in lists
bzr revid: fp@tinyerp.com-20120601122851-tmroldtaokv2d4on
2012-06-01 14:28:51 +02:00
Divyesh Makwana (Open ERP) d18cb96c97 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120528062205-ukjcxs41f917dsk2
2012-05-28 11:52:05 +05:30
Ajay Chauhan (OpenERP) 47cc03c954 [MERGE] merge with main addons
bzr revid: cha@tinyerp.com-20120523111541-o1o60ncctasc5t41
2012-05-23 16:45:41 +05:30
Ajay Chauhan (OpenERP) 7418558d1d [IMP] : removed button from tree
bzr revid: cha@tinyerp.com-20120523110047-3403esloff9i98ki
2012-05-23 16:30:47 +05:30
Fabien Pinckaers 5c791531aa [IMP] improved typos
bzr revid: fp@tinyerp.com-20120522161055-6013qr1s4p773hoj
2012-05-22 18:10:55 +02:00
Divyesh Makwana (Open ERP) 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
Fabien Pinckaers b3fa4ccf5c [IMP] removed icons from topbar
bzr revid: fp@tinyerp.com-20120522091445-mpiknieg2v8sd31f
2012-05-22 11:14:45 +02:00
Fabien Pinckaers ee566d388c [IMP] merged topbar status widgets
bzr revid: fp@tinyerp.com-20120522085037-oktkq3td2hg9lvzr
2012-05-22 10:50:37 +02:00
Saurang Suthar (OpenERP) a2a05cfc19 [IMP]:improved titles State by Status everywhere
bzr revid: ssu@tinyerp.com-20120504115748-2vd1dns7bxptg384
2012-05-04 17:27:48 +05:30
Turkesh Patel (Open ERP) 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
Turkesh Patel (Open ERP) bdeac6b5f3 [IMP] market_campaign: improved view of segments
bzr revid: tpa@tinyerp.com-20120426070923-jttlccs7hoesx2xj
2012-04-26 12:39:23 +05:30
Turkesh Patel (Open ERP) 83b6b2a1e5 [IMP] market_campaign: improved view of campaign
bzr revid: tpa@tinyerp.com-20120426070655-sz8wz151snmlx5yd
2012-04-26 12:36:55 +05:30
Raphael Collet 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
Jagdish Panchal (Open ERP) a4a2696fb3 [MERGE] branch merged with lp:openobject-addons
bzr revid: jap@tinyerp.com-20120321065621-rr4ehnehog9aq4d2
2012-03-21 12:26:21 +05:30
Olivier Dony 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
Jagdish Panchal (Open ERP) 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
Jagdish Panchal (Open ERP) 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
Raphael Collet e813a62b29 [MERGE] lp:908739 (marketing_campaign: improve activity view)
bzr revid: rco@openerp.com-20120110095743-nd5p8spvvl27bgj2
2012-01-10 10:57:43 +01:00
Serpent Consulting Services 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
Serpent Consulting Services 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
Turkesh Patel (Open ERP) 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
Turkesh Patel (Open ERP) 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
Rucha (Open ERP) 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
Mayur Maheshwari (OpenERP) 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
Fabien Pinckaers 05d6d35cc8 [Merge]
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
Mayur Maheshwari (OpenERP) 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
Olivier Dony 983a7d2fd2 [MERGE] latest trunk
bzr revid: odo@openerp.com-20110912123152-xswj0jlmhp7qpoz8
2011-09-12 14:31:52 +02:00
Xavier Morel 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
Harry (OpenERP) 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
Thibault Francois b11a71fd87 [MERGE] improvement project-issue
bzr revid: tfr@openerp.com-20110407114145-xvr27pjquxwk9ff0
2011-04-07 13:41:45 +02:00
Rucha (Open ERP) 117d3f75a0 [MERGE]: Merge with latest trunk
bzr revid: rpa@tinyerp.com-20110317095800-l0sc4mj3uktsm8wa
2011-03-17 15:28:00 +05:30
Xavier Morel 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
Xavier Morel 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
Harry (OpenERP) 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
Ujjvala Collins (OpenERP) 4bac6d8969 [FIX] all: Fixed incomplete behavior of act_window.
lp bug: https://launchpad.net/bugs/708467 fixed

bzr revid: uco@tinyerp.com-20110127094939-v8gugx666pakihva
2011-01-27 15:19:39 +05:30
Sbh (OpenERP) 9f0e3f8481 [MERGE] merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101227124321-1x0xs79sp555g33d
2010-12-27 18:13:21 +05:30
ksa (Open ERP) f433391c59 [FIX]: Remove the domain on the filter field in segment
lp bug: https://launchpad.net/bugs/687352 fixed

bzr revid: ksa@tinyerp.co.in-20101215054940-cqzpjjjbg7p7ywwn
2010-12-15 11:19:40 +05:30
Els Van Vossel ab38e64d02 [IMP] changed menutips
bzr revid: openerp@evv-laptop-20101214062211-mlp6bzfhb0tw0fu6
2010-12-14 07:22:11 +01:00
Vir (Open ERP) d2aa564115 [ADD] hr, hr_timesheet_sheet, email_template, marketing_campaing : Tooltip added for menus
bzr revid: vir@tinyerp.com-20101112062346-spehxiz822n6l1o0
2010-11-12 11:53:46 +05:30
Vir (Open ERP) abe84f365b [MOD/IMP] Icons improved
bzr revid: vir@tinyerp.com-20101025095741-s84hfn0rev963oz5
2010-10-25 15:27:41 +05:30
DBR (OpenERP) ab0d260114 [MOD]: Usability Improvment in cancel & validate button position
bzr revid: dbr@tinyerp.com-20101025093236-mdsrvgyuvq8q2nbl
2010-10-25 15:02:36 +05:30
Vir (Open ERP) 80cd518e1d [ADD/MOD] Improved tooltips on menus
bzr revid: vir@tinyerp.com-20101016082655-jtqm0447fb7zkrv9
2010-10-16 13:56:55 +05:30
DBR (OpenERP) 11d492dc4f [MOD/IMP]: Cancel Button Set on left side
bzr revid: dbr@tinyerp.com-20101012063553-uk5qj6ubu6ddd090
2010-10-12 12:05:53 +05:30
aag (OpenERP) 3833852f93 <act_window domain converted to context is done
bzr revid: aag@tinyerp.co.in-20100928131710-vlmxr9qq040kj7bu
2010-09-28 18:47:10 +05:30
Olivier Dony 33cb2c8c9a [IMP] marketing_campaign: another round of reviewing/improvements:
- better form/search views
- improved labels
- added next sync on segments
- added domain to prevent cross-campaign transitions on activities
- ...

bzr revid: odo@openerp.com-20100913004337-0cvl8qd0qaj3fomc
2010-09-13 02:43:37 +02:00
rpa (Open ERP) 4dc8c1acfb [IMP]: marketing_campaign: Make campaign_id stored on Followups, added Campaign in search view of Followups
bzr revid: rpa@tinyerp.com-20100831132331-086gz8ilbwvgj39z
2010-08-31 18:53:31 +05:30
Harry (OpenERP) 906948cb8d [MERGE]
bzr revid: hmo@tinyerp.com-20100831101152-pxx8ef3lpyfq4flz
2010-08-31 15:41:52 +05:30
rpa (Open ERP) 4c849ee4d6 [IMP]: marketing_campaign: Improvement in search view of Followup(workitem), Implemented fnct_search for searching according to resource name
bzr revid: rpa@tinyerp.com-20100826093540-zsl9j873iyqek52c
2010-08-26 15:05:40 +05:30
rpa (Open ERP) 8cd554c098 [IMP]: marketing_campaign: Improvement in segment form view
bzr revid: rpa@tinyerp.com-20100826062953-qekx8tgz15urc41w
2010-08-26 11:59:53 +05:30
rpa (Open ERP) 7cf9abc8cf [IMP]: marketing_campaign: Improvement in search view of segment
bzr revid: rpa@tinyerp.com-20100825134323-nul71s75smc6hb2s
2010-08-25 19:13:23 +05:30
rpa (Open ERP) 090d33f0de [IMP]: marketing_campaign: Improvement in view of Activity,
* Changes for paper => report

bzr revid: rpa@tinyerp.com-20100825121247-uxq7kc58mm3c1ty3
2010-08-25 17:42:47 +05:30
rpa (Open ERP) 68c44fe36d [ADD]: marketing_campaign: Added link with campaign and followups and statistics
bzr revid: rpa@tinyerp.com-20100825111931-zj419qzavn9f5acu
2010-08-25 16:49:31 +05:30
rpa (Open ERP) 769eb89018 [IMP]: marketing_campaign: Improvement in Campaign view
bzr revid: rpa@tinyerp.com-20100825105947-00v6tluraliiwvmu
2010-08-25 16:29:47 +05:30
Olivier Dony 6b04635f54 [IMP] marketing_campaign: review + some improvements:
- Modified workflow to support resetting Campaigns and Segments to draft after cancelling/closing
- Increased size of condition field on activities
- Improved logic of workitems processing
- Added missing ondelete properties in model
- Adapt for latest changes to email_template

bzr revid: odo@openerp.com-20100818155529-31ykqaglcmi0xf2s
2010-08-18 17:55:29 +02:00
Rvo (Open ERP) 45a8d54f18 [CLEAN]: removed commented code, fixed proper indentation in dictionary and removed extra spaces at few places
bzr revid: rvo@tinyerp.co.in-20100813122005-qj1l1iumkfmocyvk
2010-08-13 17:50:05 +05:30
Vir (Open ERP) 958ba6e6c2 [MOD/IMP] account_cash_statment,marketing_campaign : correction in icon on buttons
bzr revid: vir@tinyerp.com-20100811073252-lr7b8o8qr3epjh5d
2010-08-11 13:02:52 +05:30
Vir (Open ERP) afeb19d09d [IMP] marketing_campaign : Improvements in views,workflow
bzr revid: vir@tinyerp.com-20100811062050-0qmfcp8497mt4yu0
2010-08-11 11:50:50 +05:30
Vir (Open ERP) 4dd3512996 [IMP] marketing_campaign : Improvements in search views
bzr revid: vir@tinyerp.com-20100810095211-yxakl871pqjasp8l
2010-08-10 15:22:11 +05:30
Vir (Open ERP) 46cbc4b22b [MOD] event module should be in marketing application IF Association is not installed. if asociation is installed, event has to be in this application.
bzr revid: vir@tinyerp.com-20100728073710-xq8b0mgulndiva86
2010-07-28 13:07:10 +05:30
Olivier Dony e56aa368dc [IMP] marketing_campaign: allow restarting a closed campaign + make labels more consistent
bzr revid: odo@openerp.com-20100726155716-c6mb8hu8eg5wkom1
2010-07-26 17:57:16 +02:00
dbr(Open ERP) c8bea68cd4 [MOD] auction,audittrail,crm_*,hr_*,email_template,event,idea,lunch,marketing_campaign,mrp : set colors in tree views according to state
bzr revid: vir@tinyerp.com-20100720111402-kcq52pa035hsyyb9
2010-07-20 16:44:02 +05:30
Olivier Dony b444adde28 [IMP] marketing_campaign, email_template: second series of small improvements during review of these modules for v6: naming, icons, error conditions
bzr revid: odo@openerp.com-20100716182855-c2rk0j4fake5900s
2010-07-16 20:28:55 +02:00
Olivier Dony e4da848a9d [IMP] marketing_campaign, email_template: first series of improvements during review of these modules for v6
bzr revid: odo@openerp.com-20100716090513-uvavs7wply3bpsfv
2010-07-16 11:05:13 +02:00
Christophe Simonis f6d8ed277c [IMP] marketing_campaign: workitems are deleted if the condition is not met (unless explicitly keeped)
bzr revid: chs@openerp.com-20100714101458-nor7umnxrza4hasn
2010-07-14 12:14:58 +02:00
Christophe Simonis 23d6634faa [IMP] marketing_campaign: change the way that the differents activity types are processed.
[FIX] marketing_campaign: deactivate the subcampaign activity type because it is not implemented at all.

bzr revid: chs@openerp.com-20100702131849-961q3075l5wvrorn
2010-07-02 15:18:49 +02:00
Christophe Simonis 1f90109061 [IMP] marketing_campaign: better use of default_get + rewrite some functions
bzr revid: chs@openerp.com-20100701131950-bofqs28jww2sk1e8
2010-07-01 15:19:50 +02:00
Christophe Simonis f2bcf8d808 [ADD] marketing_campaign: 2 new transition triggers: auto and signal. auto transition mean the destination activity is immediatly executed. signal transition mean the destination activity is executed only when it receive the signal.
[IMP] marketing_campaign: better activity view

bzr revid: chs@openerp.com-20100701115355-nx7of0ju225idwej
2010-07-01 13:53:55 +02:00
Christophe Simonis 6f2063f28e [IMP] marketing_campaign: add a name to transitions
bzr revid: chs@openerp.com-20100630140734-tsb5lkthrbh5fufd
2010-06-30 16:07:34 +02:00
Christophe Simonis 83bd9d689d [IMP] marketing_campaign: do not duplicate activity view.
bzr revid: chs@openerp.com-20100630135228-9zulzvgq373wd8og
2010-06-30 15:52:28 +02:00
Christophe Simonis 339ea75cd5 [IMP] marketing_campaign: remove the hardcoded reference to partner_id field
bzr revid: chs@openerp.com-20100629163728-149ifeazpoxb5nv9
2010-06-29 18:37:28 +02:00
Fabien Pinckaers 40e6756a26 [IMP] Improvements and fixes
bzr revid: fp@tinyerp.com-20100625212153-crzsp6hfkfqxm5h3
2010-06-25 23:21:53 +02:00
Dhara bcb1b02c10 [FIX] view and button for the action wizard on email_tempalte
bzr revid: dhara@dhara-laptop-20100625095231-dk8p4oobvvonceyd
2010-06-25 15:22:31 +05:30
Fabien Pinckaers c0950423db fix
bzr revid: fp@tinyerp.com-20100624181325-x44m1c6w5oj8kbm5
2010-06-24 20:13:25 +02:00
Dhara fe0030c8f5 [FIX] marketing_campaign : view and error on email,server action fix
bzr revid: dhara@dhara-laptop-20100624105950-gg15cr9gbuufqaj0
2010-06-24 16:29:50 +05:30
Dhara 0f3b579a54 [FIX][IMP] email_template view and preview button for wi
bzr revid: dhara@dhara-laptop-20100615060421-3346bwibul6kf2ig
2010-06-15 11:34:21 +05:30
Fabien Pinckaers d5f4d00622 [IMP] Imrpove marketing campaigns
bzr revid: fp@tinyerp.com-20100611075145-r9num41vzz9s3lws
2010-06-11 09:51:45 +02:00
Fabien Pinckaers 87cbde0be2 [IMP] marketing campaign
bzr revid: fp@tinyerp.com-20100611074419-93biwenk8q1r68em
2010-06-11 09:44:19 +02:00
Fabien Pinckaers 21cd9e7a98 [IMP] marketing campaign
bzr revid: fp@tinyerp.com-20100610205045-vs4jmbu8cbcae27w
2010-06-10 22:50:45 +02:00
Fabien Pinckaers de2d11830d [IMP] marketing campaigns
bzr revid: fp@tinyerp.com-20100610204126-xdpydbodgvgc2mpm
2010-06-10 22:41:26 +02:00
Dhara fd58ff8578 [IMP] marketing_campaign : change process of segment wi(tooltip and relate by pso)
bzr revid: dhara@dhara-laptop-20100610125538-d6k6wxsp0m035az4
2010-06-10 18:25:38 +05:30
Fabien Pinckaers 6dd17f672d [IMP] Marketing campaigns
bzr revid: fp@tinyerp.com-20100610080254-mryfirtlfy5chj0s
2010-06-10 10:02:54 +02:00
Vir (Open ERP) 4ab90ab79f [IMP] hr,hr_attendance,hr_contract,hr_evaluation,idea,marketing_campaign,membership icon are modified to new icons, membership search view improved
bzr revid: vir@tinyerp.com-20100603134400-1zua9zqi6y6ty8ys
2010-06-03 19:14:00 +05:30
ssi (Open ERP) e74b683ab5 [IMP] marketing_campaign: modified menus and dependency
bzr revid: ssi@tinyerp.com-20100528072414-8uatbvbl7g3rlrj4
2010-05-28 12:54:14 +05:30
Fabien Pinckaers 88c7f0dcf4 [IMP] marketing_campaign sentences
bzr revid: fp@tinyerp.com-20100527180815-aoffbsih0ivot7d9
2010-05-27 20:08:15 +02:00
DSH (Open ERP) 5cb4c1e1b5 [IMP] demo data for marketing campaign
bzr revid: dsh@tinyerp.com-20100526082002-5a0xa1c8jjm0b5vj
2010-05-26 13:50:02 +05:30
DSH (Open ERP) b2d9bc4fc1 [IMP] Marketing campaign -view,domain,
bzr revid: dsh@tinyerp.com-20100525142620-b9qudpnkj5acsyy7
2010-05-25 19:56:20 +05:30
DSH (Open ERP) 6069e07907 mareketing campaing acitvity view
bzr revid: dsh@tinyerp.com-20100525102058-0s82i4immdlz2rr9
2010-05-25 15:50:58 +05:30
ssi (Open ERP) 0b6e1bb050 [IMP] marketing_campaign: added few constraints in segment form and modified views
bzr revid: ssi@tinyerp.com-20100521134628-sk1g1tk4frdv234b
2010-05-21 19:16:28 +05:30
DSH (Open ERP) a5a33f10d3 [IMP] process segment and wkf buttons
bzr revid: dsh@tinyerp.com-20100521095353-zjvfbbm3ep7vt1r3
2010-05-21 15:23:53 +05:30
ssi (Open ERP) 10a76ac8d9 [IMP] marketing_campaign: modified view
bzr revid: ssi@tinyerp.com-20100519073324-x11a2xiz1afh6zsq
2010-05-19 13:03:24 +05:30
ssi (Open ERP) 5433b182da [IMP] marketing_campaign: added default get for tansition to have deafult value of source activity
bzr revid: ssi@tinyerp.com-20100519071552-e1p9ywvgz5387z5k
2010-05-19 12:45:52 +05:30
DSH (Open ERP) 54ec9538af [IMP] change in view ,and report for campaign analysis
bzr revid: dsh@tinyerp.com-20100519064415-vs6ktqpu1id3kb8n
2010-05-19 12:14:15 +05:30
ssi (Open ERP) c580924493 [IMP] modified marketing_campaign
bzr revid: ssi@tinyerp.com-20100518104208-ete4wwssnqfvvj25
2010-05-18 16:12:08 +05:30
ssi (Open ERP) 2b6f9d0795 [IMP] modified diagram view for campaign in marketing_campaign
bzr revid: ssi@tinyerp.com-20100517094149-l8fny164dpj439i7
2010-05-17 15:11:49 +05:30
DSH (Open ERP) 078271646a [NEW] module for campaiging using poweremail and crm - not ready to test functionally
bzr revid: dsh@tinyerp.com-20100514143602-7zvf7pefl6mvcij0
2010-05-14 20:06:02 +05:30